diff --git a/aslib/pom.xml b/aslib/pom.xml
new file mode 100644
index 00000000..f0484003
--- /dev/null
+++ b/aslib/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.threerings</groupId>
+    <artifactId>nenya-parent</artifactId>
+    <version>1.4-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>nenyalib</artifactId>
+  <packaging>swc</packaging>
+  <name>Nenya ActionScript</name>
+
+  <repositories>
+    <repository>
+      <id>flexlib-repo</id>
+      <url>http://maven.ow2.org/maven2</url>
+    </repository>
+    <repository>
+      <id>ooo-ext-maven-repo</id>
+      <url>http://ooo-maven.googlecode.com/hg/repository</url>
+    </repository>
+    <repository>
+      <id>ooo-maven-repo</id>
+      <url>http://threerings.github.com/maven-repo</url>
+    </repository>
+  </repositories>
+
+  <properties>
+    <flex.version>4.1.0.16076</flex.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>aspirin</artifactId>
+      <version>1.9</version>
+      <type>swc</type>
+    </dependency>
+    <dependency>
+      <groupId>flexlib</groupId>
+      <artifactId>flexlib-bin</artifactId>
+      <version>2.4</version>
+      <type>swc</type>
+    </dependency>
+    <dependency>
+      <groupId>as3isolib</groupId>
+      <artifactId>as3isolib-fp9</artifactId>
+      <version>r298</version>
+      <type>swc</type>
+    </dependency>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>naryalib</artifactId>
+      <version>1.11</version>
+      <type>swc</type>
+    </dependency>
+    <!-- needed for the build, but not an exported dependency -->
+    <dependency>
+      <groupId>com.adobe.flex.framework</groupId>
+      <artifactId>flex-framework</artifactId>
+      <version>${flex.version}</version>
+      <type>pom</type>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>flexmojos</id>
+      <url>http://repository.sonatype.org/content/groups/flexgroup/</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <build>
+    <sourceDirectory>src/main/as</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.sonatype.flexmojos</groupId>
+        <artifactId>flexmojos-maven-plugin</artifactId>
+        <extensions>true</extensions>
+        <version>4.2-beta</version>
+        <configuration>
+          <omitTraceStatements>false</omitTraceStatements>
+          <debug>true</debug>
+          <incremental>false</incremental>
+          <useNetwork>false</useNetwork>
+          <verboseStacktraces>true</verboseStacktraces>
+          <!-- we've never shown them in the Ant build, why start now? -->
+          <showWarnings>false</showWarnings>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.adobe.flex</groupId>
+            <artifactId>compiler</artifactId>
+            <version>${flex.version}</version>
+            <type>pom</type>
+          </dependency>
+          <dependency>
+            <groupId>com.adobe.flex.compiler</groupId>
+            <artifactId>asdoc</artifactId>
+            <version>${flex.version}</version>
+            <classifier>template</classifier>
+            <type>zip</type>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/main/as/com/threerings/cast/ActionFrames.as b/aslib/src/main/as/com/threerings/cast/ActionFrames.as
similarity index 100%
rename from src/main/as/com/threerings/cast/ActionFrames.as
rename to aslib/src/main/as/com/threerings/cast/ActionFrames.as
diff --git a/src/main/as/com/threerings/cast/ActionSequence.as b/aslib/src/main/as/com/threerings/cast/ActionSequence.as
similarity index 100%
rename from src/main/as/com/threerings/cast/ActionSequence.as
rename to aslib/src/main/as/com/threerings/cast/ActionSequence.as
diff --git a/src/main/as/com/threerings/cast/CharacterComponent.as b/aslib/src/main/as/com/threerings/cast/CharacterComponent.as
similarity index 100%
rename from src/main/as/com/threerings/cast/CharacterComponent.as
rename to aslib/src/main/as/com/threerings/cast/CharacterComponent.as
diff --git a/src/main/as/com/threerings/cast/CharacterDescriptor.as b/aslib/src/main/as/com/threerings/cast/CharacterDescriptor.as
similarity index 100%
rename from src/main/as/com/threerings/cast/CharacterDescriptor.as
rename to aslib/src/main/as/com/threerings/cast/CharacterDescriptor.as
diff --git a/src/main/as/com/threerings/cast/CharacterManager.as b/aslib/src/main/as/com/threerings/cast/CharacterManager.as
similarity index 100%
rename from src/main/as/com/threerings/cast/CharacterManager.as
rename to aslib/src/main/as/com/threerings/cast/CharacterManager.as
diff --git a/src/main/as/com/threerings/cast/CharacterSprite.as b/aslib/src/main/as/com/threerings/cast/CharacterSprite.as
similarity index 100%
rename from src/main/as/com/threerings/cast/CharacterSprite.as
rename to aslib/src/main/as/com/threerings/cast/CharacterSprite.as
diff --git a/src/main/as/com/threerings/cast/ComponentClass.as b/aslib/src/main/as/com/threerings/cast/ComponentClass.as
similarity index 100%
rename from src/main/as/com/threerings/cast/ComponentClass.as
rename to aslib/src/main/as/com/threerings/cast/ComponentClass.as
diff --git a/src/main/as/com/threerings/cast/ComponentDataPack.as b/aslib/src/main/as/com/threerings/cast/ComponentDataPack.as
similarity index 100%
rename from src/main/as/com/threerings/cast/ComponentDataPack.as
rename to aslib/src/main/as/com/threerings/cast/ComponentDataPack.as
diff --git a/src/main/as/com/threerings/cast/ComponentFrames.as b/aslib/src/main/as/com/threerings/cast/ComponentFrames.as
similarity index 100%
rename from src/main/as/com/threerings/cast/ComponentFrames.as
rename to aslib/src/main/as/com/threerings/cast/ComponentFrames.as
diff --git a/src/main/as/com/threerings/cast/ComponentRepository.as b/aslib/src/main/as/com/threerings/cast/ComponentRepository.as
similarity index 100%
rename from src/main/as/com/threerings/cast/ComponentRepository.as
rename to aslib/src/main/as/com/threerings/cast/ComponentRepository.as
diff --git a/src/main/as/com/threerings/cast/CompositedActionFrames.as b/aslib/src/main/as/com/threerings/cast/CompositedActionFrames.as
similarity index 100%
rename from src/main/as/com/threerings/cast/CompositedActionFrames.as
rename to aslib/src/main/as/com/threerings/cast/CompositedActionFrames.as
diff --git a/src/main/as/com/threerings/cast/CompositedFramesKey.as b/aslib/src/main/as/com/threerings/cast/CompositedFramesKey.as
similarity index 100%
rename from src/main/as/com/threerings/cast/CompositedFramesKey.as
rename to aslib/src/main/as/com/threerings/cast/CompositedFramesKey.as
diff --git a/src/main/as/com/threerings/cast/DataPackComponentRepository.as b/aslib/src/main/as/com/threerings/cast/DataPackComponentRepository.as
similarity index 100%
rename from src/main/as/com/threerings/cast/DataPackComponentRepository.as
rename to aslib/src/main/as/com/threerings/cast/DataPackComponentRepository.as
diff --git a/src/main/as/com/threerings/cast/FrameProvider.as b/aslib/src/main/as/com/threerings/cast/FrameProvider.as
similarity index 100%
rename from src/main/as/com/threerings/cast/FrameProvider.as
rename to aslib/src/main/as/com/threerings/cast/FrameProvider.as
diff --git a/src/main/as/com/threerings/cast/MultiFrameBitmap.as b/aslib/src/main/as/com/threerings/cast/MultiFrameBitmap.as
similarity index 100%
rename from src/main/as/com/threerings/cast/MultiFrameBitmap.as
rename to aslib/src/main/as/com/threerings/cast/MultiFrameBitmap.as
diff --git a/src/main/as/com/threerings/cast/NoSuchComponentError.as b/aslib/src/main/as/com/threerings/cast/NoSuchComponentError.as
similarity index 100%
rename from src/main/as/com/threerings/cast/NoSuchComponentError.as
rename to aslib/src/main/as/com/threerings/cast/NoSuchComponentError.as
diff --git a/src/main/as/com/threerings/cast/PriorityOverride.as b/aslib/src/main/as/com/threerings/cast/PriorityOverride.as
similarity index 100%
rename from src/main/as/com/threerings/cast/PriorityOverride.as
rename to aslib/src/main/as/com/threerings/cast/PriorityOverride.as
diff --git a/src/main/as/com/threerings/cast/StandardActions.as b/aslib/src/main/as/com/threerings/cast/StandardActions.as
similarity index 100%
rename from src/main/as/com/threerings/cast/StandardActions.as
rename to aslib/src/main/as/com/threerings/cast/StandardActions.as
diff --git a/src/main/as/com/threerings/cast/TileSetFrameImage.as b/aslib/src/main/as/com/threerings/cast/TileSetFrameImage.as
similarity index 100%
rename from src/main/as/com/threerings/cast/TileSetFrameImage.as
rename to aslib/src/main/as/com/threerings/cast/TileSetFrameImage.as
diff --git a/src/main/as/com/threerings/flex/AmbidextrousList.as b/aslib/src/main/as/com/threerings/flex/AmbidextrousList.as
similarity index 100%
rename from src/main/as/com/threerings/flex/AmbidextrousList.as
rename to aslib/src/main/as/com/threerings/flex/AmbidextrousList.as
diff --git a/src/main/as/com/threerings/flex/ChatControl.as b/aslib/src/main/as/com/threerings/flex/ChatControl.as
similarity index 100%
rename from src/main/as/com/threerings/flex/ChatControl.as
rename to aslib/src/main/as/com/threerings/flex/ChatControl.as
diff --git a/src/main/as/com/threerings/flex/ChatDisplayBox.as b/aslib/src/main/as/com/threerings/flex/ChatDisplayBox.as
similarity index 100%
rename from src/main/as/com/threerings/flex/ChatDisplayBox.as
rename to aslib/src/main/as/com/threerings/flex/ChatDisplayBox.as
diff --git a/src/main/as/com/threerings/flex/ChatInput.as b/aslib/src/main/as/com/threerings/flex/ChatInput.as
similarity index 100%
rename from src/main/as/com/threerings/flex/ChatInput.as
rename to aslib/src/main/as/com/threerings/flex/ChatInput.as
diff --git a/src/main/as/com/threerings/flex/CommandButton.as b/aslib/src/main/as/com/threerings/flex/CommandButton.as
similarity index 100%
rename from src/main/as/com/threerings/flex/CommandButton.as
rename to aslib/src/main/as/com/threerings/flex/CommandButton.as
diff --git a/src/main/as/com/threerings/flex/CommandCheckBox.as b/aslib/src/main/as/com/threerings/flex/CommandCheckBox.as
similarity index 100%
rename from src/main/as/com/threerings/flex/CommandCheckBox.as
rename to aslib/src/main/as/com/threerings/flex/CommandCheckBox.as
diff --git a/src/main/as/com/threerings/flex/CommandComboBox.as b/aslib/src/main/as/com/threerings/flex/CommandComboBox.as
similarity index 100%
rename from src/main/as/com/threerings/flex/CommandComboBox.as
rename to aslib/src/main/as/com/threerings/flex/CommandComboBox.as
diff --git a/src/main/as/com/threerings/flex/CommandLinkButton.as b/aslib/src/main/as/com/threerings/flex/CommandLinkButton.as
similarity index 100%
rename from src/main/as/com/threerings/flex/CommandLinkButton.as
rename to aslib/src/main/as/com/threerings/flex/CommandLinkButton.as
diff --git a/src/main/as/com/threerings/flex/CommandMenu.as b/aslib/src/main/as/com/threerings/flex/CommandMenu.as
similarity index 100%
rename from src/main/as/com/threerings/flex/CommandMenu.as
rename to aslib/src/main/as/com/threerings/flex/CommandMenu.as
diff --git a/src/main/as/com/threerings/flex/CursorManager.as b/aslib/src/main/as/com/threerings/flex/CursorManager.as
similarity index 100%
rename from src/main/as/com/threerings/flex/CursorManager.as
rename to aslib/src/main/as/com/threerings/flex/CursorManager.as
diff --git a/src/main/as/com/threerings/flex/DSetList.as b/aslib/src/main/as/com/threerings/flex/DSetList.as
similarity index 100%
rename from src/main/as/com/threerings/flex/DSetList.as
rename to aslib/src/main/as/com/threerings/flex/DSetList.as
diff --git a/src/main/as/com/threerings/flex/FlexUtil.as b/aslib/src/main/as/com/threerings/flex/FlexUtil.as
similarity index 100%
rename from src/main/as/com/threerings/flex/FlexUtil.as
rename to aslib/src/main/as/com/threerings/flex/FlexUtil.as
diff --git a/src/main/as/com/threerings/flex/FlexWrapper.as b/aslib/src/main/as/com/threerings/flex/FlexWrapper.as
similarity index 100%
rename from src/main/as/com/threerings/flex/FlexWrapper.as
rename to aslib/src/main/as/com/threerings/flex/FlexWrapper.as
diff --git a/src/main/as/com/threerings/flex/FunctionEffect.as b/aslib/src/main/as/com/threerings/flex/FunctionEffect.as
similarity index 100%
rename from src/main/as/com/threerings/flex/FunctionEffect.as
rename to aslib/src/main/as/com/threerings/flex/FunctionEffect.as
diff --git a/src/main/as/com/threerings/flex/FunctionEffectInstance.as b/aslib/src/main/as/com/threerings/flex/FunctionEffectInstance.as
similarity index 100%
rename from src/main/as/com/threerings/flex/FunctionEffectInstance.as
rename to aslib/src/main/as/com/threerings/flex/FunctionEffectInstance.as
diff --git a/src/main/as/com/threerings/flex/GridUtil.as b/aslib/src/main/as/com/threerings/flex/GridUtil.as
similarity index 100%
rename from src/main/as/com/threerings/flex/GridUtil.as
rename to aslib/src/main/as/com/threerings/flex/GridUtil.as
diff --git a/src/main/as/com/threerings/flex/KeyboardManager.as b/aslib/src/main/as/com/threerings/flex/KeyboardManager.as
similarity index 100%
rename from src/main/as/com/threerings/flex/KeyboardManager.as
rename to aslib/src/main/as/com/threerings/flex/KeyboardManager.as
diff --git a/src/main/as/com/threerings/flex/LabeledSlider.as b/aslib/src/main/as/com/threerings/flex/LabeledSlider.as
similarity index 100%
rename from src/main/as/com/threerings/flex/LabeledSlider.as
rename to aslib/src/main/as/com/threerings/flex/LabeledSlider.as
diff --git a/src/main/as/com/threerings/flex/LazyContainer.as b/aslib/src/main/as/com/threerings/flex/LazyContainer.as
similarity index 100%
rename from src/main/as/com/threerings/flex/LazyContainer.as
rename to aslib/src/main/as/com/threerings/flex/LazyContainer.as
diff --git a/src/main/as/com/threerings/flex/LazyTabNavigator.as b/aslib/src/main/as/com/threerings/flex/LazyTabNavigator.as
similarity index 100%
rename from src/main/as/com/threerings/flex/LazyTabNavigator.as
rename to aslib/src/main/as/com/threerings/flex/LazyTabNavigator.as
diff --git a/src/main/as/com/threerings/flex/LoadedAsset.as b/aslib/src/main/as/com/threerings/flex/LoadedAsset.as
similarity index 100%
rename from src/main/as/com/threerings/flex/LoadedAsset.as
rename to aslib/src/main/as/com/threerings/flex/LoadedAsset.as
diff --git a/src/main/as/com/threerings/flex/PopUpUtil.as b/aslib/src/main/as/com/threerings/flex/PopUpUtil.as
similarity index 100%
rename from src/main/as/com/threerings/flex/PopUpUtil.as
rename to aslib/src/main/as/com/threerings/flex/PopUpUtil.as
diff --git a/src/main/as/com/threerings/flex/ScrollBox.as b/aslib/src/main/as/com/threerings/flex/ScrollBox.as
similarity index 100%
rename from src/main/as/com/threerings/flex/ScrollBox.as
rename to aslib/src/main/as/com/threerings/flex/ScrollBox.as
diff --git a/src/main/as/com/threerings/flex/menuClasses/CommandListData.as b/aslib/src/main/as/com/threerings/flex/menuClasses/CommandListData.as
similarity index 100%
rename from src/main/as/com/threerings/flex/menuClasses/CommandListData.as
rename to aslib/src/main/as/com/threerings/flex/menuClasses/CommandListData.as
diff --git a/src/main/as/com/threerings/flex/menuClasses/CommandMenuItemRenderer.as b/aslib/src/main/as/com/threerings/flex/menuClasses/CommandMenuItemRenderer.as
similarity index 100%
rename from src/main/as/com/threerings/flex/menuClasses/CommandMenuItemRenderer.as
rename to aslib/src/main/as/com/threerings/flex/menuClasses/CommandMenuItemRenderer.as
diff --git a/src/main/as/com/threerings/media/Tickable.as b/aslib/src/main/as/com/threerings/media/Tickable.as
similarity index 100%
rename from src/main/as/com/threerings/media/Tickable.as
rename to aslib/src/main/as/com/threerings/media/Tickable.as
diff --git a/src/main/as/com/threerings/media/Ticker.as b/aslib/src/main/as/com/threerings/media/Ticker.as
similarity index 100%
rename from src/main/as/com/threerings/media/Ticker.as
rename to aslib/src/main/as/com/threerings/media/Ticker.as
diff --git a/src/main/as/com/threerings/media/image/ClassRecord.as b/aslib/src/main/as/com/threerings/media/image/ClassRecord.as
similarity index 100%
rename from src/main/as/com/threerings/media/image/ClassRecord.as
rename to aslib/src/main/as/com/threerings/media/image/ClassRecord.as
diff --git a/src/main/as/com/threerings/media/image/ColorPository.as b/aslib/src/main/as/com/threerings/media/image/ColorPository.as
similarity index 100%
rename from src/main/as/com/threerings/media/image/ColorPository.as
rename to aslib/src/main/as/com/threerings/media/image/ColorPository.as
diff --git a/src/main/as/com/threerings/media/image/ColorRecord.as b/aslib/src/main/as/com/threerings/media/image/ColorRecord.as
similarity index 100%
rename from src/main/as/com/threerings/media/image/ColorRecord.as
rename to aslib/src/main/as/com/threerings/media/image/ColorRecord.as
diff --git a/src/main/as/com/threerings/media/image/Colorization.as b/aslib/src/main/as/com/threerings/media/image/Colorization.as
similarity index 100%
rename from src/main/as/com/threerings/media/image/Colorization.as
rename to aslib/src/main/as/com/threerings/media/image/Colorization.as
diff --git a/src/main/as/com/threerings/media/image/PngRecolorUtil.as b/aslib/src/main/as/com/threerings/media/image/PngRecolorUtil.as
similarity index 100%
rename from src/main/as/com/threerings/media/image/PngRecolorUtil.as
rename to aslib/src/main/as/com/threerings/media/image/PngRecolorUtil.as
diff --git a/src/main/as/com/threerings/media/tile/BaseTile.as b/aslib/src/main/as/com/threerings/media/tile/BaseTile.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/BaseTile.as
rename to aslib/src/main/as/com/threerings/media/tile/BaseTile.as
diff --git a/src/main/as/com/threerings/media/tile/BaseTileSet.as b/aslib/src/main/as/com/threerings/media/tile/BaseTileSet.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/BaseTileSet.as
rename to aslib/src/main/as/com/threerings/media/tile/BaseTileSet.as
diff --git a/src/main/as/com/threerings/media/tile/Colorizer.as b/aslib/src/main/as/com/threerings/media/tile/Colorizer.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/Colorizer.as
rename to aslib/src/main/as/com/threerings/media/tile/Colorizer.as
diff --git a/src/main/as/com/threerings/media/tile/DataPackTileSetRepository.as b/aslib/src/main/as/com/threerings/media/tile/DataPackTileSetRepository.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/DataPackTileSetRepository.as
rename to aslib/src/main/as/com/threerings/media/tile/DataPackTileSetRepository.as
diff --git a/src/main/as/com/threerings/media/tile/ImageProvider.as b/aslib/src/main/as/com/threerings/media/tile/ImageProvider.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/ImageProvider.as
rename to aslib/src/main/as/com/threerings/media/tile/ImageProvider.as
diff --git a/src/main/as/com/threerings/media/tile/NoSuchTileSetError.as b/aslib/src/main/as/com/threerings/media/tile/NoSuchTileSetError.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/NoSuchTileSetError.as
rename to aslib/src/main/as/com/threerings/media/tile/NoSuchTileSetError.as
diff --git a/src/main/as/com/threerings/media/tile/ObjectTile.as b/aslib/src/main/as/com/threerings/media/tile/ObjectTile.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/ObjectTile.as
rename to aslib/src/main/as/com/threerings/media/tile/ObjectTile.as
diff --git a/src/main/as/com/threerings/media/tile/ObjectTileSet.as b/aslib/src/main/as/com/threerings/media/tile/ObjectTileSet.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/ObjectTileSet.as
rename to aslib/src/main/as/com/threerings/media/tile/ObjectTileSet.as
diff --git a/src/main/as/com/threerings/media/tile/RecolorableTileSet.as b/aslib/src/main/as/com/threerings/media/tile/RecolorableTileSet.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/RecolorableTileSet.as
rename to aslib/src/main/as/com/threerings/media/tile/RecolorableTileSet.as
diff --git a/src/main/as/com/threerings/media/tile/SwissArmyTileSet.as b/aslib/src/main/as/com/threerings/media/tile/SwissArmyTileSet.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/SwissArmyTileSet.as
rename to aslib/src/main/as/com/threerings/media/tile/SwissArmyTileSet.as
diff --git a/src/main/as/com/threerings/media/tile/Tile.as b/aslib/src/main/as/com/threerings/media/tile/Tile.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/Tile.as
rename to aslib/src/main/as/com/threerings/media/tile/Tile.as
diff --git a/src/main/as/com/threerings/media/tile/TileDataPack.as b/aslib/src/main/as/com/threerings/media/tile/TileDataPack.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/TileDataPack.as
rename to aslib/src/main/as/com/threerings/media/tile/TileDataPack.as
diff --git a/src/main/as/com/threerings/media/tile/TileManager.as b/aslib/src/main/as/com/threerings/media/tile/TileManager.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/TileManager.as
rename to aslib/src/main/as/com/threerings/media/tile/TileManager.as
diff --git a/src/main/as/com/threerings/media/tile/TileSet.as b/aslib/src/main/as/com/threerings/media/tile/TileSet.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/TileSet.as
rename to aslib/src/main/as/com/threerings/media/tile/TileSet.as
diff --git a/src/main/as/com/threerings/media/tile/TileSetIdMap.as b/aslib/src/main/as/com/threerings/media/tile/TileSetIdMap.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/TileSetIdMap.as
rename to aslib/src/main/as/com/threerings/media/tile/TileSetIdMap.as
diff --git a/src/main/as/com/threerings/media/tile/TileSetRepository.as b/aslib/src/main/as/com/threerings/media/tile/TileSetRepository.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/TileSetRepository.as
rename to aslib/src/main/as/com/threerings/media/tile/TileSetRepository.as
diff --git a/src/main/as/com/threerings/media/tile/TileUtil.as b/aslib/src/main/as/com/threerings/media/tile/TileUtil.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/TileUtil.as
rename to aslib/src/main/as/com/threerings/media/tile/TileUtil.as
diff --git a/src/main/as/com/threerings/media/tile/Tile_Key.as b/aslib/src/main/as/com/threerings/media/tile/Tile_Key.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/Tile_Key.as
rename to aslib/src/main/as/com/threerings/media/tile/Tile_Key.as
diff --git a/src/main/as/com/threerings/media/tile/bundle/TileSetBundle.as b/aslib/src/main/as/com/threerings/media/tile/bundle/TileSetBundle.as
similarity index 100%
rename from src/main/as/com/threerings/media/tile/bundle/TileSetBundle.as
rename to aslib/src/main/as/com/threerings/media/tile/bundle/TileSetBundle.as
diff --git a/src/main/as/com/threerings/media/util/AStarPathSearch.as b/aslib/src/main/as/com/threerings/media/util/AStarPathSearch.as
similarity index 100%
rename from src/main/as/com/threerings/media/util/AStarPathSearch.as
rename to aslib/src/main/as/com/threerings/media/util/AStarPathSearch.as
diff --git a/src/main/as/com/threerings/media/util/AStarPathSearch_Info.as b/aslib/src/main/as/com/threerings/media/util/AStarPathSearch_Info.as
similarity index 100%
rename from src/main/as/com/threerings/media/util/AStarPathSearch_Info.as
rename to aslib/src/main/as/com/threerings/media/util/AStarPathSearch_Info.as
diff --git a/src/main/as/com/threerings/media/util/AStarPathSearch_Node.as b/aslib/src/main/as/com/threerings/media/util/AStarPathSearch_Node.as
similarity index 100%
rename from src/main/as/com/threerings/media/util/AStarPathSearch_Node.as
rename to aslib/src/main/as/com/threerings/media/util/AStarPathSearch_Node.as
diff --git a/src/main/as/com/threerings/media/util/AStarPathSearch_Stepper.as b/aslib/src/main/as/com/threerings/media/util/AStarPathSearch_Stepper.as
similarity index 100%
rename from src/main/as/com/threerings/media/util/AStarPathSearch_Stepper.as
rename to aslib/src/main/as/com/threerings/media/util/AStarPathSearch_Stepper.as
diff --git a/src/main/as/com/threerings/media/util/ExtendedTraversalPred.as b/aslib/src/main/as/com/threerings/media/util/ExtendedTraversalPred.as
similarity index 100%
rename from src/main/as/com/threerings/media/util/ExtendedTraversalPred.as
rename to aslib/src/main/as/com/threerings/media/util/ExtendedTraversalPred.as
diff --git a/src/main/as/com/threerings/media/util/LineSegmentPath.as b/aslib/src/main/as/com/threerings/media/util/LineSegmentPath.as
similarity index 100%
rename from src/main/as/com/threerings/media/util/LineSegmentPath.as
rename to aslib/src/main/as/com/threerings/media/util/LineSegmentPath.as
diff --git a/src/main/as/com/threerings/media/util/Path.as b/aslib/src/main/as/com/threerings/media/util/Path.as
similarity index 100%
rename from src/main/as/com/threerings/media/util/Path.as
rename to aslib/src/main/as/com/threerings/media/util/Path.as
diff --git a/src/main/as/com/threerings/media/util/PathNode.as b/aslib/src/main/as/com/threerings/media/util/PathNode.as
similarity index 100%
rename from src/main/as/com/threerings/media/util/PathNode.as
rename to aslib/src/main/as/com/threerings/media/util/PathNode.as
diff --git a/src/main/as/com/threerings/media/util/Pathable.as b/aslib/src/main/as/com/threerings/media/util/Pathable.as
similarity index 100%
rename from src/main/as/com/threerings/media/util/Pathable.as
rename to aslib/src/main/as/com/threerings/media/util/Pathable.as
diff --git a/src/main/as/com/threerings/media/util/TraversalPred.as b/aslib/src/main/as/com/threerings/media/util/TraversalPred.as
similarity index 100%
rename from src/main/as/com/threerings/media/util/TraversalPred.as
rename to aslib/src/main/as/com/threerings/media/util/TraversalPred.as
diff --git a/src/main/as/com/threerings/miso/client/BaseTileIsoSprite.as b/aslib/src/main/as/com/threerings/miso/client/BaseTileIsoSprite.as
similarity index 100%
rename from src/main/as/com/threerings/miso/client/BaseTileIsoSprite.as
rename to aslib/src/main/as/com/threerings/miso/client/BaseTileIsoSprite.as
diff --git a/src/main/as/com/threerings/miso/client/MisoMetricsTransformation.as b/aslib/src/main/as/com/threerings/miso/client/MisoMetricsTransformation.as
similarity index 100%
rename from src/main/as/com/threerings/miso/client/MisoMetricsTransformation.as
rename to aslib/src/main/as/com/threerings/miso/client/MisoMetricsTransformation.as
diff --git a/src/main/as/com/threerings/miso/client/MisoScenePanel.as b/aslib/src/main/as/com/threerings/miso/client/MisoScenePanel.as
similarity index 100%
rename from src/main/as/com/threerings/miso/client/MisoScenePanel.as
rename to aslib/src/main/as/com/threerings/miso/client/MisoScenePanel.as
diff --git a/src/main/as/com/threerings/miso/client/ObjectTileIsoSprite.as b/aslib/src/main/as/com/threerings/miso/client/ObjectTileIsoSprite.as
similarity index 100%
rename from src/main/as/com/threerings/miso/client/ObjectTileIsoSprite.as
rename to aslib/src/main/as/com/threerings/miso/client/ObjectTileIsoSprite.as
diff --git a/src/main/as/com/threerings/miso/client/PrioritizedSceneLayoutRenderer.as b/aslib/src/main/as/com/threerings/miso/client/PrioritizedSceneLayoutRenderer.as
similarity index 100%
rename from src/main/as/com/threerings/miso/client/PrioritizedSceneLayoutRenderer.as
rename to aslib/src/main/as/com/threerings/miso/client/PrioritizedSceneLayoutRenderer.as
diff --git a/src/main/as/com/threerings/miso/client/PriorityIsoDisplayObject.as b/aslib/src/main/as/com/threerings/miso/client/PriorityIsoDisplayObject.as
similarity index 100%
rename from src/main/as/com/threerings/miso/client/PriorityIsoDisplayObject.as
rename to aslib/src/main/as/com/threerings/miso/client/PriorityIsoDisplayObject.as
diff --git a/src/main/as/com/threerings/miso/client/SceneBlock.as b/aslib/src/main/as/com/threerings/miso/client/SceneBlock.as
similarity index 100%
rename from src/main/as/com/threerings/miso/client/SceneBlock.as
rename to aslib/src/main/as/com/threerings/miso/client/SceneBlock.as
diff --git a/src/main/as/com/threerings/miso/client/TileIsoSprite.as b/aslib/src/main/as/com/threerings/miso/client/TileIsoSprite.as
similarity index 100%
rename from src/main/as/com/threerings/miso/client/TileIsoSprite.as
rename to aslib/src/main/as/com/threerings/miso/client/TileIsoSprite.as
diff --git a/src/main/as/com/threerings/miso/data/MisoSceneModel.as b/aslib/src/main/as/com/threerings/miso/data/MisoSceneModel.as
similarity index 100%
rename from src/main/as/com/threerings/miso/data/MisoSceneModel.as
rename to aslib/src/main/as/com/threerings/miso/data/MisoSceneModel.as
diff --git a/src/main/as/com/threerings/miso/data/ObjectInfo.as b/aslib/src/main/as/com/threerings/miso/data/ObjectInfo.as
similarity index 100%
rename from src/main/as/com/threerings/miso/data/ObjectInfo.as
rename to aslib/src/main/as/com/threerings/miso/data/ObjectInfo.as
diff --git a/src/main/as/com/threerings/miso/data/SparseMisoSceneModel.as b/aslib/src/main/as/com/threerings/miso/data/SparseMisoSceneModel.as
similarity index 100%
rename from src/main/as/com/threerings/miso/data/SparseMisoSceneModel.as
rename to aslib/src/main/as/com/threerings/miso/data/SparseMisoSceneModel.as
diff --git a/src/main/as/com/threerings/miso/data/SparseMisoSceneModel_ObjectVisitor.as b/aslib/src/main/as/com/threerings/miso/data/SparseMisoSceneModel_ObjectVisitor.as
similarity index 100%
rename from src/main/as/com/threerings/miso/data/SparseMisoSceneModel_ObjectVisitor.as
rename to aslib/src/main/as/com/threerings/miso/data/SparseMisoSceneModel_ObjectVisitor.as
diff --git a/src/main/as/com/threerings/miso/data/SparseMisoSceneModel_Section.as b/aslib/src/main/as/com/threerings/miso/data/SparseMisoSceneModel_Section.as
similarity index 100%
rename from src/main/as/com/threerings/miso/data/SparseMisoSceneModel_Section.as
rename to aslib/src/main/as/com/threerings/miso/data/SparseMisoSceneModel_Section.as
diff --git a/src/main/as/com/threerings/miso/data/VirtualMisoSceneModel.as b/aslib/src/main/as/com/threerings/miso/data/VirtualMisoSceneModel.as
similarity index 100%
rename from src/main/as/com/threerings/miso/data/VirtualMisoSceneModel.as
rename to aslib/src/main/as/com/threerings/miso/data/VirtualMisoSceneModel.as
diff --git a/src/main/as/com/threerings/miso/tile/AutoFringer.as b/aslib/src/main/as/com/threerings/miso/tile/AutoFringer.as
similarity index 100%
rename from src/main/as/com/threerings/miso/tile/AutoFringer.as
rename to aslib/src/main/as/com/threerings/miso/tile/AutoFringer.as
diff --git a/src/main/as/com/threerings/miso/tile/FringeConfiguration.as b/aslib/src/main/as/com/threerings/miso/tile/FringeConfiguration.as
similarity index 100%
rename from src/main/as/com/threerings/miso/tile/FringeConfiguration.as
rename to aslib/src/main/as/com/threerings/miso/tile/FringeConfiguration.as
diff --git a/src/main/as/com/threerings/miso/tile/FringeRecord.as b/aslib/src/main/as/com/threerings/miso/tile/FringeRecord.as
similarity index 100%
rename from src/main/as/com/threerings/miso/tile/FringeRecord.as
rename to aslib/src/main/as/com/threerings/miso/tile/FringeRecord.as
diff --git a/src/main/as/com/threerings/miso/tile/FringeTile.as b/aslib/src/main/as/com/threerings/miso/tile/FringeTile.as
similarity index 100%
rename from src/main/as/com/threerings/miso/tile/FringeTile.as
rename to aslib/src/main/as/com/threerings/miso/tile/FringeTile.as
diff --git a/src/main/as/com/threerings/miso/tile/FringeTileSetRecord.as b/aslib/src/main/as/com/threerings/miso/tile/FringeTileSetRecord.as
similarity index 100%
rename from src/main/as/com/threerings/miso/tile/FringeTileSetRecord.as
rename to aslib/src/main/as/com/threerings/miso/tile/FringeTileSetRecord.as
diff --git a/src/main/as/com/threerings/miso/tile/MisoTileManager.as b/aslib/src/main/as/com/threerings/miso/tile/MisoTileManager.as
similarity index 100%
rename from src/main/as/com/threerings/miso/tile/MisoTileManager.as
rename to aslib/src/main/as/com/threerings/miso/tile/MisoTileManager.as
diff --git a/src/main/as/com/threerings/miso/util/MisoContext.as b/aslib/src/main/as/com/threerings/miso/util/MisoContext.as
similarity index 100%
rename from src/main/as/com/threerings/miso/util/MisoContext.as
rename to aslib/src/main/as/com/threerings/miso/util/MisoContext.as
diff --git a/src/main/as/com/threerings/miso/util/MisoSceneMetrics.as b/aslib/src/main/as/com/threerings/miso/util/MisoSceneMetrics.as
similarity index 100%
rename from src/main/as/com/threerings/miso/util/MisoSceneMetrics.as
rename to aslib/src/main/as/com/threerings/miso/util/MisoSceneMetrics.as
diff --git a/src/main/as/com/threerings/miso/util/MisoUtil.as b/aslib/src/main/as/com/threerings/miso/util/MisoUtil.as
similarity index 100%
rename from src/main/as/com/threerings/miso/util/MisoUtil.as
rename to aslib/src/main/as/com/threerings/miso/util/MisoUtil.as
diff --git a/src/main/as/com/threerings/miso/util/ObjectSet.as b/aslib/src/main/as/com/threerings/miso/util/ObjectSet.as
similarity index 100%
rename from src/main/as/com/threerings/miso/util/ObjectSet.as
rename to aslib/src/main/as/com/threerings/miso/util/ObjectSet.as
diff --git a/src/main/as/com/threerings/util/DirectionCodes.as b/aslib/src/main/as/com/threerings/util/DirectionCodes.as
similarity index 100%
rename from src/main/as/com/threerings/util/DirectionCodes.as
rename to aslib/src/main/as/com/threerings/util/DirectionCodes.as
diff --git a/src/main/as/com/threerings/util/DirectionUtil.as b/aslib/src/main/as/com/threerings/util/DirectionUtil.as
similarity index 100%
rename from src/main/as/com/threerings/util/DirectionUtil.as
rename to aslib/src/main/as/com/threerings/util/DirectionUtil.as
diff --git a/build.xml b/build.xml
index e09a500a..987349ea 100644
--- a/build.xml
+++ b/build.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" standalone="yes"?>
 <project name="nenya" default="compile" basedir="." xmlns:artifact="urn:maven-artifact-ant">
   <property name="deploy.dir"   location="dist"/>
-  <property name="src.dir"      location="src/main/java"/>
-  <property name="asrc.dir"     location="src/main/as"/>
-  <property name="tsrc.dir"     location="src/test/java"/>
+  <property name="src.dir"      location="core/src/main/java"/>
+  <property name="asrc.dir"     location="aslib/src/main/as"/>
   <property name="classes.dir"  location="${deploy.dir}/classes"/>
   <property name="tclasses.dir" location="${deploy.dir}/test-classes"/>
 
@@ -12,16 +11,29 @@
   <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
 
   <target name="-prepare" depends="-init-ooo">
-    <mavendep pom="pom.xml"/>
-    <mavendep pom="etc/as-pom.xml" pathProp="aslib.path"/>
-    <mavendep pom="pom.xml" id="test" scope="test"/>
+    <mavendep pom="core/pom.xml" id="core" pathProp="core.path"/>
+    <mavendep pom="core/pom.xml" id="test" scope="test"/>
+    <!-- we can't use <mavendep> here because we need to exclude our pom depends -->
+    <artifact:dependencies filesetId="aslib.fileset" cacheDependencyRefs="true" type="swc"
+      dependencyRefsBuildFile="${deploy.dir}/aslib-pom.dependencies">
+      <pom file="aslib/pom.xml"/>
+    </artifact:dependencies>
+    <pathconvert pathsep="," property="aslib.path" refid="aslib.fileset"/>
+    <!-- we can't just use the tools/pom.xml here because it references core/pom.xml -->
+    <!-- Maven Ant Tasks are retarded when it comes to multi-module POMs -->
+    <!-- so we have to repeat what's in the tools/pom.xml here, yay! -->
+    <mavendep id="tools-test">
+      <dependency groupId="commons-digester" artifactId="commons-digester" version="1.8"/>
+      <dependency groupId="com.megginson.sax" artifactId="xml-writer" version="0.2"/>
+    </mavendep>
     <mkdir dir="${deploy.dir}"/>
     <path id="built.classpath">
-      <path refid="pom.xml.path"/>
+      <path refid="core.path"/>
       <pathelement location="${classes.dir}"/>
     </path>
     <path id="test.classpath">
       <path refid="test.path"/>
+      <path refid="tools-test.path"/>
       <pathelement location="${classes.dir}"/>
       <pathelement location="${tclasses.dir}"/>
     </path>
@@ -61,8 +73,7 @@
 
   <target name="compile" depends="-prepare" description="Compiles source files.">
     <mkdir dir="${classes.dir}"/>
-    <ooojavac version="1.5" srcdir="${src.dir}" destdir="${classes.dir}"
-        classpathref="pom.xml.path">
+    <ooojavac version="1.5" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="core.path">
       <exclude name="**/OggPlayer.java"/>
       <exclude name="**/ModPlayer.java"/>
       <exclude name="**/MidiPlayer.java"/>
@@ -70,8 +81,13 @@
     </ooojavac>
 
     <mkdir dir="${tclasses.dir}"/>
-    <ooojavac srcdir="${tsrc.dir}" destdir="${tclasses.dir}"
-        version="1.5" classpathref="test.classpath"/>
+    <ooojavac srcdir="core/src/test/java" destdir="${tclasses.dir}" version="1.5"
+              classpathref="test.classpath"/>
+    <!-- we also need the tools main and test sources for our testing -->
+    <ooojavac srcdir="tools/src/main/java" destdir="${tclasses.dir}" version="1.5"
+              classpathref="test.classpath"/>
+    <ooojavac srcdir="tools/src/test/java" destdir="${tclasses.dir}" version="1.5"
+              classpathref="test.classpath"/>
   </target>
 
   <target name="procstream" depends="-preptools"
@@ -122,7 +138,8 @@
 
   <target name="-prep-test-rsrcs" depends="compile">
     <copy todir="${tclasses.dir}">
-      <fileset dir="src/test/resources" includes="**"/>
+      <fileset dir="core/src/test/resources" includes="**"/>
+      <fileset dir="tools/src/test/resources" includes="**"/>
     </copy>
     <property name="testrsrc.dir" value="${tclasses.dir}/rsrc"/>
   </target>
@@ -196,7 +213,8 @@
       <formatter type="brief" usefile="false"/>
       <formatter type="xml"/>
       <batchtest todir="${deploy.dir}/test-reports">
-        <fileset dir="${tsrc.dir}" includes="**/*${test}*Test.java"/>
+        <fileset dir="core/src/test/java" includes="**/*${test}*Test.java"/>
+        <fileset dir="tools/src/test/java" includes="**/*${test}*Test.java"/>
       </batchtest>
     </unit>
   </target>
@@ -208,34 +226,8 @@
           description="Cleans and rebuilds everything, including javadocs."/>
 
   <target name="dist" depends="-prepare,compile,procstream,-ninstall"
-          description="Compiles everything and builds distribution jar files.">
+          description="Compiles everything and builds distribution jar file.">
     <jar destfile="${deploy.dir}/${ant.project.name}.jar" basedir="${classes.dir}"/>
-    <!-- also build our various split jar files -->
-    <jar destfile="${deploy.dir}/${ant.project.name}-rsrc.jar">
-      <fileset dir="${classes.dir}" includes="com/threerings/resource/**"/>
-    </jar>
-    <jar destfile="${deploy.dir}/${ant.project.name}-media.jar">
-      <fileset dir="${classes.dir}" includes="com/threerings/geom/**"/>
-      <fileset dir="${classes.dir}" includes="com/threerings/media/**"/>
-      <fileset dir="${classes.dir}" includes="com/threerings/tools/**"/>
-      <fileset dir="${classes.dir}" includes="com/threerings/util/**"
-          excludes="**/*.c,**/Makefile,**/*.h"/>
-      <fileset dir="${classes.dir}" includes="com/threerings/NenyaLog*"/>
-    </jar>
-    <jar destfile="${deploy.dir}/${ant.project.name}-miso.jar">
-      <fileset dir="${classes.dir}" includes="com/threerings/miso/**"/>
-      <fileset dir="${classes.dir}" includes="rsrc/**/miso/**"/>
-    </jar>
-    <jar destfile="${deploy.dir}/${ant.project.name}-cast.jar">
-      <fileset dir="${classes.dir}" includes="com/threerings/cast/**"/>
-      <fileset dir="${classes.dir}" includes="rsrc/**/cast/**"/>
-    </jar>
-    <jar destfile="${deploy.dir}/${ant.project.name}-chat.jar">
-      <fileset dir="${classes.dir}" includes="com/threerings/chat/**"/>
-    </jar>
-    <jar destfile="${deploy.dir}/${ant.project.name}-openal.jar">
-      <fileset dir="${classes.dir}" includes="com/threerings/openal/**"/>
-    </jar>
   </target>
 
   <target name="genascript" depends="-preptools"
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 00000000..5cc9a852
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.threerings</groupId>
+    <artifactId>nenya-parent</artifactId>
+    <version>1.4-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>nenya</artifactId>
+  <packaging>jar</packaging>
+  <name>Nenya Core</name>
+
+  <repositories>
+    <repository>
+      <id>lwjgl-repo</id>
+      <url>http://lwjgl-maven.googlecode.com/svn/trunk/repository</url>
+    </repository>
+    <repository>
+      <id>ooo-repo</id>
+      <url>http://threerings.github.com/maven-repo</url>
+    </repository>
+    <repository>
+      <id>ooo-ext-repo</id>
+      <url>http://ooo-maven.googlecode.com/hg/repository</url>
+    </repository>
+  </repositories>
+
+  <dependencies>
+    <!-- exported dependencies -->
+    <dependency>
+      <groupId>com.samskivert</groupId>
+      <artifactId>samskivert</artifactId>
+      <version>1.5</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>11.0.1</version>
+    </dependency>
+
+    <!-- optional dependencies -->
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>narya</artifactId>
+      <version>${narya.version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.lwjgl</groupId>
+      <artifactId>lwjgl</artifactId>
+      <version>2.6</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.lwjgl</groupId>
+      <artifactId>lwjgl_util</artifactId>
+      <version>2.6</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>net.javazoom</groupId>
+      <artifactId>jlayer</artifactId>
+      <version>1.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jorbis</artifactId>
+      <version>0.0.15</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jogg</artifactId>
+      <version>0.0.7</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.8.0.GA</version>
+      <optional>true</optional>
+    </dependency>
+
+    <!-- test/build dependencies -->
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.7.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <!-- TODO: should these just be deleted? -->
+            <exclude>**/OggPlayer.java</exclude>
+            <exclude>**/ModPlayer.java</exclude>
+            <exclude>**/MidiPlayer.java</exclude>
+            <exclude>**/Mp3Player.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/main/java/com/threerings/NenyaLog.java b/core/src/main/java/com/threerings/NenyaLog.java
similarity index 100%
rename from src/main/java/com/threerings/NenyaLog.java
rename to core/src/main/java/com/threerings/NenyaLog.java
diff --git a/src/main/java/com/threerings/cast/ActionCache.java b/core/src/main/java/com/threerings/cast/ActionCache.java
similarity index 100%
rename from src/main/java/com/threerings/cast/ActionCache.java
rename to core/src/main/java/com/threerings/cast/ActionCache.java
diff --git a/src/main/java/com/threerings/cast/ActionFrames.java b/core/src/main/java/com/threerings/cast/ActionFrames.java
similarity index 100%
rename from src/main/java/com/threerings/cast/ActionFrames.java
rename to core/src/main/java/com/threerings/cast/ActionFrames.java
diff --git a/src/main/java/com/threerings/cast/ActionSequence.java b/core/src/main/java/com/threerings/cast/ActionSequence.java
similarity index 100%
rename from src/main/java/com/threerings/cast/ActionSequence.java
rename to core/src/main/java/com/threerings/cast/ActionSequence.java
diff --git a/src/main/java/com/threerings/cast/CastPrefs.java b/core/src/main/java/com/threerings/cast/CastPrefs.java
similarity index 100%
rename from src/main/java/com/threerings/cast/CastPrefs.java
rename to core/src/main/java/com/threerings/cast/CastPrefs.java
diff --git a/src/main/java/com/threerings/cast/CharacterComponent.java b/core/src/main/java/com/threerings/cast/CharacterComponent.java
similarity index 100%
rename from src/main/java/com/threerings/cast/CharacterComponent.java
rename to core/src/main/java/com/threerings/cast/CharacterComponent.java
diff --git a/src/main/java/com/threerings/cast/CharacterDescriptor.java b/core/src/main/java/com/threerings/cast/CharacterDescriptor.java
similarity index 100%
rename from src/main/java/com/threerings/cast/CharacterDescriptor.java
rename to core/src/main/java/com/threerings/cast/CharacterDescriptor.java
diff --git a/src/main/java/com/threerings/cast/CharacterManager.java b/core/src/main/java/com/threerings/cast/CharacterManager.java
similarity index 100%
rename from src/main/java/com/threerings/cast/CharacterManager.java
rename to core/src/main/java/com/threerings/cast/CharacterManager.java
diff --git a/src/main/java/com/threerings/cast/CharacterSprite.java b/core/src/main/java/com/threerings/cast/CharacterSprite.java
similarity index 100%
rename from src/main/java/com/threerings/cast/CharacterSprite.java
rename to core/src/main/java/com/threerings/cast/CharacterSprite.java
diff --git a/src/main/java/com/threerings/cast/ComponentClass.java b/core/src/main/java/com/threerings/cast/ComponentClass.java
similarity index 100%
rename from src/main/java/com/threerings/cast/ComponentClass.java
rename to core/src/main/java/com/threerings/cast/ComponentClass.java
diff --git a/src/main/java/com/threerings/cast/ComponentIDBroker.java b/core/src/main/java/com/threerings/cast/ComponentIDBroker.java
similarity index 100%
rename from src/main/java/com/threerings/cast/ComponentIDBroker.java
rename to core/src/main/java/com/threerings/cast/ComponentIDBroker.java
diff --git a/src/main/java/com/threerings/cast/ComponentRepository.java b/core/src/main/java/com/threerings/cast/ComponentRepository.java
similarity index 100%
rename from src/main/java/com/threerings/cast/ComponentRepository.java
rename to core/src/main/java/com/threerings/cast/ComponentRepository.java
diff --git a/src/main/java/com/threerings/cast/CompositedActionFrames.java b/core/src/main/java/com/threerings/cast/CompositedActionFrames.java
similarity index 100%
rename from src/main/java/com/threerings/cast/CompositedActionFrames.java
rename to core/src/main/java/com/threerings/cast/CompositedActionFrames.java
diff --git a/src/main/java/com/threerings/cast/CompositedMaskedImage.java b/core/src/main/java/com/threerings/cast/CompositedMaskedImage.java
similarity index 100%
rename from src/main/java/com/threerings/cast/CompositedMaskedImage.java
rename to core/src/main/java/com/threerings/cast/CompositedMaskedImage.java
diff --git a/src/main/java/com/threerings/cast/CompositedMirage.java b/core/src/main/java/com/threerings/cast/CompositedMirage.java
similarity index 100%
rename from src/main/java/com/threerings/cast/CompositedMirage.java
rename to core/src/main/java/com/threerings/cast/CompositedMirage.java
diff --git a/src/main/java/com/threerings/cast/CompositedMultiFrameImage.java b/core/src/main/java/com/threerings/cast/CompositedMultiFrameImage.java
similarity index 100%
rename from src/main/java/com/threerings/cast/CompositedMultiFrameImage.java
rename to core/src/main/java/com/threerings/cast/CompositedMultiFrameImage.java
diff --git a/src/main/java/com/threerings/cast/CompositedShadowImage.java b/core/src/main/java/com/threerings/cast/CompositedShadowImage.java
similarity index 100%
rename from src/main/java/com/threerings/cast/CompositedShadowImage.java
rename to core/src/main/java/com/threerings/cast/CompositedShadowImage.java
diff --git a/src/main/java/com/threerings/cast/FrameProvider.java b/core/src/main/java/com/threerings/cast/FrameProvider.java
similarity index 100%
rename from src/main/java/com/threerings/cast/FrameProvider.java
rename to core/src/main/java/com/threerings/cast/FrameProvider.java
diff --git a/src/main/java/com/threerings/cast/Log.java b/core/src/main/java/com/threerings/cast/Log.java
similarity index 100%
rename from src/main/java/com/threerings/cast/Log.java
rename to core/src/main/java/com/threerings/cast/Log.java
diff --git a/src/main/java/com/threerings/cast/NoSuchComponentException.java b/core/src/main/java/com/threerings/cast/NoSuchComponentException.java
similarity index 100%
rename from src/main/java/com/threerings/cast/NoSuchComponentException.java
rename to core/src/main/java/com/threerings/cast/NoSuchComponentException.java
diff --git a/src/main/java/com/threerings/cast/StandardActions.java b/core/src/main/java/com/threerings/cast/StandardActions.java
similarity index 100%
rename from src/main/java/com/threerings/cast/StandardActions.java
rename to core/src/main/java/com/threerings/cast/StandardActions.java
diff --git a/src/main/java/com/threerings/cast/TrimmedMultiFrameImage.java b/core/src/main/java/com/threerings/cast/TrimmedMultiFrameImage.java
similarity index 100%
rename from src/main/java/com/threerings/cast/TrimmedMultiFrameImage.java
rename to core/src/main/java/com/threerings/cast/TrimmedMultiFrameImage.java
diff --git a/src/main/java/com/threerings/cast/builder/BuilderModel.java b/core/src/main/java/com/threerings/cast/builder/BuilderModel.java
similarity index 100%
rename from src/main/java/com/threerings/cast/builder/BuilderModel.java
rename to core/src/main/java/com/threerings/cast/builder/BuilderModel.java
diff --git a/src/main/java/com/threerings/cast/builder/BuilderModelListener.java b/core/src/main/java/com/threerings/cast/builder/BuilderModelListener.java
similarity index 100%
rename from src/main/java/com/threerings/cast/builder/BuilderModelListener.java
rename to core/src/main/java/com/threerings/cast/builder/BuilderModelListener.java
diff --git a/src/main/java/com/threerings/cast/builder/BuilderPanel.java b/core/src/main/java/com/threerings/cast/builder/BuilderPanel.java
similarity index 100%
rename from src/main/java/com/threerings/cast/builder/BuilderPanel.java
rename to core/src/main/java/com/threerings/cast/builder/BuilderPanel.java
diff --git a/src/main/java/com/threerings/cast/builder/ClassEditor.java b/core/src/main/java/com/threerings/cast/builder/ClassEditor.java
similarity index 100%
rename from src/main/java/com/threerings/cast/builder/ClassEditor.java
rename to core/src/main/java/com/threerings/cast/builder/ClassEditor.java
diff --git a/src/main/java/com/threerings/cast/builder/ComponentPanel.java b/core/src/main/java/com/threerings/cast/builder/ComponentPanel.java
similarity index 100%
rename from src/main/java/com/threerings/cast/builder/ComponentPanel.java
rename to core/src/main/java/com/threerings/cast/builder/ComponentPanel.java
diff --git a/src/main/java/com/threerings/cast/builder/SpritePanel.java b/core/src/main/java/com/threerings/cast/builder/SpritePanel.java
similarity index 100%
rename from src/main/java/com/threerings/cast/builder/SpritePanel.java
rename to core/src/main/java/com/threerings/cast/builder/SpritePanel.java
diff --git a/src/main/java/com/threerings/cast/bundle/BundleUtil.java b/core/src/main/java/com/threerings/cast/bundle/BundleUtil.java
similarity index 100%
rename from src/main/java/com/threerings/cast/bundle/BundleUtil.java
rename to core/src/main/java/com/threerings/cast/bundle/BundleUtil.java
diff --git a/src/main/java/com/threerings/cast/bundle/BundledComponentRepository.java b/core/src/main/java/com/threerings/cast/bundle/BundledComponentRepository.java
similarity index 100%
rename from src/main/java/com/threerings/cast/bundle/BundledComponentRepository.java
rename to core/src/main/java/com/threerings/cast/bundle/BundledComponentRepository.java
diff --git a/src/main/java/com/threerings/cast/util/CastUtil.java b/core/src/main/java/com/threerings/cast/util/CastUtil.java
similarity index 100%
rename from src/main/java/com/threerings/cast/util/CastUtil.java
rename to core/src/main/java/com/threerings/cast/util/CastUtil.java
diff --git a/src/main/java/com/threerings/chat/ChatGlyph.java b/core/src/main/java/com/threerings/chat/ChatGlyph.java
similarity index 100%
rename from src/main/java/com/threerings/chat/ChatGlyph.java
rename to core/src/main/java/com/threerings/chat/ChatGlyph.java
diff --git a/src/main/java/com/threerings/chat/ChatLogic.java b/core/src/main/java/com/threerings/chat/ChatLogic.java
similarity index 100%
rename from src/main/java/com/threerings/chat/ChatLogic.java
rename to core/src/main/java/com/threerings/chat/ChatLogic.java
diff --git a/src/main/java/com/threerings/chat/ChatOverlay.java b/core/src/main/java/com/threerings/chat/ChatOverlay.java
similarity index 100%
rename from src/main/java/com/threerings/chat/ChatOverlay.java
rename to core/src/main/java/com/threerings/chat/ChatOverlay.java
diff --git a/src/main/java/com/threerings/chat/ComicChatOverlay.java b/core/src/main/java/com/threerings/chat/ComicChatOverlay.java
similarity index 100%
rename from src/main/java/com/threerings/chat/ComicChatOverlay.java
rename to core/src/main/java/com/threerings/chat/ComicChatOverlay.java
diff --git a/src/main/java/com/threerings/chat/SubtitleChatOverlay.java b/core/src/main/java/com/threerings/chat/SubtitleChatOverlay.java
similarity index 100%
rename from src/main/java/com/threerings/chat/SubtitleChatOverlay.java
rename to core/src/main/java/com/threerings/chat/SubtitleChatOverlay.java
diff --git a/src/main/java/com/threerings/geom/GeomUtil.java b/core/src/main/java/com/threerings/geom/GeomUtil.java
similarity index 100%
rename from src/main/java/com/threerings/geom/GeomUtil.java
rename to core/src/main/java/com/threerings/geom/GeomUtil.java
diff --git a/src/main/java/com/threerings/geom/Log.java b/core/src/main/java/com/threerings/geom/Log.java
similarity index 100%
rename from src/main/java/com/threerings/geom/Log.java
rename to core/src/main/java/com/threerings/geom/Log.java
diff --git a/src/main/java/com/threerings/media/AbstractMedia.java b/core/src/main/java/com/threerings/media/AbstractMedia.java
similarity index 100%
rename from src/main/java/com/threerings/media/AbstractMedia.java
rename to core/src/main/java/com/threerings/media/AbstractMedia.java
diff --git a/src/main/java/com/threerings/media/AbstractMediaManager.java b/core/src/main/java/com/threerings/media/AbstractMediaManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/AbstractMediaManager.java
rename to core/src/main/java/com/threerings/media/AbstractMediaManager.java
diff --git a/src/main/java/com/threerings/media/ActiveRepaintManager.java b/core/src/main/java/com/threerings/media/ActiveRepaintManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/ActiveRepaintManager.java
rename to core/src/main/java/com/threerings/media/ActiveRepaintManager.java
diff --git a/src/main/java/com/threerings/media/BackFrameManager.java b/core/src/main/java/com/threerings/media/BackFrameManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/BackFrameManager.java
rename to core/src/main/java/com/threerings/media/BackFrameManager.java
diff --git a/src/main/java/com/threerings/media/FlipFrameManager.java b/core/src/main/java/com/threerings/media/FlipFrameManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/FlipFrameManager.java
rename to core/src/main/java/com/threerings/media/FlipFrameManager.java
diff --git a/src/main/java/com/threerings/media/FrameInterval.java b/core/src/main/java/com/threerings/media/FrameInterval.java
similarity index 100%
rename from src/main/java/com/threerings/media/FrameInterval.java
rename to core/src/main/java/com/threerings/media/FrameInterval.java
diff --git a/src/main/java/com/threerings/media/FrameManager.java b/core/src/main/java/com/threerings/media/FrameManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/FrameManager.java
rename to core/src/main/java/com/threerings/media/FrameManager.java
diff --git a/src/main/java/com/threerings/media/FrameParticipant.java b/core/src/main/java/com/threerings/media/FrameParticipant.java
similarity index 100%
rename from src/main/java/com/threerings/media/FrameParticipant.java
rename to core/src/main/java/com/threerings/media/FrameParticipant.java
diff --git a/src/main/java/com/threerings/media/HourglassView.java b/core/src/main/java/com/threerings/media/HourglassView.java
similarity index 100%
rename from src/main/java/com/threerings/media/HourglassView.java
rename to core/src/main/java/com/threerings/media/HourglassView.java
diff --git a/src/main/java/com/threerings/media/IconManager.java b/core/src/main/java/com/threerings/media/IconManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/IconManager.java
rename to core/src/main/java/com/threerings/media/IconManager.java
diff --git a/src/main/java/com/threerings/media/Log.java b/core/src/main/java/com/threerings/media/Log.java
similarity index 100%
rename from src/main/java/com/threerings/media/Log.java
rename to core/src/main/java/com/threerings/media/Log.java
diff --git a/src/main/java/com/threerings/media/ManagedJApplet.java b/core/src/main/java/com/threerings/media/ManagedJApplet.java
similarity index 100%
rename from src/main/java/com/threerings/media/ManagedJApplet.java
rename to core/src/main/java/com/threerings/media/ManagedJApplet.java
diff --git a/src/main/java/com/threerings/media/ManagedJFrame.java b/core/src/main/java/com/threerings/media/ManagedJFrame.java
similarity index 100%
rename from src/main/java/com/threerings/media/ManagedJFrame.java
rename to core/src/main/java/com/threerings/media/ManagedJFrame.java
diff --git a/src/main/java/com/threerings/media/MediaConstants.java b/core/src/main/java/com/threerings/media/MediaConstants.java
similarity index 100%
rename from src/main/java/com/threerings/media/MediaConstants.java
rename to core/src/main/java/com/threerings/media/MediaConstants.java
diff --git a/src/main/java/com/threerings/media/MediaHost.java b/core/src/main/java/com/threerings/media/MediaHost.java
similarity index 100%
rename from src/main/java/com/threerings/media/MediaHost.java
rename to core/src/main/java/com/threerings/media/MediaHost.java
diff --git a/src/main/java/com/threerings/media/MediaOverlay.java b/core/src/main/java/com/threerings/media/MediaOverlay.java
similarity index 100%
rename from src/main/java/com/threerings/media/MediaOverlay.java
rename to core/src/main/java/com/threerings/media/MediaOverlay.java
diff --git a/src/main/java/com/threerings/media/MediaPanel.java b/core/src/main/java/com/threerings/media/MediaPanel.java
similarity index 100%
rename from src/main/java/com/threerings/media/MediaPanel.java
rename to core/src/main/java/com/threerings/media/MediaPanel.java
diff --git a/src/main/java/com/threerings/media/MediaPrefs.java b/core/src/main/java/com/threerings/media/MediaPrefs.java
similarity index 100%
rename from src/main/java/com/threerings/media/MediaPrefs.java
rename to core/src/main/java/com/threerings/media/MediaPrefs.java
diff --git a/src/main/java/com/threerings/media/MetaMediaManager.java b/core/src/main/java/com/threerings/media/MetaMediaManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/MetaMediaManager.java
rename to core/src/main/java/com/threerings/media/MetaMediaManager.java
diff --git a/src/main/java/com/threerings/media/RegionManager.java b/core/src/main/java/com/threerings/media/RegionManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/RegionManager.java
rename to core/src/main/java/com/threerings/media/RegionManager.java
diff --git a/src/main/java/com/threerings/media/SafeScrollPane.java b/core/src/main/java/com/threerings/media/SafeScrollPane.java
similarity index 100%
rename from src/main/java/com/threerings/media/SafeScrollPane.java
rename to core/src/main/java/com/threerings/media/SafeScrollPane.java
diff --git a/src/main/java/com/threerings/media/TimerView.java b/core/src/main/java/com/threerings/media/TimerView.java
similarity index 100%
rename from src/main/java/com/threerings/media/TimerView.java
rename to core/src/main/java/com/threerings/media/TimerView.java
diff --git a/src/main/java/com/threerings/media/ViewTracker.java b/core/src/main/java/com/threerings/media/ViewTracker.java
similarity index 100%
rename from src/main/java/com/threerings/media/ViewTracker.java
rename to core/src/main/java/com/threerings/media/ViewTracker.java
diff --git a/src/main/java/com/threerings/media/VirtualMediaPanel.java b/core/src/main/java/com/threerings/media/VirtualMediaPanel.java
similarity index 100%
rename from src/main/java/com/threerings/media/VirtualMediaPanel.java
rename to core/src/main/java/com/threerings/media/VirtualMediaPanel.java
diff --git a/src/main/java/com/threerings/media/VirtualRangeModel.java b/core/src/main/java/com/threerings/media/VirtualRangeModel.java
similarity index 100%
rename from src/main/java/com/threerings/media/VirtualRangeModel.java
rename to core/src/main/java/com/threerings/media/VirtualRangeModel.java
diff --git a/src/main/java/com/threerings/media/animation/Animation.java b/core/src/main/java/com/threerings/media/animation/Animation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/Animation.java
rename to core/src/main/java/com/threerings/media/animation/Animation.java
diff --git a/src/main/java/com/threerings/media/animation/AnimationAdapter.java b/core/src/main/java/com/threerings/media/animation/AnimationAdapter.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/AnimationAdapter.java
rename to core/src/main/java/com/threerings/media/animation/AnimationAdapter.java
diff --git a/src/main/java/com/threerings/media/animation/AnimationArranger.java b/core/src/main/java/com/threerings/media/animation/AnimationArranger.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/AnimationArranger.java
rename to core/src/main/java/com/threerings/media/animation/AnimationArranger.java
diff --git a/src/main/java/com/threerings/media/animation/AnimationFrameSequencer.java b/core/src/main/java/com/threerings/media/animation/AnimationFrameSequencer.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/AnimationFrameSequencer.java
rename to core/src/main/java/com/threerings/media/animation/AnimationFrameSequencer.java
diff --git a/src/main/java/com/threerings/media/animation/AnimationManager.java b/core/src/main/java/com/threerings/media/animation/AnimationManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/AnimationManager.java
rename to core/src/main/java/com/threerings/media/animation/AnimationManager.java
diff --git a/src/main/java/com/threerings/media/animation/AnimationObserver.java b/core/src/main/java/com/threerings/media/animation/AnimationObserver.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/AnimationObserver.java
rename to core/src/main/java/com/threerings/media/animation/AnimationObserver.java
diff --git a/src/main/java/com/threerings/media/animation/AnimationSequencer.java b/core/src/main/java/com/threerings/media/animation/AnimationSequencer.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/AnimationSequencer.java
rename to core/src/main/java/com/threerings/media/animation/AnimationSequencer.java
diff --git a/src/main/java/com/threerings/media/animation/AnimationSprite.java b/core/src/main/java/com/threerings/media/animation/AnimationSprite.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/AnimationSprite.java
rename to core/src/main/java/com/threerings/media/animation/AnimationSprite.java
diff --git a/src/main/java/com/threerings/media/animation/AnimationWaiter.java b/core/src/main/java/com/threerings/media/animation/AnimationWaiter.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/AnimationWaiter.java
rename to core/src/main/java/com/threerings/media/animation/AnimationWaiter.java
diff --git a/src/main/java/com/threerings/media/animation/BlankAnimation.java b/core/src/main/java/com/threerings/media/animation/BlankAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/BlankAnimation.java
rename to core/src/main/java/com/threerings/media/animation/BlankAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/BlendAnimation.java b/core/src/main/java/com/threerings/media/animation/BlendAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/BlendAnimation.java
rename to core/src/main/java/com/threerings/media/animation/BlendAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/BobbleAnimation.java b/core/src/main/java/com/threerings/media/animation/BobbleAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/BobbleAnimation.java
rename to core/src/main/java/com/threerings/media/animation/BobbleAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/ExplodeAnimation.java b/core/src/main/java/com/threerings/media/animation/ExplodeAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/ExplodeAnimation.java
rename to core/src/main/java/com/threerings/media/animation/ExplodeAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/FadeAnimation.java b/core/src/main/java/com/threerings/media/animation/FadeAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/FadeAnimation.java
rename to core/src/main/java/com/threerings/media/animation/FadeAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/FadeImageAnimation.java b/core/src/main/java/com/threerings/media/animation/FadeImageAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/FadeImageAnimation.java
rename to core/src/main/java/com/threerings/media/animation/FadeImageAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/FadeLabelAnimation.java b/core/src/main/java/com/threerings/media/animation/FadeLabelAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/FadeLabelAnimation.java
rename to core/src/main/java/com/threerings/media/animation/FadeLabelAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/FloatingTextAnimation.java b/core/src/main/java/com/threerings/media/animation/FloatingTextAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/FloatingTextAnimation.java
rename to core/src/main/java/com/threerings/media/animation/FloatingTextAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/GleamAnimation.java b/core/src/main/java/com/threerings/media/animation/GleamAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/GleamAnimation.java
rename to core/src/main/java/com/threerings/media/animation/GleamAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/MultiFrameAnimation.java b/core/src/main/java/com/threerings/media/animation/MultiFrameAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/MultiFrameAnimation.java
rename to core/src/main/java/com/threerings/media/animation/MultiFrameAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/RainAnimation.java b/core/src/main/java/com/threerings/media/animation/RainAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/RainAnimation.java
rename to core/src/main/java/com/threerings/media/animation/RainAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/ScaleAnimation.java b/core/src/main/java/com/threerings/media/animation/ScaleAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/ScaleAnimation.java
rename to core/src/main/java/com/threerings/media/animation/ScaleAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/SequencedAnimationObserver.java b/core/src/main/java/com/threerings/media/animation/SequencedAnimationObserver.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/SequencedAnimationObserver.java
rename to core/src/main/java/com/threerings/media/animation/SequencedAnimationObserver.java
diff --git a/src/main/java/com/threerings/media/animation/SparkAnimation.java b/core/src/main/java/com/threerings/media/animation/SparkAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/SparkAnimation.java
rename to core/src/main/java/com/threerings/media/animation/SparkAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/SpriteAnimation.java b/core/src/main/java/com/threerings/media/animation/SpriteAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/SpriteAnimation.java
rename to core/src/main/java/com/threerings/media/animation/SpriteAnimation.java
diff --git a/src/main/java/com/threerings/media/animation/SpritePathAnimation.java b/core/src/main/java/com/threerings/media/animation/SpritePathAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/media/animation/SpritePathAnimation.java
rename to core/src/main/java/com/threerings/media/animation/SpritePathAnimation.java
diff --git a/src/main/java/com/threerings/media/effects/FadeEffect.java b/core/src/main/java/com/threerings/media/effects/FadeEffect.java
similarity index 100%
rename from src/main/java/com/threerings/media/effects/FadeEffect.java
rename to core/src/main/java/com/threerings/media/effects/FadeEffect.java
diff --git a/src/main/java/com/threerings/media/image/AWTImageCreator.java b/core/src/main/java/com/threerings/media/image/AWTImageCreator.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/AWTImageCreator.java
rename to core/src/main/java/com/threerings/media/image/AWTImageCreator.java
diff --git a/src/main/java/com/threerings/media/image/BackedVolatileMirage.java b/core/src/main/java/com/threerings/media/image/BackedVolatileMirage.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/BackedVolatileMirage.java
rename to core/src/main/java/com/threerings/media/image/BackedVolatileMirage.java
diff --git a/src/main/java/com/threerings/media/image/BlankMirage.java b/core/src/main/java/com/threerings/media/image/BlankMirage.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/BlankMirage.java
rename to core/src/main/java/com/threerings/media/image/BlankMirage.java
diff --git a/src/main/java/com/threerings/media/image/BufferedMirage.java b/core/src/main/java/com/threerings/media/image/BufferedMirage.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/BufferedMirage.java
rename to core/src/main/java/com/threerings/media/image/BufferedMirage.java
diff --git a/src/main/java/com/threerings/media/image/CachedVolatileMirage.java b/core/src/main/java/com/threerings/media/image/CachedVolatileMirage.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/CachedVolatileMirage.java
rename to core/src/main/java/com/threerings/media/image/CachedVolatileMirage.java
diff --git a/src/main/java/com/threerings/media/image/ClientImageManager.java b/core/src/main/java/com/threerings/media/image/ClientImageManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/ClientImageManager.java
rename to core/src/main/java/com/threerings/media/image/ClientImageManager.java
diff --git a/src/main/java/com/threerings/media/image/ColorPository.java b/core/src/main/java/com/threerings/media/image/ColorPository.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/ColorPository.java
rename to core/src/main/java/com/threerings/media/image/ColorPository.java
diff --git a/src/main/java/com/threerings/media/image/ColorUtil.java b/core/src/main/java/com/threerings/media/image/ColorUtil.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/ColorUtil.java
rename to core/src/main/java/com/threerings/media/image/ColorUtil.java
diff --git a/src/main/java/com/threerings/media/image/Colorization.java b/core/src/main/java/com/threerings/media/image/Colorization.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/Colorization.java
rename to core/src/main/java/com/threerings/media/image/Colorization.java
diff --git a/src/main/java/com/threerings/media/image/CompositeMirage.java b/core/src/main/java/com/threerings/media/image/CompositeMirage.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/CompositeMirage.java
rename to core/src/main/java/com/threerings/media/image/CompositeMirage.java
diff --git a/src/main/java/com/threerings/media/image/ImageDataProvider.java b/core/src/main/java/com/threerings/media/image/ImageDataProvider.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/ImageDataProvider.java
rename to core/src/main/java/com/threerings/media/image/ImageDataProvider.java
diff --git a/src/main/java/com/threerings/media/image/ImageManager.java b/core/src/main/java/com/threerings/media/image/ImageManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/ImageManager.java
rename to core/src/main/java/com/threerings/media/image/ImageManager.java
diff --git a/src/main/java/com/threerings/media/image/ImageUtil.java b/core/src/main/java/com/threerings/media/image/ImageUtil.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/ImageUtil.java
rename to core/src/main/java/com/threerings/media/image/ImageUtil.java
diff --git a/src/main/java/com/threerings/media/image/Mirage.java b/core/src/main/java/com/threerings/media/image/Mirage.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/Mirage.java
rename to core/src/main/java/com/threerings/media/image/Mirage.java
diff --git a/src/main/java/com/threerings/media/image/MirageIcon.java b/core/src/main/java/com/threerings/media/image/MirageIcon.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/MirageIcon.java
rename to core/src/main/java/com/threerings/media/image/MirageIcon.java
diff --git a/src/main/java/com/threerings/media/image/NinePatch.java b/core/src/main/java/com/threerings/media/image/NinePatch.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/NinePatch.java
rename to core/src/main/java/com/threerings/media/image/NinePatch.java
diff --git a/src/main/java/com/threerings/media/image/NinePatchMirage.java b/core/src/main/java/com/threerings/media/image/NinePatchMirage.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/NinePatchMirage.java
rename to core/src/main/java/com/threerings/media/image/NinePatchMirage.java
diff --git a/src/main/java/com/threerings/media/image/Quantize.java b/core/src/main/java/com/threerings/media/image/Quantize.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/Quantize.java
rename to core/src/main/java/com/threerings/media/image/Quantize.java
diff --git a/src/main/java/com/threerings/media/image/SolidMirage.java b/core/src/main/java/com/threerings/media/image/SolidMirage.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/SolidMirage.java
rename to core/src/main/java/com/threerings/media/image/SolidMirage.java
diff --git a/src/main/java/com/threerings/media/image/TransformedMirage.java b/core/src/main/java/com/threerings/media/image/TransformedMirage.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/TransformedMirage.java
rename to core/src/main/java/com/threerings/media/image/TransformedMirage.java
diff --git a/src/main/java/com/threerings/media/image/VolatileMirage.java b/core/src/main/java/com/threerings/media/image/VolatileMirage.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/VolatileMirage.java
rename to core/src/main/java/com/threerings/media/image/VolatileMirage.java
diff --git a/src/main/java/com/threerings/media/sound/JavaSoundPlayer.java b/core/src/main/java/com/threerings/media/sound/JavaSoundPlayer.java
similarity index 100%
rename from src/main/java/com/threerings/media/sound/JavaSoundPlayer.java
rename to core/src/main/java/com/threerings/media/sound/JavaSoundPlayer.java
diff --git a/src/main/java/com/threerings/media/sound/SoundCodes.java b/core/src/main/java/com/threerings/media/sound/SoundCodes.java
similarity index 100%
rename from src/main/java/com/threerings/media/sound/SoundCodes.java
rename to core/src/main/java/com/threerings/media/sound/SoundCodes.java
diff --git a/src/main/java/com/threerings/media/sound/SoundEnabledObserver.java b/core/src/main/java/com/threerings/media/sound/SoundEnabledObserver.java
similarity index 100%
rename from src/main/java/com/threerings/media/sound/SoundEnabledObserver.java
rename to core/src/main/java/com/threerings/media/sound/SoundEnabledObserver.java
diff --git a/src/main/java/com/threerings/media/sound/SoundLoader.java b/core/src/main/java/com/threerings/media/sound/SoundLoader.java
similarity index 100%
rename from src/main/java/com/threerings/media/sound/SoundLoader.java
rename to core/src/main/java/com/threerings/media/sound/SoundLoader.java
diff --git a/src/main/java/com/threerings/media/sound/SoundManager.java b/core/src/main/java/com/threerings/media/sound/SoundManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/sound/SoundManager.java
rename to core/src/main/java/com/threerings/media/sound/SoundManager.java
diff --git a/src/main/java/com/threerings/media/sound/SoundPlayer.java b/core/src/main/java/com/threerings/media/sound/SoundPlayer.java
similarity index 100%
rename from src/main/java/com/threerings/media/sound/SoundPlayer.java
rename to core/src/main/java/com/threerings/media/sound/SoundPlayer.java
diff --git a/src/main/java/com/threerings/media/sound/Sounds.java b/core/src/main/java/com/threerings/media/sound/Sounds.java
similarity index 100%
rename from src/main/java/com/threerings/media/sound/Sounds.java
rename to core/src/main/java/com/threerings/media/sound/Sounds.java
diff --git a/src/main/java/com/threerings/media/sprite/ButtonSprite.java b/core/src/main/java/com/threerings/media/sprite/ButtonSprite.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/ButtonSprite.java
rename to core/src/main/java/com/threerings/media/sprite/ButtonSprite.java
diff --git a/src/main/java/com/threerings/media/sprite/FadableImageSprite.java b/core/src/main/java/com/threerings/media/sprite/FadableImageSprite.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/FadableImageSprite.java
rename to core/src/main/java/com/threerings/media/sprite/FadableImageSprite.java
diff --git a/src/main/java/com/threerings/media/sprite/ImageSprite.java b/core/src/main/java/com/threerings/media/sprite/ImageSprite.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/ImageSprite.java
rename to core/src/main/java/com/threerings/media/sprite/ImageSprite.java
diff --git a/src/main/java/com/threerings/media/sprite/LabelSprite.java b/core/src/main/java/com/threerings/media/sprite/LabelSprite.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/LabelSprite.java
rename to core/src/main/java/com/threerings/media/sprite/LabelSprite.java
diff --git a/src/main/java/com/threerings/media/sprite/OrientableImageSprite.java b/core/src/main/java/com/threerings/media/sprite/OrientableImageSprite.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/OrientableImageSprite.java
rename to core/src/main/java/com/threerings/media/sprite/OrientableImageSprite.java
diff --git a/src/main/java/com/threerings/media/sprite/PathAdapter.java b/core/src/main/java/com/threerings/media/sprite/PathAdapter.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/PathAdapter.java
rename to core/src/main/java/com/threerings/media/sprite/PathAdapter.java
diff --git a/src/main/java/com/threerings/media/sprite/PathObserver.java b/core/src/main/java/com/threerings/media/sprite/PathObserver.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/PathObserver.java
rename to core/src/main/java/com/threerings/media/sprite/PathObserver.java
diff --git a/src/main/java/com/threerings/media/sprite/Sprite.java b/core/src/main/java/com/threerings/media/sprite/Sprite.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/Sprite.java
rename to core/src/main/java/com/threerings/media/sprite/Sprite.java
diff --git a/src/main/java/com/threerings/media/sprite/SpriteIcon.java b/core/src/main/java/com/threerings/media/sprite/SpriteIcon.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/SpriteIcon.java
rename to core/src/main/java/com/threerings/media/sprite/SpriteIcon.java
diff --git a/src/main/java/com/threerings/media/sprite/SpriteManager.java b/core/src/main/java/com/threerings/media/sprite/SpriteManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/SpriteManager.java
rename to core/src/main/java/com/threerings/media/sprite/SpriteManager.java
diff --git a/src/main/java/com/threerings/media/sprite/action/ActionSprite.java b/core/src/main/java/com/threerings/media/sprite/action/ActionSprite.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/action/ActionSprite.java
rename to core/src/main/java/com/threerings/media/sprite/action/ActionSprite.java
diff --git a/src/main/java/com/threerings/media/sprite/action/ArmingSprite.java b/core/src/main/java/com/threerings/media/sprite/action/ArmingSprite.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/action/ArmingSprite.java
rename to core/src/main/java/com/threerings/media/sprite/action/ArmingSprite.java
diff --git a/src/main/java/com/threerings/media/sprite/action/CommandSprite.java b/core/src/main/java/com/threerings/media/sprite/action/CommandSprite.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/action/CommandSprite.java
rename to core/src/main/java/com/threerings/media/sprite/action/CommandSprite.java
diff --git a/src/main/java/com/threerings/media/sprite/action/DisableableSprite.java b/core/src/main/java/com/threerings/media/sprite/action/DisableableSprite.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/action/DisableableSprite.java
rename to core/src/main/java/com/threerings/media/sprite/action/DisableableSprite.java
diff --git a/src/main/java/com/threerings/media/sprite/action/HoverSprite.java b/core/src/main/java/com/threerings/media/sprite/action/HoverSprite.java
similarity index 100%
rename from src/main/java/com/threerings/media/sprite/action/HoverSprite.java
rename to core/src/main/java/com/threerings/media/sprite/action/HoverSprite.java
diff --git a/src/main/java/com/threerings/media/tile/BaseSizableTileSet.java b/core/src/main/java/com/threerings/media/tile/BaseSizableTileSet.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/BaseSizableTileSet.java
rename to core/src/main/java/com/threerings/media/tile/BaseSizableTileSet.java
diff --git a/src/main/java/com/threerings/media/tile/IMImageProvider.java b/core/src/main/java/com/threerings/media/tile/IMImageProvider.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/IMImageProvider.java
rename to core/src/main/java/com/threerings/media/tile/IMImageProvider.java
diff --git a/src/main/java/com/threerings/media/tile/ImageProvider.java b/core/src/main/java/com/threerings/media/tile/ImageProvider.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/ImageProvider.java
rename to core/src/main/java/com/threerings/media/tile/ImageProvider.java
diff --git a/src/main/java/com/threerings/media/tile/NoSuchTileSetException.java b/core/src/main/java/com/threerings/media/tile/NoSuchTileSetException.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/NoSuchTileSetException.java
rename to core/src/main/java/com/threerings/media/tile/NoSuchTileSetException.java
diff --git a/src/main/java/com/threerings/media/tile/ObjectTile.java b/core/src/main/java/com/threerings/media/tile/ObjectTile.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/ObjectTile.java
rename to core/src/main/java/com/threerings/media/tile/ObjectTile.java
diff --git a/src/main/java/com/threerings/media/tile/ObjectTileSet.java b/core/src/main/java/com/threerings/media/tile/ObjectTileSet.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/ObjectTileSet.java
rename to core/src/main/java/com/threerings/media/tile/ObjectTileSet.java
diff --git a/src/main/java/com/threerings/media/tile/RecolorableTileSet.java b/core/src/main/java/com/threerings/media/tile/RecolorableTileSet.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/RecolorableTileSet.java
rename to core/src/main/java/com/threerings/media/tile/RecolorableTileSet.java
diff --git a/src/main/java/com/threerings/media/tile/SimpleCachingImageProvider.java b/core/src/main/java/com/threerings/media/tile/SimpleCachingImageProvider.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/SimpleCachingImageProvider.java
rename to core/src/main/java/com/threerings/media/tile/SimpleCachingImageProvider.java
diff --git a/src/main/java/com/threerings/media/tile/SwissArmyTileSet.java b/core/src/main/java/com/threerings/media/tile/SwissArmyTileSet.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/SwissArmyTileSet.java
rename to core/src/main/java/com/threerings/media/tile/SwissArmyTileSet.java
diff --git a/src/main/java/com/threerings/media/tile/Tile.java b/core/src/main/java/com/threerings/media/tile/Tile.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/Tile.java
rename to core/src/main/java/com/threerings/media/tile/Tile.java
diff --git a/src/main/java/com/threerings/media/tile/TileIcon.java b/core/src/main/java/com/threerings/media/tile/TileIcon.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/TileIcon.java
rename to core/src/main/java/com/threerings/media/tile/TileIcon.java
diff --git a/src/main/java/com/threerings/media/tile/TileManager.java b/core/src/main/java/com/threerings/media/tile/TileManager.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/TileManager.java
rename to core/src/main/java/com/threerings/media/tile/TileManager.java
diff --git a/src/main/java/com/threerings/media/tile/TileMultiFrameImage.java b/core/src/main/java/com/threerings/media/tile/TileMultiFrameImage.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/TileMultiFrameImage.java
rename to core/src/main/java/com/threerings/media/tile/TileMultiFrameImage.java
diff --git a/src/main/java/com/threerings/media/tile/TileSet.java b/core/src/main/java/com/threerings/media/tile/TileSet.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/TileSet.java
rename to core/src/main/java/com/threerings/media/tile/TileSet.java
diff --git a/src/main/java/com/threerings/media/tile/TileSetIDBroker.java b/core/src/main/java/com/threerings/media/tile/TileSetIDBroker.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/TileSetIDBroker.java
rename to core/src/main/java/com/threerings/media/tile/TileSetIDBroker.java
diff --git a/src/main/java/com/threerings/media/tile/TileSetRepository.java b/core/src/main/java/com/threerings/media/tile/TileSetRepository.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/TileSetRepository.java
rename to core/src/main/java/com/threerings/media/tile/TileSetRepository.java
diff --git a/src/main/java/com/threerings/media/tile/TileSubsetMultiFrameImage.java b/core/src/main/java/com/threerings/media/tile/TileSubsetMultiFrameImage.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/TileSubsetMultiFrameImage.java
rename to core/src/main/java/com/threerings/media/tile/TileSubsetMultiFrameImage.java
diff --git a/src/main/java/com/threerings/media/tile/TileUtil.java b/core/src/main/java/com/threerings/media/tile/TileUtil.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/TileUtil.java
rename to core/src/main/java/com/threerings/media/tile/TileUtil.java
diff --git a/src/main/java/com/threerings/media/tile/TrimmedObjectTileSet.java b/core/src/main/java/com/threerings/media/tile/TrimmedObjectTileSet.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/TrimmedObjectTileSet.java
rename to core/src/main/java/com/threerings/media/tile/TrimmedObjectTileSet.java
diff --git a/src/main/java/com/threerings/media/tile/TrimmedTile.java b/core/src/main/java/com/threerings/media/tile/TrimmedTile.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/TrimmedTile.java
rename to core/src/main/java/com/threerings/media/tile/TrimmedTile.java
diff --git a/src/main/java/com/threerings/media/tile/TrimmedTileSet.java b/core/src/main/java/com/threerings/media/tile/TrimmedTileSet.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/TrimmedTileSet.java
rename to core/src/main/java/com/threerings/media/tile/TrimmedTileSet.java
diff --git a/src/main/java/com/threerings/media/tile/UniformTileSet.java b/core/src/main/java/com/threerings/media/tile/UniformTileSet.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/UniformTileSet.java
rename to core/src/main/java/com/threerings/media/tile/UniformTileSet.java
diff --git a/src/main/java/com/threerings/media/tile/bundle/BundleUtil.java b/core/src/main/java/com/threerings/media/tile/bundle/BundleUtil.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/bundle/BundleUtil.java
rename to core/src/main/java/com/threerings/media/tile/bundle/BundleUtil.java
diff --git a/src/main/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java b/core/src/main/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java
rename to core/src/main/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java
diff --git a/src/main/java/com/threerings/media/tile/bundle/TileSetBundle.java b/core/src/main/java/com/threerings/media/tile/bundle/TileSetBundle.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/bundle/TileSetBundle.java
rename to core/src/main/java/com/threerings/media/tile/bundle/TileSetBundle.java
diff --git a/src/main/java/com/threerings/media/tile/util/TileSetTrimmer.java b/core/src/main/java/com/threerings/media/tile/util/TileSetTrimmer.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/util/TileSetTrimmer.java
rename to core/src/main/java/com/threerings/media/tile/util/TileSetTrimmer.java
diff --git a/src/main/java/com/threerings/media/timer/CalibratingTimer.java b/core/src/main/java/com/threerings/media/timer/CalibratingTimer.java
similarity index 100%
rename from src/main/java/com/threerings/media/timer/CalibratingTimer.java
rename to core/src/main/java/com/threerings/media/timer/CalibratingTimer.java
diff --git a/src/main/java/com/threerings/media/timer/MediaTimer.java b/core/src/main/java/com/threerings/media/timer/MediaTimer.java
similarity index 100%
rename from src/main/java/com/threerings/media/timer/MediaTimer.java
rename to core/src/main/java/com/threerings/media/timer/MediaTimer.java
diff --git a/src/main/java/com/threerings/media/timer/MillisTimer.java b/core/src/main/java/com/threerings/media/timer/MillisTimer.java
similarity index 100%
rename from src/main/java/com/threerings/media/timer/MillisTimer.java
rename to core/src/main/java/com/threerings/media/timer/MillisTimer.java
diff --git a/src/main/java/com/threerings/media/timer/NanoTimer.java b/core/src/main/java/com/threerings/media/timer/NanoTimer.java
similarity index 100%
rename from src/main/java/com/threerings/media/timer/NanoTimer.java
rename to core/src/main/java/com/threerings/media/timer/NanoTimer.java
diff --git a/src/main/java/com/threerings/media/timer/PerfTimer.java b/core/src/main/java/com/threerings/media/timer/PerfTimer.java
similarity index 100%
rename from src/main/java/com/threerings/media/timer/PerfTimer.java
rename to core/src/main/java/com/threerings/media/timer/PerfTimer.java
diff --git a/src/main/java/com/threerings/media/util/AStarPathUtil.java b/core/src/main/java/com/threerings/media/util/AStarPathUtil.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/AStarPathUtil.java
rename to core/src/main/java/com/threerings/media/util/AStarPathUtil.java
diff --git a/src/main/java/com/threerings/media/util/ArcPath.java b/core/src/main/java/com/threerings/media/util/ArcPath.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/ArcPath.java
rename to core/src/main/java/com/threerings/media/util/ArcPath.java
diff --git a/src/main/java/com/threerings/media/util/BackgroundTiler.java b/core/src/main/java/com/threerings/media/util/BackgroundTiler.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/BackgroundTiler.java
rename to core/src/main/java/com/threerings/media/util/BackgroundTiler.java
diff --git a/src/main/java/com/threerings/media/util/BobblePath.java b/core/src/main/java/com/threerings/media/util/BobblePath.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/BobblePath.java
rename to core/src/main/java/com/threerings/media/util/BobblePath.java
diff --git a/src/main/java/com/threerings/media/util/DelayPath.java b/core/src/main/java/com/threerings/media/util/DelayPath.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/DelayPath.java
rename to core/src/main/java/com/threerings/media/util/DelayPath.java
diff --git a/src/main/java/com/threerings/media/util/DelegatingPathable.java b/core/src/main/java/com/threerings/media/util/DelegatingPathable.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/DelegatingPathable.java
rename to core/src/main/java/com/threerings/media/util/DelegatingPathable.java
diff --git a/src/main/java/com/threerings/media/util/FrameSequencer.java b/core/src/main/java/com/threerings/media/util/FrameSequencer.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/FrameSequencer.java
rename to core/src/main/java/com/threerings/media/util/FrameSequencer.java
diff --git a/src/main/java/com/threerings/media/util/LinePath.java b/core/src/main/java/com/threerings/media/util/LinePath.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/LinePath.java
rename to core/src/main/java/com/threerings/media/util/LinePath.java
diff --git a/src/main/java/com/threerings/media/util/LineSegmentPath.java b/core/src/main/java/com/threerings/media/util/LineSegmentPath.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/LineSegmentPath.java
rename to core/src/main/java/com/threerings/media/util/LineSegmentPath.java
diff --git a/src/main/java/com/threerings/media/util/LinearTimeFunction.java b/core/src/main/java/com/threerings/media/util/LinearTimeFunction.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/LinearTimeFunction.java
rename to core/src/main/java/com/threerings/media/util/LinearTimeFunction.java
diff --git a/src/main/java/com/threerings/media/util/MathUtil.java b/core/src/main/java/com/threerings/media/util/MathUtil.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/MathUtil.java
rename to core/src/main/java/com/threerings/media/util/MathUtil.java
diff --git a/src/main/java/com/threerings/media/util/ModeUtil.java b/core/src/main/java/com/threerings/media/util/ModeUtil.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/ModeUtil.java
rename to core/src/main/java/com/threerings/media/util/ModeUtil.java
diff --git a/src/main/java/com/threerings/media/util/MultiFrameImage.java b/core/src/main/java/com/threerings/media/util/MultiFrameImage.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/MultiFrameImage.java
rename to core/src/main/java/com/threerings/media/util/MultiFrameImage.java
diff --git a/src/main/java/com/threerings/media/util/MultiFrameImageImpl.java b/core/src/main/java/com/threerings/media/util/MultiFrameImageImpl.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/MultiFrameImageImpl.java
rename to core/src/main/java/com/threerings/media/util/MultiFrameImageImpl.java
diff --git a/src/main/java/com/threerings/media/util/Path.java b/core/src/main/java/com/threerings/media/util/Path.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/Path.java
rename to core/src/main/java/com/threerings/media/util/Path.java
diff --git a/src/main/java/com/threerings/media/util/PathNode.java b/core/src/main/java/com/threerings/media/util/PathNode.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/PathNode.java
rename to core/src/main/java/com/threerings/media/util/PathNode.java
diff --git a/src/main/java/com/threerings/media/util/PathSequence.java b/core/src/main/java/com/threerings/media/util/PathSequence.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/PathSequence.java
rename to core/src/main/java/com/threerings/media/util/PathSequence.java
diff --git a/src/main/java/com/threerings/media/util/Pathable.java b/core/src/main/java/com/threerings/media/util/Pathable.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/Pathable.java
rename to core/src/main/java/com/threerings/media/util/Pathable.java
diff --git a/src/main/java/com/threerings/media/util/PerformanceMonitor.java b/core/src/main/java/com/threerings/media/util/PerformanceMonitor.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/PerformanceMonitor.java
rename to core/src/main/java/com/threerings/media/util/PerformanceMonitor.java
diff --git a/src/main/java/com/threerings/media/util/PerformanceObserver.java b/core/src/main/java/com/threerings/media/util/PerformanceObserver.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/PerformanceObserver.java
rename to core/src/main/java/com/threerings/media/util/PerformanceObserver.java
diff --git a/src/main/java/com/threerings/media/util/SingleFrameImageImpl.java b/core/src/main/java/com/threerings/media/util/SingleFrameImageImpl.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/SingleFrameImageImpl.java
rename to core/src/main/java/com/threerings/media/util/SingleFrameImageImpl.java
diff --git a/src/main/java/com/threerings/media/util/SingleTileImageImpl.java b/core/src/main/java/com/threerings/media/util/SingleTileImageImpl.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/SingleTileImageImpl.java
rename to core/src/main/java/com/threerings/media/util/SingleTileImageImpl.java
diff --git a/src/main/java/com/threerings/media/util/SmoothBobblePath.java b/core/src/main/java/com/threerings/media/util/SmoothBobblePath.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/SmoothBobblePath.java
rename to core/src/main/java/com/threerings/media/util/SmoothBobblePath.java
diff --git a/src/main/java/com/threerings/media/util/TiledArea.java b/core/src/main/java/com/threerings/media/util/TiledArea.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/TiledArea.java
rename to core/src/main/java/com/threerings/media/util/TiledArea.java
diff --git a/src/main/java/com/threerings/media/util/TimeFunction.java b/core/src/main/java/com/threerings/media/util/TimeFunction.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/TimeFunction.java
rename to core/src/main/java/com/threerings/media/util/TimeFunction.java
diff --git a/src/main/java/com/threerings/media/util/TimedPath.java b/core/src/main/java/com/threerings/media/util/TimedPath.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/TimedPath.java
rename to core/src/main/java/com/threerings/media/util/TimedPath.java
diff --git a/src/main/java/com/threerings/media/util/TrailingAverage.java b/core/src/main/java/com/threerings/media/util/TrailingAverage.java
similarity index 100%
rename from src/main/java/com/threerings/media/util/TrailingAverage.java
rename to core/src/main/java/com/threerings/media/util/TrailingAverage.java
diff --git a/src/main/java/com/threerings/miso/Log.java b/core/src/main/java/com/threerings/miso/Log.java
similarity index 100%
rename from src/main/java/com/threerings/miso/Log.java
rename to core/src/main/java/com/threerings/miso/Log.java
diff --git a/src/main/java/com/threerings/miso/MisoConfig.java b/core/src/main/java/com/threerings/miso/MisoConfig.java
similarity index 100%
rename from src/main/java/com/threerings/miso/MisoConfig.java
rename to core/src/main/java/com/threerings/miso/MisoConfig.java
diff --git a/src/main/java/com/threerings/miso/MisoPrefs.java b/core/src/main/java/com/threerings/miso/MisoPrefs.java
similarity index 100%
rename from src/main/java/com/threerings/miso/MisoPrefs.java
rename to core/src/main/java/com/threerings/miso/MisoPrefs.java
diff --git a/src/main/java/com/threerings/miso/client/DirtyItemList.java b/core/src/main/java/com/threerings/miso/client/DirtyItemList.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/DirtyItemList.java
rename to core/src/main/java/com/threerings/miso/client/DirtyItemList.java
diff --git a/src/main/java/com/threerings/miso/client/MisoScenePanel.java b/core/src/main/java/com/threerings/miso/client/MisoScenePanel.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/MisoScenePanel.java
rename to core/src/main/java/com/threerings/miso/client/MisoScenePanel.java
diff --git a/src/main/java/com/threerings/miso/client/MultiTileSprite.java b/core/src/main/java/com/threerings/miso/client/MultiTileSprite.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/MultiTileSprite.java
rename to core/src/main/java/com/threerings/miso/client/MultiTileSprite.java
diff --git a/src/main/java/com/threerings/miso/client/ObjectActionHandler.java b/core/src/main/java/com/threerings/miso/client/ObjectActionHandler.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/ObjectActionHandler.java
rename to core/src/main/java/com/threerings/miso/client/ObjectActionHandler.java
diff --git a/src/main/java/com/threerings/miso/client/ResolutionView.java b/core/src/main/java/com/threerings/miso/client/ResolutionView.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/ResolutionView.java
rename to core/src/main/java/com/threerings/miso/client/ResolutionView.java
diff --git a/src/main/java/com/threerings/miso/client/RethinkOp.java b/core/src/main/java/com/threerings/miso/client/RethinkOp.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/RethinkOp.java
rename to core/src/main/java/com/threerings/miso/client/RethinkOp.java
diff --git a/src/main/java/com/threerings/miso/client/SceneBlock.java b/core/src/main/java/com/threerings/miso/client/SceneBlock.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/SceneBlock.java
rename to core/src/main/java/com/threerings/miso/client/SceneBlock.java
diff --git a/src/main/java/com/threerings/miso/client/SceneBlockResolver.java b/core/src/main/java/com/threerings/miso/client/SceneBlockResolver.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/SceneBlockResolver.java
rename to core/src/main/java/com/threerings/miso/client/SceneBlockResolver.java
diff --git a/src/main/java/com/threerings/miso/client/SceneObject.java b/core/src/main/java/com/threerings/miso/client/SceneObject.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/SceneObject.java
rename to core/src/main/java/com/threerings/miso/client/SceneObject.java
diff --git a/src/main/java/com/threerings/miso/client/SceneObjectActionEvent.java b/core/src/main/java/com/threerings/miso/client/SceneObjectActionEvent.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/SceneObjectActionEvent.java
rename to core/src/main/java/com/threerings/miso/client/SceneObjectActionEvent.java
diff --git a/src/main/java/com/threerings/miso/client/SceneObjectIndicator.java b/core/src/main/java/com/threerings/miso/client/SceneObjectIndicator.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/SceneObjectIndicator.java
rename to core/src/main/java/com/threerings/miso/client/SceneObjectIndicator.java
diff --git a/src/main/java/com/threerings/miso/client/SceneObjectTip.java b/core/src/main/java/com/threerings/miso/client/SceneObjectTip.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/SceneObjectTip.java
rename to core/src/main/java/com/threerings/miso/client/SceneObjectTip.java
diff --git a/src/main/java/com/threerings/miso/client/TileOp.java b/core/src/main/java/com/threerings/miso/client/TileOp.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/TileOp.java
rename to core/src/main/java/com/threerings/miso/client/TileOp.java
diff --git a/src/main/java/com/threerings/miso/client/TileOpApplicator.java b/core/src/main/java/com/threerings/miso/client/TileOpApplicator.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/TileOpApplicator.java
rename to core/src/main/java/com/threerings/miso/client/TileOpApplicator.java
diff --git a/src/main/java/com/threerings/miso/client/TilePath.java b/core/src/main/java/com/threerings/miso/client/TilePath.java
similarity index 100%
rename from src/main/java/com/threerings/miso/client/TilePath.java
rename to core/src/main/java/com/threerings/miso/client/TilePath.java
diff --git a/src/main/java/com/threerings/miso/data/MisoSceneModel.java b/core/src/main/java/com/threerings/miso/data/MisoSceneModel.java
similarity index 100%
rename from src/main/java/com/threerings/miso/data/MisoSceneModel.java
rename to core/src/main/java/com/threerings/miso/data/MisoSceneModel.java
diff --git a/src/main/java/com/threerings/miso/data/ObjectInfo.java b/core/src/main/java/com/threerings/miso/data/ObjectInfo.java
similarity index 100%
rename from src/main/java/com/threerings/miso/data/ObjectInfo.java
rename to core/src/main/java/com/threerings/miso/data/ObjectInfo.java
diff --git a/src/main/java/com/threerings/miso/data/SimpleMisoSceneModel.java b/core/src/main/java/com/threerings/miso/data/SimpleMisoSceneModel.java
similarity index 100%
rename from src/main/java/com/threerings/miso/data/SimpleMisoSceneModel.java
rename to core/src/main/java/com/threerings/miso/data/SimpleMisoSceneModel.java
diff --git a/src/main/java/com/threerings/miso/data/SparseMisoSceneModel.java b/core/src/main/java/com/threerings/miso/data/SparseMisoSceneModel.java
similarity index 100%
rename from src/main/java/com/threerings/miso/data/SparseMisoSceneModel.java
rename to core/src/main/java/com/threerings/miso/data/SparseMisoSceneModel.java
diff --git a/src/main/java/com/threerings/miso/data/VirtualMisoSceneModel.java b/core/src/main/java/com/threerings/miso/data/VirtualMisoSceneModel.java
similarity index 100%
rename from src/main/java/com/threerings/miso/data/VirtualMisoSceneModel.java
rename to core/src/main/java/com/threerings/miso/data/VirtualMisoSceneModel.java
diff --git a/src/main/java/com/threerings/miso/tile/AutoFringer.java b/core/src/main/java/com/threerings/miso/tile/AutoFringer.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tile/AutoFringer.java
rename to core/src/main/java/com/threerings/miso/tile/AutoFringer.java
diff --git a/src/main/java/com/threerings/miso/tile/BaseTile.java b/core/src/main/java/com/threerings/miso/tile/BaseTile.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tile/BaseTile.java
rename to core/src/main/java/com/threerings/miso/tile/BaseTile.java
diff --git a/src/main/java/com/threerings/miso/tile/BaseTileSet.java b/core/src/main/java/com/threerings/miso/tile/BaseTileSet.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tile/BaseTileSet.java
rename to core/src/main/java/com/threerings/miso/tile/BaseTileSet.java
diff --git a/src/main/java/com/threerings/miso/tile/FringeConfiguration.java b/core/src/main/java/com/threerings/miso/tile/FringeConfiguration.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tile/FringeConfiguration.java
rename to core/src/main/java/com/threerings/miso/tile/FringeConfiguration.java
diff --git a/src/main/java/com/threerings/miso/tile/MisoTileManager.java b/core/src/main/java/com/threerings/miso/tile/MisoTileManager.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tile/MisoTileManager.java
rename to core/src/main/java/com/threerings/miso/tile/MisoTileManager.java
diff --git a/src/main/java/com/threerings/miso/util/MisoContext.java b/core/src/main/java/com/threerings/miso/util/MisoContext.java
similarity index 100%
rename from src/main/java/com/threerings/miso/util/MisoContext.java
rename to core/src/main/java/com/threerings/miso/util/MisoContext.java
diff --git a/src/main/java/com/threerings/miso/util/MisoSceneMetrics.java b/core/src/main/java/com/threerings/miso/util/MisoSceneMetrics.java
similarity index 100%
rename from src/main/java/com/threerings/miso/util/MisoSceneMetrics.java
rename to core/src/main/java/com/threerings/miso/util/MisoSceneMetrics.java
diff --git a/src/main/java/com/threerings/miso/util/MisoUtil.java b/core/src/main/java/com/threerings/miso/util/MisoUtil.java
similarity index 100%
rename from src/main/java/com/threerings/miso/util/MisoUtil.java
rename to core/src/main/java/com/threerings/miso/util/MisoUtil.java
diff --git a/src/main/java/com/threerings/miso/util/ObjectSet.java b/core/src/main/java/com/threerings/miso/util/ObjectSet.java
similarity index 100%
rename from src/main/java/com/threerings/miso/util/ObjectSet.java
rename to core/src/main/java/com/threerings/miso/util/ObjectSet.java
diff --git a/src/main/java/com/threerings/openal/BlankSound.java b/core/src/main/java/com/threerings/openal/BlankSound.java
similarity index 100%
rename from src/main/java/com/threerings/openal/BlankSound.java
rename to core/src/main/java/com/threerings/openal/BlankSound.java
diff --git a/src/main/java/com/threerings/openal/Buffer.java b/core/src/main/java/com/threerings/openal/Buffer.java
similarity index 100%
rename from src/main/java/com/threerings/openal/Buffer.java
rename to core/src/main/java/com/threerings/openal/Buffer.java
diff --git a/src/main/java/com/threerings/openal/Clip.java b/core/src/main/java/com/threerings/openal/Clip.java
similarity index 100%
rename from src/main/java/com/threerings/openal/Clip.java
rename to core/src/main/java/com/threerings/openal/Clip.java
diff --git a/src/main/java/com/threerings/openal/ClipBuffer.java b/core/src/main/java/com/threerings/openal/ClipBuffer.java
similarity index 100%
rename from src/main/java/com/threerings/openal/ClipBuffer.java
rename to core/src/main/java/com/threerings/openal/ClipBuffer.java
diff --git a/src/main/java/com/threerings/openal/ClipProvider.java b/core/src/main/java/com/threerings/openal/ClipProvider.java
similarity index 100%
rename from src/main/java/com/threerings/openal/ClipProvider.java
rename to core/src/main/java/com/threerings/openal/ClipProvider.java
diff --git a/src/main/java/com/threerings/openal/FileStream.java b/core/src/main/java/com/threerings/openal/FileStream.java
similarity index 100%
rename from src/main/java/com/threerings/openal/FileStream.java
rename to core/src/main/java/com/threerings/openal/FileStream.java
diff --git a/src/main/java/com/threerings/openal/Listener.java b/core/src/main/java/com/threerings/openal/Listener.java
similarity index 100%
rename from src/main/java/com/threerings/openal/Listener.java
rename to core/src/main/java/com/threerings/openal/Listener.java
diff --git a/src/main/java/com/threerings/openal/Log.java b/core/src/main/java/com/threerings/openal/Log.java
similarity index 100%
rename from src/main/java/com/threerings/openal/Log.java
rename to core/src/main/java/com/threerings/openal/Log.java
diff --git a/src/main/java/com/threerings/openal/Mp3StreamDecoder.java b/core/src/main/java/com/threerings/openal/Mp3StreamDecoder.java
similarity index 100%
rename from src/main/java/com/threerings/openal/Mp3StreamDecoder.java
rename to core/src/main/java/com/threerings/openal/Mp3StreamDecoder.java
diff --git a/src/main/java/com/threerings/openal/OggStreamDecoder.java b/core/src/main/java/com/threerings/openal/OggStreamDecoder.java
similarity index 100%
rename from src/main/java/com/threerings/openal/OggStreamDecoder.java
rename to core/src/main/java/com/threerings/openal/OggStreamDecoder.java
diff --git a/src/main/java/com/threerings/openal/OpenALSoundPlayer.java b/core/src/main/java/com/threerings/openal/OpenALSoundPlayer.java
similarity index 100%
rename from src/main/java/com/threerings/openal/OpenALSoundPlayer.java
rename to core/src/main/java/com/threerings/openal/OpenALSoundPlayer.java
diff --git a/src/main/java/com/threerings/openal/ResourceStream.java b/core/src/main/java/com/threerings/openal/ResourceStream.java
similarity index 100%
rename from src/main/java/com/threerings/openal/ResourceStream.java
rename to core/src/main/java/com/threerings/openal/ResourceStream.java
diff --git a/src/main/java/com/threerings/openal/Sound.java b/core/src/main/java/com/threerings/openal/Sound.java
similarity index 100%
rename from src/main/java/com/threerings/openal/Sound.java
rename to core/src/main/java/com/threerings/openal/Sound.java
diff --git a/src/main/java/com/threerings/openal/SoundGroup.java b/core/src/main/java/com/threerings/openal/SoundGroup.java
similarity index 100%
rename from src/main/java/com/threerings/openal/SoundGroup.java
rename to core/src/main/java/com/threerings/openal/SoundGroup.java
diff --git a/src/main/java/com/threerings/openal/SoundManager.java b/core/src/main/java/com/threerings/openal/SoundManager.java
similarity index 100%
rename from src/main/java/com/threerings/openal/SoundManager.java
rename to core/src/main/java/com/threerings/openal/SoundManager.java
diff --git a/src/main/java/com/threerings/openal/Source.java b/core/src/main/java/com/threerings/openal/Source.java
similarity index 100%
rename from src/main/java/com/threerings/openal/Source.java
rename to core/src/main/java/com/threerings/openal/Source.java
diff --git a/src/main/java/com/threerings/openal/Stream.java b/core/src/main/java/com/threerings/openal/Stream.java
similarity index 100%
rename from src/main/java/com/threerings/openal/Stream.java
rename to core/src/main/java/com/threerings/openal/Stream.java
diff --git a/src/main/java/com/threerings/openal/StreamDecoder.java b/core/src/main/java/com/threerings/openal/StreamDecoder.java
similarity index 100%
rename from src/main/java/com/threerings/openal/StreamDecoder.java
rename to core/src/main/java/com/threerings/openal/StreamDecoder.java
diff --git a/src/main/java/com/threerings/openal/URLStream.java b/core/src/main/java/com/threerings/openal/URLStream.java
similarity index 100%
rename from src/main/java/com/threerings/openal/URLStream.java
rename to core/src/main/java/com/threerings/openal/URLStream.java
diff --git a/src/main/java/com/threerings/openal/WaveDataClipProvider.java b/core/src/main/java/com/threerings/openal/WaveDataClipProvider.java
similarity index 100%
rename from src/main/java/com/threerings/openal/WaveDataClipProvider.java
rename to core/src/main/java/com/threerings/openal/WaveDataClipProvider.java
diff --git a/src/main/java/com/threerings/resource/FastImageIO.java b/core/src/main/java/com/threerings/resource/FastImageIO.java
similarity index 100%
rename from src/main/java/com/threerings/resource/FastImageIO.java
rename to core/src/main/java/com/threerings/resource/FastImageIO.java
diff --git a/src/main/java/com/threerings/resource/FileResourceBundle.java b/core/src/main/java/com/threerings/resource/FileResourceBundle.java
similarity index 100%
rename from src/main/java/com/threerings/resource/FileResourceBundle.java
rename to core/src/main/java/com/threerings/resource/FileResourceBundle.java
diff --git a/src/main/java/com/threerings/resource/Handler.java b/core/src/main/java/com/threerings/resource/Handler.java
similarity index 100%
rename from src/main/java/com/threerings/resource/Handler.java
rename to core/src/main/java/com/threerings/resource/Handler.java
diff --git a/src/main/java/com/threerings/resource/KnownAvailabilityResourceBundle.java b/core/src/main/java/com/threerings/resource/KnownAvailabilityResourceBundle.java
similarity index 100%
rename from src/main/java/com/threerings/resource/KnownAvailabilityResourceBundle.java
rename to core/src/main/java/com/threerings/resource/KnownAvailabilityResourceBundle.java
diff --git a/src/main/java/com/threerings/resource/Log.java b/core/src/main/java/com/threerings/resource/Log.java
similarity index 100%
rename from src/main/java/com/threerings/resource/Log.java
rename to core/src/main/java/com/threerings/resource/Log.java
diff --git a/src/main/java/com/threerings/resource/NetworkResourceBundle.java b/core/src/main/java/com/threerings/resource/NetworkResourceBundle.java
similarity index 100%
rename from src/main/java/com/threerings/resource/NetworkResourceBundle.java
rename to core/src/main/java/com/threerings/resource/NetworkResourceBundle.java
diff --git a/src/main/java/com/threerings/resource/ResourceBundle.java b/core/src/main/java/com/threerings/resource/ResourceBundle.java
similarity index 100%
rename from src/main/java/com/threerings/resource/ResourceBundle.java
rename to core/src/main/java/com/threerings/resource/ResourceBundle.java
diff --git a/src/main/java/com/threerings/resource/ResourceManager.java b/core/src/main/java/com/threerings/resource/ResourceManager.java
similarity index 100%
rename from src/main/java/com/threerings/resource/ResourceManager.java
rename to core/src/main/java/com/threerings/resource/ResourceManager.java
diff --git a/src/main/java/com/threerings/util/BrowserUtil.java b/core/src/main/java/com/threerings/util/BrowserUtil.java
similarity index 100%
rename from src/main/java/com/threerings/util/BrowserUtil.java
rename to core/src/main/java/com/threerings/util/BrowserUtil.java
diff --git a/src/main/java/com/threerings/util/CompiledConfig.java b/core/src/main/java/com/threerings/util/CompiledConfig.java
similarity index 100%
rename from src/main/java/com/threerings/util/CompiledConfig.java
rename to core/src/main/java/com/threerings/util/CompiledConfig.java
diff --git a/src/main/java/com/threerings/util/DirectionCodes.java b/core/src/main/java/com/threerings/util/DirectionCodes.java
similarity index 100%
rename from src/main/java/com/threerings/util/DirectionCodes.java
rename to core/src/main/java/com/threerings/util/DirectionCodes.java
diff --git a/src/main/java/com/threerings/util/DirectionUtil.java b/core/src/main/java/com/threerings/util/DirectionUtil.java
similarity index 100%
rename from src/main/java/com/threerings/util/DirectionUtil.java
rename to core/src/main/java/com/threerings/util/DirectionUtil.java
diff --git a/src/main/java/com/threerings/util/FileUtil.java b/core/src/main/java/com/threerings/util/FileUtil.java
similarity index 100%
rename from src/main/java/com/threerings/util/FileUtil.java
rename to core/src/main/java/com/threerings/util/FileUtil.java
diff --git a/src/main/java/com/threerings/util/IdleTracker.java b/core/src/main/java/com/threerings/util/IdleTracker.java
similarity index 100%
rename from src/main/java/com/threerings/util/IdleTracker.java
rename to core/src/main/java/com/threerings/util/IdleTracker.java
diff --git a/src/main/java/com/threerings/util/KeyDispatcher.java b/core/src/main/java/com/threerings/util/KeyDispatcher.java
similarity index 100%
rename from src/main/java/com/threerings/util/KeyDispatcher.java
rename to core/src/main/java/com/threerings/util/KeyDispatcher.java
diff --git a/src/main/java/com/threerings/util/KeyTranslator.java b/core/src/main/java/com/threerings/util/KeyTranslator.java
similarity index 100%
rename from src/main/java/com/threerings/util/KeyTranslator.java
rename to core/src/main/java/com/threerings/util/KeyTranslator.java
diff --git a/src/main/java/com/threerings/util/KeyTranslatorImpl.java b/core/src/main/java/com/threerings/util/KeyTranslatorImpl.java
similarity index 100%
rename from src/main/java/com/threerings/util/KeyTranslatorImpl.java
rename to core/src/main/java/com/threerings/util/KeyTranslatorImpl.java
diff --git a/src/main/java/com/threerings/util/KeyboardManager.java b/core/src/main/java/com/threerings/util/KeyboardManager.java
similarity index 100%
rename from src/main/java/com/threerings/util/KeyboardManager.java
rename to core/src/main/java/com/threerings/util/KeyboardManager.java
diff --git a/src/main/java/com/threerings/util/keybd/Keyboard.java b/core/src/main/java/com/threerings/util/keybd/Keyboard.java
similarity index 100%
rename from src/main/java/com/threerings/util/keybd/Keyboard.java
rename to core/src/main/java/com/threerings/util/keybd/Keyboard.java
diff --git a/src/main/java/com/threerings/util/keybd/Linux/Makefile b/core/src/main/java/com/threerings/util/keybd/Linux/Makefile
similarity index 100%
rename from src/main/java/com/threerings/util/keybd/Linux/Makefile
rename to core/src/main/java/com/threerings/util/keybd/Linux/Makefile
diff --git a/src/main/java/com/threerings/util/keybd/Linux/com_threerings_util_keybd_Keyboard.c b/core/src/main/java/com/threerings/util/keybd/Linux/com_threerings_util_keybd_Keyboard.c
similarity index 100%
rename from src/main/java/com/threerings/util/keybd/Linux/com_threerings_util_keybd_Keyboard.c
rename to core/src/main/java/com/threerings/util/keybd/Linux/com_threerings_util_keybd_Keyboard.c
diff --git a/src/main/java/com/threerings/util/keybd/Linux/libkeybd.so b/core/src/main/java/com/threerings/util/keybd/Linux/libkeybd.so
similarity index 100%
rename from src/main/java/com/threerings/util/keybd/Linux/libkeybd.so
rename to core/src/main/java/com/threerings/util/keybd/Linux/libkeybd.so
diff --git a/src/main/java/com/threerings/util/keybd/Mac OS X/Makefile b/core/src/main/java/com/threerings/util/keybd/Mac OS X/Makefile
similarity index 100%
rename from src/main/java/com/threerings/util/keybd/Mac OS X/Makefile
rename to core/src/main/java/com/threerings/util/keybd/Mac OS X/Makefile
diff --git a/src/main/java/com/threerings/util/keybd/Windows/Makefile b/core/src/main/java/com/threerings/util/keybd/Windows/Makefile
similarity index 100%
rename from src/main/java/com/threerings/util/keybd/Windows/Makefile
rename to core/src/main/java/com/threerings/util/keybd/Windows/Makefile
diff --git a/src/main/java/com/threerings/util/keybd/Windows/com_threerings_util_keybd_Keyboard.c b/core/src/main/java/com/threerings/util/keybd/Windows/com_threerings_util_keybd_Keyboard.c
similarity index 100%
rename from src/main/java/com/threerings/util/keybd/Windows/com_threerings_util_keybd_Keyboard.c
rename to core/src/main/java/com/threerings/util/keybd/Windows/com_threerings_util_keybd_Keyboard.c
diff --git a/src/main/java/com/threerings/util/keybd/com_threerings_util_keybd_Keyboard.h b/core/src/main/java/com/threerings/util/keybd/com_threerings_util_keybd_Keyboard.h
similarity index 100%
rename from src/main/java/com/threerings/util/keybd/com_threerings_util_keybd_Keyboard.h
rename to core/src/main/java/com/threerings/util/keybd/com_threerings_util_keybd_Keyboard.h
diff --git a/src/main/java/com/threerings/util/unsafe/Darwin b/core/src/main/java/com/threerings/util/unsafe/Darwin
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/Darwin
rename to core/src/main/java/com/threerings/util/unsafe/Darwin
diff --git a/src/main/java/com/threerings/util/unsafe/FreeBSD/Makefile b/core/src/main/java/com/threerings/util/unsafe/FreeBSD/Makefile
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/FreeBSD/Makefile
rename to core/src/main/java/com/threerings/util/unsafe/FreeBSD/Makefile
diff --git a/src/main/java/com/threerings/util/unsafe/FreeBSD/com_threerings_util_unsafe_Unsafe.c b/core/src/main/java/com/threerings/util/unsafe/FreeBSD/com_threerings_util_unsafe_Unsafe.c
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/FreeBSD/com_threerings_util_unsafe_Unsafe.c
rename to core/src/main/java/com/threerings/util/unsafe/FreeBSD/com_threerings_util_unsafe_Unsafe.c
diff --git a/src/main/java/com/threerings/util/unsafe/FreeBSD/libunsafe.so b/core/src/main/java/com/threerings/util/unsafe/FreeBSD/libunsafe.so
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/FreeBSD/libunsafe.so
rename to core/src/main/java/com/threerings/util/unsafe/FreeBSD/libunsafe.so
diff --git a/src/main/java/com/threerings/util/unsafe/Linux/Makefile b/core/src/main/java/com/threerings/util/unsafe/Linux/Makefile
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/Linux/Makefile
rename to core/src/main/java/com/threerings/util/unsafe/Linux/Makefile
diff --git a/src/main/java/com/threerings/util/unsafe/Linux/com_threerings_util_unsafe_Unsafe.c b/core/src/main/java/com/threerings/util/unsafe/Linux/com_threerings_util_unsafe_Unsafe.c
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/Linux/com_threerings_util_unsafe_Unsafe.c
rename to core/src/main/java/com/threerings/util/unsafe/Linux/com_threerings_util_unsafe_Unsafe.c
diff --git a/src/main/java/com/threerings/util/unsafe/Linux/libunsafe.so b/core/src/main/java/com/threerings/util/unsafe/Linux/libunsafe.so
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/Linux/libunsafe.so
rename to core/src/main/java/com/threerings/util/unsafe/Linux/libunsafe.so
diff --git a/src/main/java/com/threerings/util/unsafe/Mac OS X/Makefile b/core/src/main/java/com/threerings/util/unsafe/Mac OS X/Makefile
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/Mac OS X/Makefile
rename to core/src/main/java/com/threerings/util/unsafe/Mac OS X/Makefile
diff --git a/src/main/java/com/threerings/util/unsafe/Mac OS X/com_threerings_util_unsafe_Unsafe.c b/core/src/main/java/com/threerings/util/unsafe/Mac OS X/com_threerings_util_unsafe_Unsafe.c
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/Mac OS X/com_threerings_util_unsafe_Unsafe.c
rename to core/src/main/java/com/threerings/util/unsafe/Mac OS X/com_threerings_util_unsafe_Unsafe.c
diff --git a/src/main/java/com/threerings/util/unsafe/Mac OS X/libunsafe.jnilib b/core/src/main/java/com/threerings/util/unsafe/Mac OS X/libunsafe.jnilib
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/Mac OS X/libunsafe.jnilib
rename to core/src/main/java/com/threerings/util/unsafe/Mac OS X/libunsafe.jnilib
diff --git a/src/main/java/com/threerings/util/unsafe/Unsafe.java b/core/src/main/java/com/threerings/util/unsafe/Unsafe.java
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/Unsafe.java
rename to core/src/main/java/com/threerings/util/unsafe/Unsafe.java
diff --git a/src/main/java/com/threerings/util/unsafe/Windows/Makefile b/core/src/main/java/com/threerings/util/unsafe/Windows/Makefile
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/Windows/Makefile
rename to core/src/main/java/com/threerings/util/unsafe/Windows/Makefile
diff --git a/src/main/java/com/threerings/util/unsafe/Windows/com_threerings_util_unsafe_Unsafe.c b/core/src/main/java/com/threerings/util/unsafe/Windows/com_threerings_util_unsafe_Unsafe.c
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/Windows/com_threerings_util_unsafe_Unsafe.c
rename to core/src/main/java/com/threerings/util/unsafe/Windows/com_threerings_util_unsafe_Unsafe.c
diff --git a/src/main/java/com/threerings/util/unsafe/com_threerings_util_unsafe_Unsafe.h b/core/src/main/java/com/threerings/util/unsafe/com_threerings_util_unsafe_Unsafe.h
similarity index 100%
rename from src/main/java/com/threerings/util/unsafe/com_threerings_util_unsafe_Unsafe.h
rename to core/src/main/java/com/threerings/util/unsafe/com_threerings_util_unsafe_Unsafe.h
diff --git a/src/test/java/com/threerings/cast/CharSpriteViz.java b/core/src/test/java/com/threerings/cast/CharSpriteViz.java
similarity index 100%
rename from src/test/java/com/threerings/cast/CharSpriteViz.java
rename to core/src/test/java/com/threerings/cast/CharSpriteViz.java
diff --git a/src/test/java/com/threerings/cast/builder/TestApp.java b/core/src/test/java/com/threerings/cast/builder/TestApp.java
similarity index 100%
rename from src/test/java/com/threerings/cast/builder/TestApp.java
rename to core/src/test/java/com/threerings/cast/builder/TestApp.java
diff --git a/src/test/java/com/threerings/cast/builder/TestFrame.java b/core/src/test/java/com/threerings/cast/builder/TestFrame.java
similarity index 100%
rename from src/test/java/com/threerings/cast/builder/TestFrame.java
rename to core/src/test/java/com/threerings/cast/builder/TestFrame.java
diff --git a/src/test/java/com/threerings/geom/NearestViz.java b/core/src/test/java/com/threerings/geom/NearestViz.java
similarity index 100%
rename from src/test/java/com/threerings/geom/NearestViz.java
rename to core/src/test/java/com/threerings/geom/NearestViz.java
diff --git a/src/test/java/com/threerings/geom/WhichSideViz.java b/core/src/test/java/com/threerings/geom/WhichSideViz.java
similarity index 100%
rename from src/test/java/com/threerings/geom/WhichSideViz.java
rename to core/src/test/java/com/threerings/geom/WhichSideViz.java
diff --git a/src/test/java/com/threerings/media/ImageLoadingSpeed.java b/core/src/test/java/com/threerings/media/ImageLoadingSpeed.java
similarity index 100%
rename from src/test/java/com/threerings/media/ImageLoadingSpeed.java
rename to core/src/test/java/com/threerings/media/ImageLoadingSpeed.java
diff --git a/src/test/java/com/threerings/media/TestIconManager.java b/core/src/test/java/com/threerings/media/TestIconManager.java
similarity index 100%
rename from src/test/java/com/threerings/media/TestIconManager.java
rename to core/src/test/java/com/threerings/media/TestIconManager.java
diff --git a/src/test/java/com/threerings/media/sound/SoundTestApp.java b/core/src/test/java/com/threerings/media/sound/SoundTestApp.java
similarity index 100%
rename from src/test/java/com/threerings/media/sound/SoundTestApp.java
rename to core/src/test/java/com/threerings/media/sound/SoundTestApp.java
diff --git a/src/test/java/com/threerings/media/sound/sounds.properties b/core/src/test/java/com/threerings/media/sound/sounds.properties
similarity index 100%
rename from src/test/java/com/threerings/media/sound/sounds.properties
rename to core/src/test/java/com/threerings/media/sound/sounds.properties
diff --git a/src/test/java/com/threerings/media/util/PathViz.java b/core/src/test/java/com/threerings/media/util/PathViz.java
similarity index 100%
rename from src/test/java/com/threerings/media/util/PathViz.java
rename to core/src/test/java/com/threerings/media/util/PathViz.java
diff --git a/src/test/java/com/threerings/media/util/TraceViz.java b/core/src/test/java/com/threerings/media/util/TraceViz.java
similarity index 100%
rename from src/test/java/com/threerings/media/util/TraceViz.java
rename to core/src/test/java/com/threerings/media/util/TraceViz.java
diff --git a/src/test/java/com/threerings/miso/client/ScrollingFrame.java b/core/src/test/java/com/threerings/miso/client/ScrollingFrame.java
similarity index 100%
rename from src/test/java/com/threerings/miso/client/ScrollingFrame.java
rename to core/src/test/java/com/threerings/miso/client/ScrollingFrame.java
diff --git a/src/test/java/com/threerings/miso/client/ScrollingScene.java b/core/src/test/java/com/threerings/miso/client/ScrollingScene.java
similarity index 100%
rename from src/test/java/com/threerings/miso/client/ScrollingScene.java
rename to core/src/test/java/com/threerings/miso/client/ScrollingScene.java
diff --git a/src/test/java/com/threerings/miso/client/ScrollingTestApp.java b/core/src/test/java/com/threerings/miso/client/ScrollingTestApp.java
similarity index 100%
rename from src/test/java/com/threerings/miso/client/ScrollingTestApp.java
rename to core/src/test/java/com/threerings/miso/client/ScrollingTestApp.java
diff --git a/src/test/java/com/threerings/openal/TestSoundManager.java b/core/src/test/java/com/threerings/openal/TestSoundManager.java
similarity index 100%
rename from src/test/java/com/threerings/openal/TestSoundManager.java
rename to core/src/test/java/com/threerings/openal/TestSoundManager.java
diff --git a/src/test/java/com/threerings/util/DirectionTest.java b/core/src/test/java/com/threerings/util/DirectionTest.java
similarity index 100%
rename from src/test/java/com/threerings/util/DirectionTest.java
rename to core/src/test/java/com/threerings/util/DirectionTest.java
diff --git a/src/test/java/com/threerings/util/DirectionViz.java b/core/src/test/java/com/threerings/util/DirectionViz.java
similarity index 100%
rename from src/test/java/com/threerings/util/DirectionViz.java
rename to core/src/test/java/com/threerings/util/DirectionViz.java
diff --git a/src/test/java/com/threerings/util/KeyTimerApp.java b/core/src/test/java/com/threerings/util/KeyTimerApp.java
similarity index 100%
rename from src/test/java/com/threerings/util/KeyTimerApp.java
rename to core/src/test/java/com/threerings/util/KeyTimerApp.java
diff --git a/src/test/java/com/threerings/util/KeyboardManagerApp.java b/core/src/test/java/com/threerings/util/KeyboardManagerApp.java
similarity index 100%
rename from src/test/java/com/threerings/util/KeyboardManagerApp.java
rename to core/src/test/java/com/threerings/util/KeyboardManagerApp.java
diff --git a/src/test/java/com/threerings/util/UIDTestApp.java b/core/src/test/java/com/threerings/util/UIDTestApp.java
similarity index 100%
rename from src/test/java/com/threerings/util/UIDTestApp.java
rename to core/src/test/java/com/threerings/util/UIDTestApp.java
diff --git a/src/test/resources/rsrc/media/test.wav b/core/src/test/resources/rsrc/media/test.wav
similarity index 100%
rename from src/test/resources/rsrc/media/test.wav
rename to core/src/test/resources/rsrc/media/test.wav
diff --git a/src/test/resources/rsrc/scenes/idyll.xml b/core/src/test/resources/rsrc/scenes/idyll.xml
similarity index 100%
rename from src/test/resources/rsrc/scenes/idyll.xml
rename to core/src/test/resources/rsrc/scenes/idyll.xml
diff --git a/src/test/resources/rsrc/scenes/wooded.xml b/core/src/test/resources/rsrc/scenes/wooded.xml
similarity index 100%
rename from src/test/resources/rsrc/scenes/wooded.xml
rename to core/src/test/resources/rsrc/scenes/wooded.xml
diff --git a/etc/as-pom.xml b/etc/as-pom.xml
deleted file mode 100644
index 81e709c7..00000000
--- a/etc/as-pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.threerings</groupId>
-  <artifactId>nenyalib</artifactId>
-  <packaging>swc</packaging>
-  <version>1.4-SNAPSHOT</version>
-  <name>nenya</name>
-  <description>Facilities for making networked multiplayer games.</description>
-  <url>http://code.google.com/p/nenya/</url>
-  <issueManagement>
-    <url>http://code.google.com/p/nenya/issues/list</url>
-  </issueManagement>
-
-  <repositories>
-    <repository>
-      <id>flexlib-repo</id>
-      <url>http://maven.ow2.org/maven2</url>
-    </repository>
-    <repository>
-      <id>ooo-ext-maven-repo</id>
-      <url>http://ooo-maven.googlecode.com/hg/repository</url>
-    </repository>
-    <repository>
-      <id>ooo-maven-repo</id>
-      <url>http://threerings.github.com/maven-repo</url>
-    </repository>
-  </repositories>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>aspirin</artifactId>
-      <version>1.9</version>
-      <type>swc</type>
-    </dependency>
-    <dependency>
-      <groupId>flexlib</groupId>
-      <artifactId>flexlib-bin</artifactId>
-      <version>2.4</version>
-      <type>swc</type>
-    </dependency>
-    <dependency>
-      <groupId>as3isolib</groupId>
-      <artifactId>as3isolib-fp9</artifactId>
-      <version>r298</version>
-      <type>swc</type>
-    </dependency>
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>naryalib</artifactId>
-      <version>1.11</version>
-      <type>swc</type>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/etc/tools-pom.xml b/etc/tools-pom.xml
deleted file mode 100644
index ca1175d4..00000000
--- a/etc/tools-pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.threerings</groupId>
-  <artifactId>nenya-tools</artifactId>
-  <packaging>jar</packaging>
-  <version>1.4-SNAPSHOT</version>
-  <name>nenya-tools</name>
-  <description>Nenya with dependencies configured for its tools.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.samskivert</groupId>
-      <artifactId>samskivert</artifactId>
-      <version>1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>11.0.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-      <version>1.8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.megginson.sax</groupId>
-      <artifactId>xml-writer</artifactId>
-      <version>0.2</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/pom.xml b/pom.xml
index a5eb9a4b..d41d7cab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.threerings</groupId>
-  <artifactId>nenya</artifactId>
-  <packaging>jar</packaging>
-  <version>1.4-SNAPSHOT</version>
-  <name>nenya</name>
-  <description>Facilities for making networked multiplayer games.</description>
-  <url>http://github.com/threerings/nenya/</url>
-  <issueManagement>
-    <url>http://github.com/threerings/nenya/issues</url>
-  </issueManagement>
-
   <parent>
     <groupId>org.sonatype.oss</groupId>
     <artifactId>oss-parent</artifactId>
     <version>7</version>
   </parent>
 
+  <groupId>com.threerings</groupId>
+  <artifactId>nenya-parent</artifactId>
+  <packaging>pom</packaging>
+  <version>1.4-SNAPSHOT</version>
+
+  <name>Nenya Parent</name>
+  <description>Facilities for making Java games.</description>
+  <url>http://github.com/threerings/nenya/</url>
+  <issueManagement>
+    <url>http://github.com/threerings/nenya/issues</url>
+  </issueManagement>
+
   <licenses>
     <license>
       <name>GNU Lesser General Public License (LGPL), Version 2.1</name>
@@ -40,104 +41,16 @@
     <url>http://github.com/threerings/nenya/</url>
   </scm>
 
-  <repositories>
-    <repository>
-      <id>lwjgl-repo</id>
-      <url>http://lwjgl-maven.googlecode.com/svn/trunk/repository</url>
-    </repository>
-    <repository>
-      <id>ooo-repo</id>
-      <url>http://threerings.github.com/maven-repo</url>
-    </repository>
-    <repository>
-      <id>ooo-ext-repo</id>
-      <url>http://ooo-maven.googlecode.com/hg/repository</url>
-    </repository>
-  </repositories>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <narya.version>1.11</narya.version>
+  </properties>
 
-  <dependencies>
-    <!-- exported dependencies -->
-    <dependency>
-      <groupId>com.samskivert</groupId>
-      <artifactId>samskivert</artifactId>
-      <version>1.5</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>11.0.1</version>
-    </dependency>
-
-    <!-- optional dependencies -->
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>narya</artifactId>
-      <version>1.11</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.lwjgl</groupId>
-      <artifactId>lwjgl</artifactId>
-      <version>2.6</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.lwjgl</groupId>
-      <artifactId>lwjgl_util</artifactId>
-      <version>2.6</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>net.javazoom</groupId>
-      <artifactId>jlayer</artifactId>
-      <version>1.0</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.jcraft</groupId>
-      <artifactId>jorbis</artifactId>
-      <version>0.0.15</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.jcraft</groupId>
-      <artifactId>jogg</artifactId>
-      <version>0.0.7</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>javassist</groupId>
-      <artifactId>javassist</artifactId>
-      <version>3.8.0.GA</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-      <version>1.8</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.megginson.sax</groupId>
-      <artifactId>xml-writer</artifactId>
-      <version>0.2</version>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- test/build dependencies -->
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.7.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+  <modules>
+    <module>core</module>
+    <module>tools</module>
+    <module>aslib</module>
+  </modules>
 
   <build>
     <plugins>
@@ -153,13 +66,6 @@
           <showWarnings>true</showWarnings>
           <!-- yes, those quoted spaces are a workaround sanctioned by the Maven idiocracy -->
           <compilerArgument>-Xlint" "-Xlint:-serial" "-Xlint:-path</compilerArgument>
-          <excludes>
-            <!-- TODO: should these just be deleted? -->
-            <exclude>**/OggPlayer.java</exclude>
-            <exclude>**/ModPlayer.java</exclude>
-            <exclude>**/MidiPlayer.java</exclude>
-            <exclude>**/Mp3Player.java</exclude>
-          </excludes>
         </configuration>
       </plugin>
       <plugin>
@@ -180,45 +86,11 @@
           <links>
             <link>http://samskivert.github.com/samskivert/apidocs/</link>
             <link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link>
+            <link>http://threerings.github.com/narya/apidocs/</link>
             <link>http://evgeny-goldin.org/ant/api/</link>
           </links>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.6</version>
-        <configuration>
-          <includes>
-            <include>com/threerings/**/*Test.java</include>
-          </includes>
-          <!-- we have to skip these tests as they depend on resources being -->
-          <!-- prepared which are too fiddly to get working via Maven -->
-          <excludes>
-            <exclude>com/threerings/**/BundledComponentRepositoryTest.java</exclude>
-            <exclude>com/threerings/**/BundledTileSetRepositoryTest.java</exclude>
-          </excludes>
-          <systemPropertyVariables>
-            <resource_dir>target/test-classes/rsrc</resource_dir>
-            <no_unpack_resources>true</no_unpack_resources>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>2.3.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.5</version>
-      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
diff --git a/tools/pom.xml b/tools/pom.xml
new file mode 100644
index 00000000..956298f8
--- /dev/null
+++ b/tools/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.threerings</groupId>
+    <artifactId>nenya-parent</artifactId>
+    <version>1.4-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>nenya-tools</artifactId>
+  <packaging>jar</packaging>
+  <name>Nenya Tools</name>
+
+  <dependencies>
+    <!-- exported dependencies -->
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>nenya</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>narya</artifactId>
+      <version>${narya.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>1.8</version>
+    </dependency>
+    <dependency>
+      <groupId>com.megginson.sax</groupId>
+      <artifactId>xml-writer</artifactId>
+      <version>0.2</version>
+    </dependency>
+
+    <!-- test/build dependencies -->
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.7.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.10</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <includes>
+            <include>com/threerings/**/*Test.java</include>
+          </includes>
+          <!-- we have to skip these tests as they depend on resources being -->
+          <!-- prepared which are too fiddly to get working via Maven -->
+          <excludes>
+            <exclude>com/threerings/**/BundledComponentRepositoryTest.java</exclude>
+            <exclude>com/threerings/**/BundledTileSetRepositoryTest.java</exclude>
+          </excludes>
+          <systemPropertyVariables>
+            <resource_dir>target/test-classes/rsrc</resource_dir>
+            <no_unpack_resources>true</no_unpack_resources>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java b/tools/src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
similarity index 100%
rename from src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
rename to tools/src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
diff --git a/src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerUtil.java b/tools/src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerUtil.java
similarity index 100%
rename from src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerUtil.java
rename to tools/src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerUtil.java
diff --git a/src/main/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java b/tools/src/main/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java
similarity index 100%
rename from src/main/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java
rename to tools/src/main/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java
diff --git a/src/main/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java b/tools/src/main/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java
similarity index 100%
rename from src/main/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java
rename to tools/src/main/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java
diff --git a/src/main/java/com/threerings/cast/bundle/tools/DumpBundle.java b/tools/src/main/java/com/threerings/cast/bundle/tools/DumpBundle.java
similarity index 100%
rename from src/main/java/com/threerings/cast/bundle/tools/DumpBundle.java
rename to tools/src/main/java/com/threerings/cast/bundle/tools/DumpBundle.java
diff --git a/src/main/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java b/tools/src/main/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java
similarity index 100%
rename from src/main/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java
rename to tools/src/main/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java
diff --git a/src/main/java/com/threerings/cast/tools/xml/ActionRuleSet.java b/tools/src/main/java/com/threerings/cast/tools/xml/ActionRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/cast/tools/xml/ActionRuleSet.java
rename to tools/src/main/java/com/threerings/cast/tools/xml/ActionRuleSet.java
diff --git a/src/main/java/com/threerings/cast/tools/xml/ClassRuleSet.java b/tools/src/main/java/com/threerings/cast/tools/xml/ClassRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/cast/tools/xml/ClassRuleSet.java
rename to tools/src/main/java/com/threerings/cast/tools/xml/ClassRuleSet.java
diff --git a/src/main/java/com/threerings/media/image/tools/DumpColorPository.java b/tools/src/main/java/com/threerings/media/image/tools/DumpColorPository.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/tools/DumpColorPository.java
rename to tools/src/main/java/com/threerings/media/image/tools/DumpColorPository.java
diff --git a/src/main/java/com/threerings/media/image/tools/xml/ColorPositoryParser.java b/tools/src/main/java/com/threerings/media/image/tools/xml/ColorPositoryParser.java
similarity index 100%
rename from src/main/java/com/threerings/media/image/tools/xml/ColorPositoryParser.java
rename to tools/src/main/java/com/threerings/media/image/tools/xml/ColorPositoryParser.java
diff --git a/src/main/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundler.java b/tools/src/main/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundler.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundler.java
rename to tools/src/main/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundler.java
diff --git a/src/main/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundlerTask.java b/tools/src/main/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundlerTask.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundlerTask.java
rename to tools/src/main/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundlerTask.java
diff --git a/src/main/java/com/threerings/media/tile/bundle/tools/DumpBundle.java b/tools/src/main/java/com/threerings/media/tile/bundle/tools/DumpBundle.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/bundle/tools/DumpBundle.java
rename to tools/src/main/java/com/threerings/media/tile/bundle/tools/DumpBundle.java
diff --git a/src/main/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java b/tools/src/main/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
rename to tools/src/main/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
diff --git a/src/main/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java b/tools/src/main/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java
rename to tools/src/main/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java
diff --git a/src/main/java/com/threerings/media/tile/tools/DumpTileSetMap.java b/tools/src/main/java/com/threerings/media/tile/tools/DumpTileSetMap.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/tools/DumpTileSetMap.java
rename to tools/src/main/java/com/threerings/media/tile/tools/DumpTileSetMap.java
diff --git a/src/main/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java b/tools/src/main/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
rename to tools/src/main/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
diff --git a/src/main/java/com/threerings/media/tile/tools/RenameTileSet.java b/tools/src/main/java/com/threerings/media/tile/tools/RenameTileSet.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/tools/RenameTileSet.java
rename to tools/src/main/java/com/threerings/media/tile/tools/RenameTileSet.java
diff --git a/src/main/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java b/tools/src/main/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java
rename to tools/src/main/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java
diff --git a/src/main/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java b/tools/src/main/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java
rename to tools/src/main/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java
diff --git a/src/main/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java b/tools/src/main/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java
rename to tools/src/main/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java
diff --git a/src/main/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java b/tools/src/main/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java
rename to tools/src/main/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java
diff --git a/src/main/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java b/tools/src/main/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java
similarity index 100%
rename from src/main/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java
rename to tools/src/main/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java
diff --git a/src/main/java/com/threerings/media/tools/RecolorImage.java b/tools/src/main/java/com/threerings/media/tools/RecolorImage.java
similarity index 100%
rename from src/main/java/com/threerings/media/tools/RecolorImage.java
rename to tools/src/main/java/com/threerings/media/tools/RecolorImage.java
diff --git a/src/main/java/com/threerings/media/tools/ResourceIndexerTask.java b/tools/src/main/java/com/threerings/media/tools/ResourceIndexerTask.java
similarity index 100%
rename from src/main/java/com/threerings/media/tools/ResourceIndexerTask.java
rename to tools/src/main/java/com/threerings/media/tools/ResourceIndexerTask.java
diff --git a/src/main/java/com/threerings/miso/tile/tools/CompileFringeConfigurationTask.java b/tools/src/main/java/com/threerings/miso/tile/tools/CompileFringeConfigurationTask.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tile/tools/CompileFringeConfigurationTask.java
rename to tools/src/main/java/com/threerings/miso/tile/tools/CompileFringeConfigurationTask.java
diff --git a/src/main/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java b/tools/src/main/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java
rename to tools/src/main/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java
diff --git a/src/main/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java b/tools/src/main/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java
rename to tools/src/main/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java
diff --git a/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java b/tools/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java
rename to tools/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java
diff --git a/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java b/tools/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java
rename to tools/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java
diff --git a/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java b/tools/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java
rename to tools/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java
diff --git a/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java b/tools/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java
rename to tools/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java
diff --git a/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java b/tools/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java
rename to tools/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java
diff --git a/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java b/tools/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java
similarity index 100%
rename from src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java
rename to tools/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java
diff --git a/src/main/java/com/threerings/tools/CompiledConfigTask.java b/tools/src/main/java/com/threerings/tools/CompiledConfigTask.java
similarity index 100%
rename from src/main/java/com/threerings/tools/CompiledConfigTask.java
rename to tools/src/main/java/com/threerings/tools/CompiledConfigTask.java
diff --git a/src/main/java/com/threerings/tools/xml/CompiledConfigParser.java b/tools/src/main/java/com/threerings/tools/xml/CompiledConfigParser.java
similarity index 100%
rename from src/main/java/com/threerings/tools/xml/CompiledConfigParser.java
rename to tools/src/main/java/com/threerings/tools/xml/CompiledConfigParser.java
diff --git a/src/main/java/com/threerings/tools/xml/NestableRuleSet.java b/tools/src/main/java/com/threerings/tools/xml/NestableRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/tools/xml/NestableRuleSet.java
rename to tools/src/main/java/com/threerings/tools/xml/NestableRuleSet.java
diff --git a/src/main/java/com/threerings/tools/xml/NestableWriter.java b/tools/src/main/java/com/threerings/tools/xml/NestableWriter.java
similarity index 100%
rename from src/main/java/com/threerings/tools/xml/NestableWriter.java
rename to tools/src/main/java/com/threerings/tools/xml/NestableWriter.java
diff --git a/src/test/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java b/tools/src/test/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
similarity index 100%
rename from src/test/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
rename to tools/src/test/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
diff --git a/src/test/java/com/threerings/cast/bundle/tools/ComponentBundlerUtilTest.java b/tools/src/test/java/com/threerings/cast/bundle/tools/ComponentBundlerUtilTest.java
similarity index 100%
rename from src/test/java/com/threerings/cast/bundle/tools/ComponentBundlerUtilTest.java
rename to tools/src/test/java/com/threerings/cast/bundle/tools/ComponentBundlerUtilTest.java
diff --git a/src/test/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java b/tools/src/test/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java
similarity index 100%
rename from src/test/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java
rename to tools/src/test/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java
diff --git a/src/test/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java b/tools/src/test/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java
similarity index 100%
rename from src/test/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java
rename to tools/src/test/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java
diff --git a/src/test/java/com/threerings/media/tile/tools/xml/XMLTileSetParserTest.java b/tools/src/test/java/com/threerings/media/tile/tools/xml/XMLTileSetParserTest.java
similarity index 100%
rename from src/test/java/com/threerings/media/tile/tools/xml/XMLTileSetParserTest.java
rename to tools/src/test/java/com/threerings/media/tile/tools/xml/XMLTileSetParserTest.java
diff --git a/src/test/java/com/threerings/miso/viewer/ViewerApp.java b/tools/src/test/java/com/threerings/miso/viewer/ViewerApp.java
similarity index 100%
rename from src/test/java/com/threerings/miso/viewer/ViewerApp.java
rename to tools/src/test/java/com/threerings/miso/viewer/ViewerApp.java
diff --git a/src/test/java/com/threerings/miso/viewer/ViewerFrame.java b/tools/src/test/java/com/threerings/miso/viewer/ViewerFrame.java
similarity index 100%
rename from src/test/java/com/threerings/miso/viewer/ViewerFrame.java
rename to tools/src/test/java/com/threerings/miso/viewer/ViewerFrame.java
diff --git a/src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java b/tools/src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
similarity index 100%
rename from src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
rename to tools/src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
diff --git a/src/test/resources/rsrc/bundles/components/actions.xml b/tools/src/test/resources/rsrc/bundles/components/actions.xml
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/actions.xml
rename to tools/src/test/resources/rsrc/bundles/components/actions.xml
diff --git a/src/test/resources/rsrc/bundles/components/classes.xml b/tools/src/test/resources/rsrc/bundles/components/classes.xml
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/classes.xml
rename to tools/src/test/resources/rsrc/bundles/components/classes.xml
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/barefoot/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/barefoot/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/barefoot/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/barefoot/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/barefoot/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/barefoot/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/barefoot/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/barefoot/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/barefoot/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/barefoot/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/barefoot/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/barefoot/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/boots/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/boots/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/boots/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/boots/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/boots/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/boots/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/boots/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/boots/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/boots/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/boots/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/boots/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/boots/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/buckleshoes/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/buckleshoes/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/buckleshoes/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/buckleshoes/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/buckleshoes/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/buckleshoes/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/buckleshoes/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/buckleshoes/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/buckleshoes/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/buckleshoes/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/buckleshoes/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/buckleshoes/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_barefoot/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_barefoot/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_barefoot/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_barefoot/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_barefoot/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_barefoot/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_barefoot/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_barefoot/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_barefoot/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_barefoot/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_barefoot/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_barefoot/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_boots/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_boots/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_boots/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_boots/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_boots/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_boots/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_boots/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_boots/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_boots/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_boots/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_boots/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_boots/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_buckleshoes/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_buckleshoes/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_buckleshoes/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_buckleshoes/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_buckleshoes/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_buckleshoes/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_buckleshoes/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_buckleshoes/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_buckleshoes/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_buckleshoes/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_buckleshoes/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/feet/pegleg_buckleshoes/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hair/long_straight/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/long_straight/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hair/long_straight/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/long_straight/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hair/long_straight/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/long_straight/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hair/long_straight/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/long_straight/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hair/long_straight/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/long_straight/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hair/long_straight/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/long_straight/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hair/messy_short/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/messy_short/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hair/messy_short/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/messy_short/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hair/messy_short/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/messy_short/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hair/messy_short/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/messy_short/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hair/messy_short/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/messy_short/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hair/messy_short/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/messy_short/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hair/ponytail/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/ponytail/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hair/ponytail/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/ponytail/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hair/ponytail/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/ponytail/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hair/ponytail/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/ponytail/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hair/ponytail/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/ponytail/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hair/ponytail/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hair/ponytail/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/barehand/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/barehand/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hand_left/barehand/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/barehand/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/barehand/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/barehand/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hand_left/barehand/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/barehand/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/barehand/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/barehand/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hand_left/barehand/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/barehand/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/hook/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/hook/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hand_left/hook/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/hook/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/hook/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/hook/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hand_left/hook/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/hook/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/hook/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/hook/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hand_left/hook/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_left/hook/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hand_right/barehand/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_right/barehand/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hand_right/barehand/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_right/barehand/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hand_right/barehand/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_right/barehand/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hand_right/barehand/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_right/barehand/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hand_right/barehand/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_right/barehand/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hand_right/barehand/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hand_right/barehand/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hat/captains/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/captains/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hat/captains/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/captains/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hat/captains/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/captains/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hat/captains/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/captains/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hat/captains/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/captains/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hat/captains/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/captains/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hat/small_feathered/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/small_feathered/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hat/small_feathered/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/small_feathered/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hat/small_feathered/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/small_feathered/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hat/small_feathered/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/small_feathered/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hat/small_feathered/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/small_feathered/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hat/small_feathered/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/small_feathered/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hat/tricorne/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/tricorne/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hat/tricorne/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/tricorne/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hat/tricorne/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/tricorne/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hat/tricorne/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/tricorne/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hat/tricorne/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/tricorne/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hat/tricorne/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/tricorne/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hat/wide_brimmed/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/wide_brimmed/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hat/wide_brimmed/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/wide_brimmed/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hat/wide_brimmed/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/wide_brimmed/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hat/wide_brimmed/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/wide_brimmed/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/hat/wide_brimmed/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/wide_brimmed/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/hat/wide_brimmed/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/hat/wide_brimmed/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/head/eyepatch/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/head/eyepatch/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/head/eyepatch/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/head/eyepatch/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/head/eyepatch/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/head/eyepatch/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/head/eyepatch/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/head/eyepatch/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/head/eyepatch/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/head/eyepatch/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/head/eyepatch/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/head/eyepatch/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/head/normal/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/head/normal/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/head/normal/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/head/normal/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/head/normal/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/head/normal/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/head/normal/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/head/normal/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/head/normal/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/head/normal/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/head/normal/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/head/normal/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/legs/dressbottom_long/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/legs/dressbottom_long/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/legs/dressbottom_long/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/legs/dressbottom_long/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/legs/dressbottom_long/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/legs/dressbottom_long/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/legs/dressbottom_long/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/legs/dressbottom_long/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/legs/dressbottom_long/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/legs/dressbottom_long/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/legs/dressbottom_long/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/legs/dressbottom_long/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/legs/stripey_knickers/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/legs/stripey_knickers/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/legs/stripey_knickers/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/legs/stripey_knickers/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/legs/stripey_knickers/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/legs/stripey_knickers/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/legs/stripey_knickers/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/legs/stripey_knickers/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/legs/stripey_knickers/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/legs/stripey_knickers/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/legs/stripey_knickers/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/legs/stripey_knickers/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/torso/bodice/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/torso/bodice/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/torso/bodice/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/torso/bodice/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/torso/bodice/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/torso/bodice/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/torso/bodice/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/torso/bodice/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/torso/bodice/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/torso/bodice/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/torso/bodice/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/torso/bodice/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/torso/dresstop/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/torso/dresstop/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/torso/dresstop/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/torso/dresstop/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/torso/dresstop/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/torso/dresstop/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/torso/dresstop/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/torso/dresstop/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/female/torso/dresstop/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/female/torso/dresstop/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/female/torso/dresstop/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/female/torso/dresstop/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/eyepatch/blackpatch/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/feet/barefoot/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/barefoot/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/feet/barefoot/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/barefoot/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/feet/barefoot/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/barefoot/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/feet/barefoot/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/barefoot/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/feet/barefoot/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/barefoot/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/feet/barefoot/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/barefoot/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/feet/boots/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/boots/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/feet/boots/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/boots/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/feet/boots/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/boots/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/feet/boots/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/boots/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/feet/boots/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/boots/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/feet/boots/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/boots/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_barefoot/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_boots/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_boots/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_boots/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_boots/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_boots/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_boots/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_boots/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_boots/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_boots/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_boots/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_boots/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/feet/pegleg_boots/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hair/ponytail/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hair/ponytail/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hair/ponytail/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hair/ponytail/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hair/ponytail/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hair/ponytail/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hair/ponytail/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hair/ponytail/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hair/ponytail/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hair/ponytail/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hair/ponytail/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hair/ponytail/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hair/princevaliant/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hair/princevaliant/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hair/princevaliant/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hair/princevaliant/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hair/princevaliant/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hair/princevaliant/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hair/princevaliant/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hair/princevaliant/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hair/princevaliant/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hair/princevaliant/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hair/princevaliant/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hair/princevaliant/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/barehand/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/barehand/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hand_left/barehand/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/barehand/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/barehand/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/barehand/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hand_left/barehand/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/barehand/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/barehand/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/barehand/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hand_left/barehand/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/barehand/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/hook/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/hook/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hand_left/hook/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/hook/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/hook/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/hook/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hand_left/hook/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/hook/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/hook/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/hook/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hand_left/hook/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_left/hook/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hand_right/barehand/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_right/barehand/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hand_right/barehand/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_right/barehand/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hand_right/barehand/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_right/barehand/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hand_right/barehand/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_right/barehand/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hand_right/barehand/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_right/barehand/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hand_right/barehand/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hand_right/barehand/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hat/bandana/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/bandana/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hat/bandana/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/bandana/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hat/bandana/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/bandana/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hat/bandana/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/bandana/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hat/bandana/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/bandana/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hat/bandana/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/bandana/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hat/captains/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/captains/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hat/captains/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/captains/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hat/captains/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/captains/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hat/captains/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/captains/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hat/captains/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/captains/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hat/captains/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/captains/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hat/sleepinghat/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/sleepinghat/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hat/sleepinghat/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/sleepinghat/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hat/sleepinghat/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/sleepinghat/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hat/sleepinghat/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/sleepinghat/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/hat/sleepinghat/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/sleepinghat/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/hat/sleepinghat/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/hat/sleepinghat/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/head/bald/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/head/bald/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/head/bald/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/head/bald/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/head/bald/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/head/bald/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/head/bald/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/head/bald/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/head/bald/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/head/bald/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/head/bald/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/head/bald/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/head/goatee/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/head/goatee/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/head/goatee/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/head/goatee/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/head/goatee/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/head/goatee/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/head/goatee/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/head/goatee/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/head/goatee/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/head/goatee/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/head/goatee/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/head/goatee/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/head/shortbeard/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/head/shortbeard/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/head/shortbeard/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/head/shortbeard/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/head/shortbeard/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/head/shortbeard/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/head/shortbeard/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/head/shortbeard/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/head/shortbeard/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/head/shortbeard/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/head/shortbeard/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/head/shortbeard/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/legs/pants/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/legs/pants/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/legs/pants/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/legs/pants/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/legs/pants/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/legs/pants/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/legs/pants/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/legs/pants/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/legs/pants/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/legs/pants/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/legs/pants/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/legs/pants/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/legs/stripeyknickers/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/legs/stripeyknickers/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/legs/stripeyknickers/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/legs/stripeyknickers/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/legs/stripeyknickers/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/legs/stripeyknickers/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/legs/stripeyknickers/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/legs/stripeyknickers/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/legs/stripeyknickers/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/legs/stripeyknickers/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/legs/stripeyknickers/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/legs/stripeyknickers/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/torso/shirt_sash/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/torso/shirt_sash/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/torso/shirt_sash/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/torso/shirt_sash/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/torso/shirt_sash/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/torso/shirt_sash/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/torso/shirt_sash/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/torso/shirt_sash/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/torso/shirt_sash/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/torso/shirt_sash/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/torso/shirt_sash/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/torso/shirt_sash/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/behind_back.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/behind_back.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/behind_back.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/behind_back.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/standing.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/standing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/standing.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/standing.png
diff --git a/src/test/resources/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/walking.png b/tools/src/test/resources/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/walking.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/walking.png
rename to tools/src/test/resources/rsrc/bundles/components/pirate/male/torso/vest_stripedshirt_belt/walking.png
diff --git a/src/test/resources/rsrc/bundles/components/vessel/navsail/merchgal/sailing.png b/tools/src/test/resources/rsrc/bundles/components/vessel/navsail/merchgal/sailing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/vessel/navsail/merchgal/sailing.png
rename to tools/src/test/resources/rsrc/bundles/components/vessel/navsail/merchgal/sailing.png
diff --git a/src/test/resources/rsrc/bundles/components/vessel/navsail/merchgal/sailing_small.png b/tools/src/test/resources/rsrc/bundles/components/vessel/navsail/merchgal/sailing_small.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/vessel/navsail/merchgal/sailing_small.png
rename to tools/src/test/resources/rsrc/bundles/components/vessel/navsail/merchgal/sailing_small.png
diff --git a/src/test/resources/rsrc/bundles/components/vessel/navsail/smsloop/sailing.png b/tools/src/test/resources/rsrc/bundles/components/vessel/navsail/smsloop/sailing.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/vessel/navsail/smsloop/sailing.png
rename to tools/src/test/resources/rsrc/bundles/components/vessel/navsail/smsloop/sailing.png
diff --git a/src/test/resources/rsrc/bundles/components/vessel/navsail/smsloop/sailing_small.png b/tools/src/test/resources/rsrc/bundles/components/vessel/navsail/smsloop/sailing_small.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/components/vessel/navsail/smsloop/sailing_small.png
rename to tools/src/test/resources/rsrc/bundles/components/vessel/navsail/smsloop/sailing_small.png
diff --git a/src/test/resources/rsrc/bundles/tiles/bundler-config.xml b/tools/src/test/resources/rsrc/bundles/tiles/bundler-config.xml
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/bundler-config.xml
rename to tools/src/test/resources/rsrc/bundles/tiles/bundler-config.xml
diff --git a/src/test/resources/rsrc/bundles/tiles/ground/bundle.xml b/tools/src/test/resources/rsrc/bundles/tiles/ground/bundle.xml
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/ground/bundle.xml
rename to tools/src/test/resources/rsrc/bundles/tiles/ground/bundle.xml
diff --git a/src/test/resources/rsrc/bundles/tiles/ground/cobble.png b/tools/src/test/resources/rsrc/bundles/tiles/ground/cobble.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/ground/cobble.png
rename to tools/src/test/resources/rsrc/bundles/tiles/ground/cobble.png
diff --git a/src/test/resources/rsrc/bundles/tiles/ground/dirt.png b/tools/src/test/resources/rsrc/bundles/tiles/ground/dirt.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/ground/dirt.png
rename to tools/src/test/resources/rsrc/bundles/tiles/ground/dirt.png
diff --git a/src/test/resources/rsrc/bundles/tiles/ground/fringe.png b/tools/src/test/resources/rsrc/bundles/tiles/ground/fringe.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/ground/fringe.png
rename to tools/src/test/resources/rsrc/bundles/tiles/ground/fringe.png
diff --git a/src/test/resources/rsrc/bundles/tiles/ground/fringemask.png b/tools/src/test/resources/rsrc/bundles/tiles/ground/fringemask.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/ground/fringemask.png
rename to tools/src/test/resources/rsrc/bundles/tiles/ground/fringemask.png
diff --git a/src/test/resources/rsrc/bundles/tiles/ground/sand.png b/tools/src/test/resources/rsrc/bundles/tiles/ground/sand.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/ground/sand.png
rename to tools/src/test/resources/rsrc/bundles/tiles/ground/sand.png
diff --git a/src/test/resources/rsrc/bundles/tiles/ground/seafringe.png b/tools/src/test/resources/rsrc/bundles/tiles/ground/seafringe.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/ground/seafringe.png
rename to tools/src/test/resources/rsrc/bundles/tiles/ground/seafringe.png
diff --git a/src/test/resources/rsrc/bundles/tiles/ground/seawater.png b/tools/src/test/resources/rsrc/bundles/tiles/ground/seawater.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/ground/seawater.png
rename to tools/src/test/resources/rsrc/bundles/tiles/ground/seawater.png
diff --git a/src/test/resources/rsrc/bundles/tiles/ground/woodplanks.png b/tools/src/test/resources/rsrc/bundles/tiles/ground/woodplanks.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/ground/woodplanks.png
rename to tools/src/test/resources/rsrc/bundles/tiles/ground/woodplanks.png
diff --git a/src/test/resources/rsrc/bundles/tiles/objects/bag_cloth.png b/tools/src/test/resources/rsrc/bundles/tiles/objects/bag_cloth.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/objects/bag_cloth.png
rename to tools/src/test/resources/rsrc/bundles/tiles/objects/bag_cloth.png
diff --git a/src/test/resources/rsrc/bundles/tiles/objects/barrel_oak.png b/tools/src/test/resources/rsrc/bundles/tiles/objects/barrel_oak.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/objects/barrel_oak.png
rename to tools/src/test/resources/rsrc/bundles/tiles/objects/barrel_oak.png
diff --git a/src/test/resources/rsrc/bundles/tiles/objects/bundle.xml b/tools/src/test/resources/rsrc/bundles/tiles/objects/bundle.xml
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/objects/bundle.xml
rename to tools/src/test/resources/rsrc/bundles/tiles/objects/bundle.xml
diff --git a/src/test/resources/rsrc/bundles/tiles/objects/chest_purse.png b/tools/src/test/resources/rsrc/bundles/tiles/objects/chest_purse.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/objects/chest_purse.png
rename to tools/src/test/resources/rsrc/bundles/tiles/objects/chest_purse.png
diff --git a/src/test/resources/rsrc/bundles/tiles/objects/chest_treasure.png b/tools/src/test/resources/rsrc/bundles/tiles/objects/chest_treasure.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/objects/chest_treasure.png
rename to tools/src/test/resources/rsrc/bundles/tiles/objects/chest_treasure.png
diff --git a/src/test/resources/rsrc/bundles/tiles/objects/crate.png b/tools/src/test/resources/rsrc/bundles/tiles/objects/crate.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/objects/crate.png
rename to tools/src/test/resources/rsrc/bundles/tiles/objects/crate.png
diff --git a/src/test/resources/rsrc/bundles/tiles/objects/dockedge.png b/tools/src/test/resources/rsrc/bundles/tiles/objects/dockedge.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/objects/dockedge.png
rename to tools/src/test/resources/rsrc/bundles/tiles/objects/dockedge.png
diff --git a/src/test/resources/rsrc/bundles/tiles/objects/house.png b/tools/src/test/resources/rsrc/bundles/tiles/objects/house.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/objects/house.png
rename to tools/src/test/resources/rsrc/bundles/tiles/objects/house.png
diff --git a/src/test/resources/rsrc/bundles/tiles/objects/mooring.png b/tools/src/test/resources/rsrc/bundles/tiles/objects/mooring.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/objects/mooring.png
rename to tools/src/test/resources/rsrc/bundles/tiles/objects/mooring.png
diff --git a/src/test/resources/rsrc/bundles/tiles/objects/tree_oak.png b/tools/src/test/resources/rsrc/bundles/tiles/objects/tree_oak.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/objects/tree_oak.png
rename to tools/src/test/resources/rsrc/bundles/tiles/objects/tree_oak.png
diff --git a/src/test/resources/rsrc/bundles/tiles/objects/tree_palm.png b/tools/src/test/resources/rsrc/bundles/tiles/objects/tree_palm.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/objects/tree_palm.png
rename to tools/src/test/resources/rsrc/bundles/tiles/objects/tree_palm.png
diff --git a/src/test/resources/rsrc/bundles/tiles/objects/well.png b/tools/src/test/resources/rsrc/bundles/tiles/objects/well.png
similarity index 100%
rename from src/test/resources/rsrc/bundles/tiles/objects/well.png
rename to tools/src/test/resources/rsrc/bundles/tiles/objects/well.png
diff --git a/src/test/resources/rsrc/config/media/colordefs.xml b/tools/src/test/resources/rsrc/config/media/colordefs.xml
similarity index 100%
rename from src/test/resources/rsrc/config/media/colordefs.xml
rename to tools/src/test/resources/rsrc/config/media/colordefs.xml
diff --git a/src/test/resources/rsrc/config/media/iconmgr.properties b/tools/src/test/resources/rsrc/config/media/iconmgr.properties
similarity index 100%
rename from src/test/resources/rsrc/config/media/iconmgr.properties
rename to tools/src/test/resources/rsrc/config/media/iconmgr.properties
diff --git a/src/test/resources/rsrc/config/miso/components.xml b/tools/src/test/resources/rsrc/config/miso/components.xml
similarity index 100%
rename from src/test/resources/rsrc/config/miso/components.xml
rename to tools/src/test/resources/rsrc/config/miso/components.xml
diff --git a/src/test/resources/rsrc/config/miso/scrolling.properties b/tools/src/test/resources/rsrc/config/miso/scrolling.properties
similarity index 100%
rename from src/test/resources/rsrc/config/miso/scrolling.properties
rename to tools/src/test/resources/rsrc/config/miso/scrolling.properties
diff --git a/src/test/resources/rsrc/config/miso/tile/fringeconf.xml b/tools/src/test/resources/rsrc/config/miso/tile/fringeconf.xml
similarity index 100%
rename from src/test/resources/rsrc/config/miso/tile/fringeconf.xml
rename to tools/src/test/resources/rsrc/config/miso/tile/fringeconf.xml
diff --git a/src/test/resources/rsrc/config/miso/tilesets-components.xml b/tools/src/test/resources/rsrc/config/miso/tilesets-components.xml
similarity index 100%
rename from src/test/resources/rsrc/config/miso/tilesets-components.xml
rename to tools/src/test/resources/rsrc/config/miso/tilesets-components.xml
diff --git a/src/test/resources/rsrc/config/miso/tilesets.xml b/tools/src/test/resources/rsrc/config/miso/tilesets.xml
similarity index 100%
rename from src/test/resources/rsrc/config/miso/tilesets.xml
rename to tools/src/test/resources/rsrc/config/miso/tilesets.xml
diff --git a/src/test/resources/rsrc/config/miso/viewer.properties b/tools/src/test/resources/rsrc/config/miso/viewer.properties
similarity index 100%
rename from src/test/resources/rsrc/config/miso/viewer.properties
rename to tools/src/test/resources/rsrc/config/miso/viewer.properties
diff --git a/src/test/resources/rsrc/config/resource/editor.properties b/tools/src/test/resources/rsrc/config/resource/editor.properties
similarity index 100%
rename from src/test/resources/rsrc/config/resource/editor.properties
rename to tools/src/test/resources/rsrc/config/resource/editor.properties
diff --git a/src/test/resources/rsrc/config/resource/manager.properties b/tools/src/test/resources/rsrc/config/resource/manager.properties
similarity index 100%
rename from src/test/resources/rsrc/config/resource/manager.properties
rename to tools/src/test/resources/rsrc/config/resource/manager.properties
diff --git a/src/test/resources/rsrc/media/miso/tiles/building.png b/tools/src/test/resources/rsrc/media/miso/tiles/building.png
similarity index 100%
rename from src/test/resources/rsrc/media/miso/tiles/building.png
rename to tools/src/test/resources/rsrc/media/miso/tiles/building.png
diff --git a/src/test/resources/rsrc/media/miso/tiles/components/standing_hat_tri.png b/tools/src/test/resources/rsrc/media/miso/tiles/components/standing_hat_tri.png
similarity index 100%
rename from src/test/resources/rsrc/media/miso/tiles/components/standing_hat_tri.png
rename to tools/src/test/resources/rsrc/media/miso/tiles/components/standing_hat_tri.png
diff --git a/src/test/resources/rsrc/media/miso/tiles/components/standing_torso.png b/tools/src/test/resources/rsrc/media/miso/tiles/components/standing_torso.png
similarity index 100%
rename from src/test/resources/rsrc/media/miso/tiles/components/standing_torso.png
rename to tools/src/test/resources/rsrc/media/miso/tiles/components/standing_torso.png
diff --git a/src/test/resources/rsrc/media/miso/tiles/components/standing_torso_red.png b/tools/src/test/resources/rsrc/media/miso/tiles/components/standing_torso_red.png
similarity index 100%
rename from src/test/resources/rsrc/media/miso/tiles/components/standing_torso_red.png
rename to tools/src/test/resources/rsrc/media/miso/tiles/components/standing_torso_red.png
diff --git a/src/test/resources/rsrc/media/miso/tiles/components/walking_hat_tri.png b/tools/src/test/resources/rsrc/media/miso/tiles/components/walking_hat_tri.png
similarity index 100%
rename from src/test/resources/rsrc/media/miso/tiles/components/walking_hat_tri.png
rename to tools/src/test/resources/rsrc/media/miso/tiles/components/walking_hat_tri.png
diff --git a/src/test/resources/rsrc/media/miso/tiles/components/walking_torso.png b/tools/src/test/resources/rsrc/media/miso/tiles/components/walking_torso.png
similarity index 100%
rename from src/test/resources/rsrc/media/miso/tiles/components/walking_torso.png
rename to tools/src/test/resources/rsrc/media/miso/tiles/components/walking_torso.png
diff --git a/src/test/resources/rsrc/media/miso/tiles/components/walking_torso_red.png b/tools/src/test/resources/rsrc/media/miso/tiles/components/walking_torso_red.png
similarity index 100%
rename from src/test/resources/rsrc/media/miso/tiles/components/walking_torso_red.png
rename to tools/src/test/resources/rsrc/media/miso/tiles/components/walking_torso_red.png
diff --git a/src/test/resources/rsrc/media/miso/tiles/faux-building.png b/tools/src/test/resources/rsrc/media/miso/tiles/faux-building.png
similarity index 100%
rename from src/test/resources/rsrc/media/miso/tiles/faux-building.png
rename to tools/src/test/resources/rsrc/media/miso/tiles/faux-building.png
diff --git a/src/test/resources/rsrc/media/miso/tiles/landscape.png b/tools/src/test/resources/rsrc/media/miso/tiles/landscape.png
similarity index 100%
rename from src/test/resources/rsrc/media/miso/tiles/landscape.png
rename to tools/src/test/resources/rsrc/media/miso/tiles/landscape.png
diff --git a/src/test/resources/rsrc/media/miso/tiles/node-icons.png b/tools/src/test/resources/rsrc/media/miso/tiles/node-icons.png
similarity index 100%
rename from src/test/resources/rsrc/media/miso/tiles/node-icons.png
rename to tools/src/test/resources/rsrc/media/miso/tiles/node-icons.png
diff --git a/src/test/resources/rsrc/media/miso/tiles/sample.png b/tools/src/test/resources/rsrc/media/miso/tiles/sample.png
similarity index 100%
rename from src/test/resources/rsrc/media/miso/tiles/sample.png
rename to tools/src/test/resources/rsrc/media/miso/tiles/sample.png
diff --git a/src/test/resources/rsrc/media/tile/bundle/tools/building.png b/tools/src/test/resources/rsrc/media/tile/bundle/tools/building.png
similarity index 100%
rename from src/test/resources/rsrc/media/tile/bundle/tools/building.png
rename to tools/src/test/resources/rsrc/media/tile/bundle/tools/building.png
diff --git a/src/test/resources/rsrc/media/tile/bundle/tools/bundle.xml b/tools/src/test/resources/rsrc/media/tile/bundle/tools/bundle.xml
similarity index 100%
rename from src/test/resources/rsrc/media/tile/bundle/tools/bundle.xml
rename to tools/src/test/resources/rsrc/media/tile/bundle/tools/bundle.xml
diff --git a/src/test/resources/rsrc/media/tile/bundle/tools/bundler-config.xml b/tools/src/test/resources/rsrc/media/tile/bundle/tools/bundler-config.xml
similarity index 100%
rename from src/test/resources/rsrc/media/tile/bundle/tools/bundler-config.xml
rename to tools/src/test/resources/rsrc/media/tile/bundle/tools/bundler-config.xml
diff --git a/src/test/resources/rsrc/media/tile/bundle/tools/fringe.png b/tools/src/test/resources/rsrc/media/tile/bundle/tools/fringe.png
similarity index 100%
rename from src/test/resources/rsrc/media/tile/bundle/tools/fringe.png
rename to tools/src/test/resources/rsrc/media/tile/bundle/tools/fringe.png
diff --git a/src/test/resources/rsrc/media/tile/bundle/tools/node-icons.png b/tools/src/test/resources/rsrc/media/tile/bundle/tools/node-icons.png
similarity index 100%
rename from src/test/resources/rsrc/media/tile/bundle/tools/node-icons.png
rename to tools/src/test/resources/rsrc/media/tile/bundle/tools/node-icons.png
diff --git a/src/test/resources/rsrc/media/tile/tools/xml/tilesets.xml b/tools/src/test/resources/rsrc/media/tile/tools/xml/tilesets.xml
similarity index 100%
rename from src/test/resources/rsrc/media/tile/tools/xml/tilesets.xml
rename to tools/src/test/resources/rsrc/media/tile/tools/xml/tilesets.xml