diff --git a/README.md b/README.md
index 58b6d7c4..f255096c 100644
--- a/README.md
+++ b/README.md
@@ -28,9 +28,15 @@ features of the library.
Building
--------
-The library is built using [Ant](http://ant.apache.org/).
+The library is built using Maven, or [Ant](http://ant.apache.org/).
-Invoke ant with any of the following targets:
+The Maven build uses the standard targets:
+
+ package: builds the code and creates the jars and swcs
+ install: builds and installs the artifacts into your local Maven repository
+ test: builds and runs the unit tests
+
+The Ant build uses the following targets:
all: builds the distribution files and javadoc documentation
compile: builds only the class files (dist/classes)
@@ -50,16 +56,9 @@ Nenya provides three different build artifacts, for differing purposes:
* nenyalib: contains the main ActionScript library; exports dependencies for
libraries needed when building a SWF using nenyalib.
-A Maven repository containing released versions of the Nenya Java and
-ActionScript artifacts are maintained here. To add a Nenya dependency to a
+Nenya is published to Maven Central. To add a Nenya dependency to a
Maven project, add the following to your `pom.xml`:
-
-
- ooo-repo
- http://threerings.github.com/maven-repo
-
-
com.threerings
@@ -73,9 +72,9 @@ remove the vast majority of the boilerplate above.
If you prefer to download pre-built binaries, those can be had here:
-* [nenya-1.2.jar](http://threerings.github.com/maven-repo/com/threerings/nenya/1.2/nenya-1.2.jar)
-* [nenya-tools-1.2.jar](http://threerings.github.com/maven-repo/com/threerings/nenya-tools/1.2/nenya-tools-1.2.jar)
-* [nenyalib-1.2.swc](http://threerings.github.com/maven-repo/com/threerings/nenyalib/1.2/nenyalib-1.2.swc)
+* [nenya-1.2.jar](http://repo2.maven.org/maven2/com/threerings/nenya/1.2/nenya-1.2.jar)
+* [nenya-tools-1.2.jar](http://repo2.maven.org/maven2/com/threerings/nenya-tools/1.2/nenya-tools-1.2.jar)
+* [nenyalib-1.2.swc](http://repo2.maven.org/maven2/com/threerings/nenyalib/1.2/nenyalib-1.2.swc)
Distribution
------------
diff --git a/aslib/pom.xml b/aslib/pom.xml
new file mode 100644
index 00000000..b3fa17b6
--- /dev/null
+++ b/aslib/pom.xml
@@ -0,0 +1,110 @@
+
+
+ 4.0.0
+
+ com.threerings
+ nenya-parent
+ 1.5-SNAPSHOT
+
+
+ nenyalib
+ swc
+ Nenya ActionScript
+
+
+
+ flexlib-repo
+ http://maven.ow2.org/maven2
+
+
+ ooo-ext-maven-repo
+ http://ooo-maven.googlecode.com/hg/repository
+
+
+ ooo-maven-repo
+ http://threerings.github.com/maven-repo
+
+
+
+
+ 4.1.0.16076
+
+
+
+
+ com.threerings
+ aspirin
+ 1.9
+ swc
+
+
+ flexlib
+ flexlib-bin
+ 2.4
+ swc
+
+
+ as3isolib
+ as3isolib-fp9
+ r298
+ swc
+
+
+ com.threerings
+ naryalib
+ 1.11
+ swc
+
+
+
+ com.adobe.flex.framework
+ flex-framework
+ ${flex.version}
+ pom
+ true
+
+
+
+
+
+ flexmojos
+ http://repository.sonatype.org/content/groups/flexgroup/
+
+
+
+
+ src/main/as
+
+
+ org.sonatype.flexmojos
+ flexmojos-maven-plugin
+ true
+ 4.2-beta
+
+ false
+ true
+ false
+ false
+ true
+
+ false
+
+
+
+ com.adobe.flex
+ compiler
+ ${flex.version}
+ pom
+
+
+ com.adobe.flex.compiler
+ asdoc
+ ${flex.version}
+ template
+ zip
+
+
+
+
+
+
diff --git a/src/main/as/com/threerings/cast/ActionFrames.as b/aslib/src/main/as/com/threerings/cast/ActionFrames.as
similarity index 99%
rename from src/main/as/com/threerings/cast/ActionFrames.as
rename to aslib/src/main/as/com/threerings/cast/ActionFrames.as
index db4a807f..c3222efa 100644
--- a/src/main/as/com/threerings/cast/ActionFrames.as
+++ b/aslib/src/main/as/com/threerings/cast/ActionFrames.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/ActionSequence.as b/aslib/src/main/as/com/threerings/cast/ActionSequence.as
similarity index 99%
rename from src/main/as/com/threerings/cast/ActionSequence.as
rename to aslib/src/main/as/com/threerings/cast/ActionSequence.as
index d800e39c..a6bc8cb2 100644
--- a/src/main/as/com/threerings/cast/ActionSequence.as
+++ b/aslib/src/main/as/com/threerings/cast/ActionSequence.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/CharacterComponent.as b/aslib/src/main/as/com/threerings/cast/CharacterComponent.as
similarity index 99%
rename from src/main/as/com/threerings/cast/CharacterComponent.as
rename to aslib/src/main/as/com/threerings/cast/CharacterComponent.as
index eb8ed854..917d4da1 100644
--- a/src/main/as/com/threerings/cast/CharacterComponent.as
+++ b/aslib/src/main/as/com/threerings/cast/CharacterComponent.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/CharacterDescriptor.as b/aslib/src/main/as/com/threerings/cast/CharacterDescriptor.as
similarity index 99%
rename from src/main/as/com/threerings/cast/CharacterDescriptor.as
rename to aslib/src/main/as/com/threerings/cast/CharacterDescriptor.as
index eb4e4892..a5bce9f9 100644
--- a/src/main/as/com/threerings/cast/CharacterDescriptor.as
+++ b/aslib/src/main/as/com/threerings/cast/CharacterDescriptor.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/CharacterManager.as b/aslib/src/main/as/com/threerings/cast/CharacterManager.as
similarity index 99%
rename from src/main/as/com/threerings/cast/CharacterManager.as
rename to aslib/src/main/as/com/threerings/cast/CharacterManager.as
index 7d38f2b1..180875ce 100644
--- a/src/main/as/com/threerings/cast/CharacterManager.as
+++ b/aslib/src/main/as/com/threerings/cast/CharacterManager.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/CharacterSprite.as b/aslib/src/main/as/com/threerings/cast/CharacterSprite.as
similarity index 99%
rename from src/main/as/com/threerings/cast/CharacterSprite.as
rename to aslib/src/main/as/com/threerings/cast/CharacterSprite.as
index 7f0a73f1..f484f2f3 100644
--- a/src/main/as/com/threerings/cast/CharacterSprite.as
+++ b/aslib/src/main/as/com/threerings/cast/CharacterSprite.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/ComponentClass.as b/aslib/src/main/as/com/threerings/cast/ComponentClass.as
similarity index 99%
rename from src/main/as/com/threerings/cast/ComponentClass.as
rename to aslib/src/main/as/com/threerings/cast/ComponentClass.as
index ac50c0f5..3150b402 100644
--- a/src/main/as/com/threerings/cast/ComponentClass.as
+++ b/aslib/src/main/as/com/threerings/cast/ComponentClass.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/ComponentDataPack.as b/aslib/src/main/as/com/threerings/cast/ComponentDataPack.as
similarity index 99%
rename from src/main/as/com/threerings/cast/ComponentDataPack.as
rename to aslib/src/main/as/com/threerings/cast/ComponentDataPack.as
index e1eb008a..0d086f9d 100644
--- a/src/main/as/com/threerings/cast/ComponentDataPack.as
+++ b/aslib/src/main/as/com/threerings/cast/ComponentDataPack.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/ComponentFrames.as b/aslib/src/main/as/com/threerings/cast/ComponentFrames.as
similarity index 99%
rename from src/main/as/com/threerings/cast/ComponentFrames.as
rename to aslib/src/main/as/com/threerings/cast/ComponentFrames.as
index c23e10f2..e64330b1 100644
--- a/src/main/as/com/threerings/cast/ComponentFrames.as
+++ b/aslib/src/main/as/com/threerings/cast/ComponentFrames.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/ComponentRepository.as b/aslib/src/main/as/com/threerings/cast/ComponentRepository.as
similarity index 99%
rename from src/main/as/com/threerings/cast/ComponentRepository.as
rename to aslib/src/main/as/com/threerings/cast/ComponentRepository.as
index 381404e9..6abadea5 100644
--- a/src/main/as/com/threerings/cast/ComponentRepository.as
+++ b/aslib/src/main/as/com/threerings/cast/ComponentRepository.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/CompositedActionFrames.as b/aslib/src/main/as/com/threerings/cast/CompositedActionFrames.as
similarity index 99%
rename from src/main/as/com/threerings/cast/CompositedActionFrames.as
rename to aslib/src/main/as/com/threerings/cast/CompositedActionFrames.as
index 6eba5eb5..031f31e1 100644
--- a/src/main/as/com/threerings/cast/CompositedActionFrames.as
+++ b/aslib/src/main/as/com/threerings/cast/CompositedActionFrames.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/CompositedFramesKey.as b/aslib/src/main/as/com/threerings/cast/CompositedFramesKey.as
similarity index 99%
rename from src/main/as/com/threerings/cast/CompositedFramesKey.as
rename to aslib/src/main/as/com/threerings/cast/CompositedFramesKey.as
index 1628f988..cce19255 100644
--- a/src/main/as/com/threerings/cast/CompositedFramesKey.as
+++ b/aslib/src/main/as/com/threerings/cast/CompositedFramesKey.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/DataPackComponentRepository.as b/aslib/src/main/as/com/threerings/cast/DataPackComponentRepository.as
similarity index 99%
rename from src/main/as/com/threerings/cast/DataPackComponentRepository.as
rename to aslib/src/main/as/com/threerings/cast/DataPackComponentRepository.as
index 25191d4e..e42b8fc2 100644
--- a/src/main/as/com/threerings/cast/DataPackComponentRepository.as
+++ b/aslib/src/main/as/com/threerings/cast/DataPackComponentRepository.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/FrameProvider.as b/aslib/src/main/as/com/threerings/cast/FrameProvider.as
similarity index 99%
rename from src/main/as/com/threerings/cast/FrameProvider.as
rename to aslib/src/main/as/com/threerings/cast/FrameProvider.as
index 0982291d..abc22f74 100644
--- a/src/main/as/com/threerings/cast/FrameProvider.as
+++ b/aslib/src/main/as/com/threerings/cast/FrameProvider.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/MultiFrameBitmap.as b/aslib/src/main/as/com/threerings/cast/MultiFrameBitmap.as
similarity index 99%
rename from src/main/as/com/threerings/cast/MultiFrameBitmap.as
rename to aslib/src/main/as/com/threerings/cast/MultiFrameBitmap.as
index 68299891..f47ea777 100644
--- a/src/main/as/com/threerings/cast/MultiFrameBitmap.as
+++ b/aslib/src/main/as/com/threerings/cast/MultiFrameBitmap.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/NoSuchComponentError.as b/aslib/src/main/as/com/threerings/cast/NoSuchComponentError.as
similarity index 99%
rename from src/main/as/com/threerings/cast/NoSuchComponentError.as
rename to aslib/src/main/as/com/threerings/cast/NoSuchComponentError.as
index 4a3dbc4a..37a83ca1 100644
--- a/src/main/as/com/threerings/cast/NoSuchComponentError.as
+++ b/aslib/src/main/as/com/threerings/cast/NoSuchComponentError.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/PriorityOverride.as b/aslib/src/main/as/com/threerings/cast/PriorityOverride.as
similarity index 99%
rename from src/main/as/com/threerings/cast/PriorityOverride.as
rename to aslib/src/main/as/com/threerings/cast/PriorityOverride.as
index e8f7efd2..495fe281 100644
--- a/src/main/as/com/threerings/cast/PriorityOverride.as
+++ b/aslib/src/main/as/com/threerings/cast/PriorityOverride.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/StandardActions.as b/aslib/src/main/as/com/threerings/cast/StandardActions.as
similarity index 99%
rename from src/main/as/com/threerings/cast/StandardActions.as
rename to aslib/src/main/as/com/threerings/cast/StandardActions.as
index 1d9b355c..a04cd51a 100644
--- a/src/main/as/com/threerings/cast/StandardActions.as
+++ b/aslib/src/main/as/com/threerings/cast/StandardActions.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/cast/TileSetFrameImage.as b/aslib/src/main/as/com/threerings/cast/TileSetFrameImage.as
similarity index 99%
rename from src/main/as/com/threerings/cast/TileSetFrameImage.as
rename to aslib/src/main/as/com/threerings/cast/TileSetFrameImage.as
index 6d086ef1..3427b713 100644
--- a/src/main/as/com/threerings/cast/TileSetFrameImage.as
+++ b/aslib/src/main/as/com/threerings/cast/TileSetFrameImage.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/AmbidextrousList.as b/aslib/src/main/as/com/threerings/flex/AmbidextrousList.as
similarity index 99%
rename from src/main/as/com/threerings/flex/AmbidextrousList.as
rename to aslib/src/main/as/com/threerings/flex/AmbidextrousList.as
index b3f8069e..87f7023f 100644
--- a/src/main/as/com/threerings/flex/AmbidextrousList.as
+++ b/aslib/src/main/as/com/threerings/flex/AmbidextrousList.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/ChatControl.as b/aslib/src/main/as/com/threerings/flex/ChatControl.as
similarity index 99%
rename from src/main/as/com/threerings/flex/ChatControl.as
rename to aslib/src/main/as/com/threerings/flex/ChatControl.as
index 8980fae4..824a9d41 100644
--- a/src/main/as/com/threerings/flex/ChatControl.as
+++ b/aslib/src/main/as/com/threerings/flex/ChatControl.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/ChatDisplayBox.as b/aslib/src/main/as/com/threerings/flex/ChatDisplayBox.as
similarity index 99%
rename from src/main/as/com/threerings/flex/ChatDisplayBox.as
rename to aslib/src/main/as/com/threerings/flex/ChatDisplayBox.as
index 64bdac78..53e869aa 100644
--- a/src/main/as/com/threerings/flex/ChatDisplayBox.as
+++ b/aslib/src/main/as/com/threerings/flex/ChatDisplayBox.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/ChatInput.as b/aslib/src/main/as/com/threerings/flex/ChatInput.as
similarity index 99%
rename from src/main/as/com/threerings/flex/ChatInput.as
rename to aslib/src/main/as/com/threerings/flex/ChatInput.as
index cd5638e2..7dc6acdc 100644
--- a/src/main/as/com/threerings/flex/ChatInput.as
+++ b/aslib/src/main/as/com/threerings/flex/ChatInput.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/CommandButton.as b/aslib/src/main/as/com/threerings/flex/CommandButton.as
similarity index 99%
rename from src/main/as/com/threerings/flex/CommandButton.as
rename to aslib/src/main/as/com/threerings/flex/CommandButton.as
index c8a2d3b8..1c6a15bf 100644
--- a/src/main/as/com/threerings/flex/CommandButton.as
+++ b/aslib/src/main/as/com/threerings/flex/CommandButton.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/CommandCheckBox.as b/aslib/src/main/as/com/threerings/flex/CommandCheckBox.as
similarity index 99%
rename from src/main/as/com/threerings/flex/CommandCheckBox.as
rename to aslib/src/main/as/com/threerings/flex/CommandCheckBox.as
index 28d22142..62e1471c 100644
--- a/src/main/as/com/threerings/flex/CommandCheckBox.as
+++ b/aslib/src/main/as/com/threerings/flex/CommandCheckBox.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/CommandComboBox.as b/aslib/src/main/as/com/threerings/flex/CommandComboBox.as
similarity index 99%
rename from src/main/as/com/threerings/flex/CommandComboBox.as
rename to aslib/src/main/as/com/threerings/flex/CommandComboBox.as
index e3296c19..9962a3b1 100644
--- a/src/main/as/com/threerings/flex/CommandComboBox.as
+++ b/aslib/src/main/as/com/threerings/flex/CommandComboBox.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/CommandLinkButton.as b/aslib/src/main/as/com/threerings/flex/CommandLinkButton.as
similarity index 99%
rename from src/main/as/com/threerings/flex/CommandLinkButton.as
rename to aslib/src/main/as/com/threerings/flex/CommandLinkButton.as
index 16b1e7a2..ed84db1a 100644
--- a/src/main/as/com/threerings/flex/CommandLinkButton.as
+++ b/aslib/src/main/as/com/threerings/flex/CommandLinkButton.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/CommandMenu.as b/aslib/src/main/as/com/threerings/flex/CommandMenu.as
similarity index 99%
rename from src/main/as/com/threerings/flex/CommandMenu.as
rename to aslib/src/main/as/com/threerings/flex/CommandMenu.as
index 4babc1f5..5d5865ce 100644
--- a/src/main/as/com/threerings/flex/CommandMenu.as
+++ b/aslib/src/main/as/com/threerings/flex/CommandMenu.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/CursorManager.as b/aslib/src/main/as/com/threerings/flex/CursorManager.as
similarity index 99%
rename from src/main/as/com/threerings/flex/CursorManager.as
rename to aslib/src/main/as/com/threerings/flex/CursorManager.as
index 9f1685d6..e6b9e47c 100644
--- a/src/main/as/com/threerings/flex/CursorManager.as
+++ b/aslib/src/main/as/com/threerings/flex/CursorManager.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/DSetList.as b/aslib/src/main/as/com/threerings/flex/DSetList.as
similarity index 99%
rename from src/main/as/com/threerings/flex/DSetList.as
rename to aslib/src/main/as/com/threerings/flex/DSetList.as
index f1e1ba8c..8c252ba1 100644
--- a/src/main/as/com/threerings/flex/DSetList.as
+++ b/aslib/src/main/as/com/threerings/flex/DSetList.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/FlexUtil.as b/aslib/src/main/as/com/threerings/flex/FlexUtil.as
similarity index 99%
rename from src/main/as/com/threerings/flex/FlexUtil.as
rename to aslib/src/main/as/com/threerings/flex/FlexUtil.as
index 66f4b44f..7798a6e9 100644
--- a/src/main/as/com/threerings/flex/FlexUtil.as
+++ b/aslib/src/main/as/com/threerings/flex/FlexUtil.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/FlexWrapper.as b/aslib/src/main/as/com/threerings/flex/FlexWrapper.as
similarity index 99%
rename from src/main/as/com/threerings/flex/FlexWrapper.as
rename to aslib/src/main/as/com/threerings/flex/FlexWrapper.as
index 914c2c21..a5b48e3d 100644
--- a/src/main/as/com/threerings/flex/FlexWrapper.as
+++ b/aslib/src/main/as/com/threerings/flex/FlexWrapper.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/FunctionEffect.as b/aslib/src/main/as/com/threerings/flex/FunctionEffect.as
similarity index 99%
rename from src/main/as/com/threerings/flex/FunctionEffect.as
rename to aslib/src/main/as/com/threerings/flex/FunctionEffect.as
index 6f88275b..a5520833 100644
--- a/src/main/as/com/threerings/flex/FunctionEffect.as
+++ b/aslib/src/main/as/com/threerings/flex/FunctionEffect.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/FunctionEffectInstance.as b/aslib/src/main/as/com/threerings/flex/FunctionEffectInstance.as
similarity index 99%
rename from src/main/as/com/threerings/flex/FunctionEffectInstance.as
rename to aslib/src/main/as/com/threerings/flex/FunctionEffectInstance.as
index 6bae5c14..63ad1895 100644
--- a/src/main/as/com/threerings/flex/FunctionEffectInstance.as
+++ b/aslib/src/main/as/com/threerings/flex/FunctionEffectInstance.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/GridUtil.as b/aslib/src/main/as/com/threerings/flex/GridUtil.as
similarity index 99%
rename from src/main/as/com/threerings/flex/GridUtil.as
rename to aslib/src/main/as/com/threerings/flex/GridUtil.as
index 7d651637..40b759bf 100644
--- a/src/main/as/com/threerings/flex/GridUtil.as
+++ b/aslib/src/main/as/com/threerings/flex/GridUtil.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/KeyboardManager.as b/aslib/src/main/as/com/threerings/flex/KeyboardManager.as
similarity index 99%
rename from src/main/as/com/threerings/flex/KeyboardManager.as
rename to aslib/src/main/as/com/threerings/flex/KeyboardManager.as
index 225005b1..6c792314 100644
--- a/src/main/as/com/threerings/flex/KeyboardManager.as
+++ b/aslib/src/main/as/com/threerings/flex/KeyboardManager.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/LabeledSlider.as b/aslib/src/main/as/com/threerings/flex/LabeledSlider.as
similarity index 99%
rename from src/main/as/com/threerings/flex/LabeledSlider.as
rename to aslib/src/main/as/com/threerings/flex/LabeledSlider.as
index 6c246103..b868b989 100644
--- a/src/main/as/com/threerings/flex/LabeledSlider.as
+++ b/aslib/src/main/as/com/threerings/flex/LabeledSlider.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/LazyContainer.as b/aslib/src/main/as/com/threerings/flex/LazyContainer.as
similarity index 99%
rename from src/main/as/com/threerings/flex/LazyContainer.as
rename to aslib/src/main/as/com/threerings/flex/LazyContainer.as
index 6740c76e..4db12388 100644
--- a/src/main/as/com/threerings/flex/LazyContainer.as
+++ b/aslib/src/main/as/com/threerings/flex/LazyContainer.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/LazyTabNavigator.as b/aslib/src/main/as/com/threerings/flex/LazyTabNavigator.as
similarity index 99%
rename from src/main/as/com/threerings/flex/LazyTabNavigator.as
rename to aslib/src/main/as/com/threerings/flex/LazyTabNavigator.as
index 046be8f8..cc5a6af3 100644
--- a/src/main/as/com/threerings/flex/LazyTabNavigator.as
+++ b/aslib/src/main/as/com/threerings/flex/LazyTabNavigator.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/LoadedAsset.as b/aslib/src/main/as/com/threerings/flex/LoadedAsset.as
similarity index 99%
rename from src/main/as/com/threerings/flex/LoadedAsset.as
rename to aslib/src/main/as/com/threerings/flex/LoadedAsset.as
index 189a972b..fbd20099 100644
--- a/src/main/as/com/threerings/flex/LoadedAsset.as
+++ b/aslib/src/main/as/com/threerings/flex/LoadedAsset.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/PopUpUtil.as b/aslib/src/main/as/com/threerings/flex/PopUpUtil.as
similarity index 99%
rename from src/main/as/com/threerings/flex/PopUpUtil.as
rename to aslib/src/main/as/com/threerings/flex/PopUpUtil.as
index ecde7a76..3f1c758c 100644
--- a/src/main/as/com/threerings/flex/PopUpUtil.as
+++ b/aslib/src/main/as/com/threerings/flex/PopUpUtil.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/flex/ScrollBox.as b/aslib/src/main/as/com/threerings/flex/ScrollBox.as
similarity index 99%
rename from src/main/as/com/threerings/flex/ScrollBox.as
rename to aslib/src/main/as/com/threerings/flex/ScrollBox.as
index aa91ccc0..45e5e0cb 100644
--- a/src/main/as/com/threerings/flex/ScrollBox.as
+++ b/aslib/src/main/as/com/threerings/flex/ScrollBox.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/flex/menuClasses/CommandListData.as
rename to aslib/src/main/as/com/threerings/flex/menuClasses/CommandListData.as
index 08355804..e7653dac 100644
--- a/src/main/as/com/threerings/flex/menuClasses/CommandListData.as
+++ b/aslib/src/main/as/com/threerings/flex/menuClasses/CommandListData.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/flex/menuClasses/CommandMenuItemRenderer.as
rename to aslib/src/main/as/com/threerings/flex/menuClasses/CommandMenuItemRenderer.as
index 2ee8872f..6cb3847d 100644
--- a/src/main/as/com/threerings/flex/menuClasses/CommandMenuItemRenderer.as
+++ b/aslib/src/main/as/com/threerings/flex/menuClasses/CommandMenuItemRenderer.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/media/Tickable.as b/aslib/src/main/as/com/threerings/media/Tickable.as
similarity index 98%
rename from src/main/as/com/threerings/media/Tickable.as
rename to aslib/src/main/as/com/threerings/media/Tickable.as
index be8e4824..7de85da6 100644
--- a/src/main/as/com/threerings/media/Tickable.as
+++ b/aslib/src/main/as/com/threerings/media/Tickable.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/media/Ticker.as b/aslib/src/main/as/com/threerings/media/Ticker.as
similarity index 99%
rename from src/main/as/com/threerings/media/Ticker.as
rename to aslib/src/main/as/com/threerings/media/Ticker.as
index 3966008f..04186077 100644
--- a/src/main/as/com/threerings/media/Ticker.as
+++ b/aslib/src/main/as/com/threerings/media/Ticker.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/image/ClassRecord.as
rename to aslib/src/main/as/com/threerings/media/image/ClassRecord.as
index 1cbeefe2..5f9aaec1 100644
--- a/src/main/as/com/threerings/media/image/ClassRecord.as
+++ b/aslib/src/main/as/com/threerings/media/image/ClassRecord.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/image/ColorPository.as
rename to aslib/src/main/as/com/threerings/media/image/ColorPository.as
index 0b8de0ac..0e0d35fc 100644
--- a/src/main/as/com/threerings/media/image/ColorPository.as
+++ b/aslib/src/main/as/com/threerings/media/image/ColorPository.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/image/ColorRecord.as
rename to aslib/src/main/as/com/threerings/media/image/ColorRecord.as
index 8c3ddf74..880aceaa 100644
--- a/src/main/as/com/threerings/media/image/ColorRecord.as
+++ b/aslib/src/main/as/com/threerings/media/image/ColorRecord.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/image/Colorization.as
rename to aslib/src/main/as/com/threerings/media/image/Colorization.as
index 8f65eba5..e6efb9e8 100644
--- a/src/main/as/com/threerings/media/image/Colorization.as
+++ b/aslib/src/main/as/com/threerings/media/image/Colorization.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/image/PngRecolorUtil.as
rename to aslib/src/main/as/com/threerings/media/image/PngRecolorUtil.as
index 7d9d2976..de89cbda 100644
--- a/src/main/as/com/threerings/media/image/PngRecolorUtil.as
+++ b/aslib/src/main/as/com/threerings/media/image/PngRecolorUtil.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/BaseTile.as
rename to aslib/src/main/as/com/threerings/media/tile/BaseTile.as
index 4de31459..8ec3aff0 100644
--- a/src/main/as/com/threerings/media/tile/BaseTile.as
+++ b/aslib/src/main/as/com/threerings/media/tile/BaseTile.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/BaseTileSet.as
rename to aslib/src/main/as/com/threerings/media/tile/BaseTileSet.as
index f380461f..041aa182 100644
--- a/src/main/as/com/threerings/media/tile/BaseTileSet.as
+++ b/aslib/src/main/as/com/threerings/media/tile/BaseTileSet.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/Colorizer.as
rename to aslib/src/main/as/com/threerings/media/tile/Colorizer.as
index 12ab81d2..7d1e589d 100644
--- a/src/main/as/com/threerings/media/tile/Colorizer.as
+++ b/aslib/src/main/as/com/threerings/media/tile/Colorizer.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/DataPackTileSetRepository.as
rename to aslib/src/main/as/com/threerings/media/tile/DataPackTileSetRepository.as
index b696825a..333c8890 100644
--- a/src/main/as/com/threerings/media/tile/DataPackTileSetRepository.as
+++ b/aslib/src/main/as/com/threerings/media/tile/DataPackTileSetRepository.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/ImageProvider.as
rename to aslib/src/main/as/com/threerings/media/tile/ImageProvider.as
index 4f7c5db1..f40fdcf7 100644
--- a/src/main/as/com/threerings/media/tile/ImageProvider.as
+++ b/aslib/src/main/as/com/threerings/media/tile/ImageProvider.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/NoSuchTileSetError.as
rename to aslib/src/main/as/com/threerings/media/tile/NoSuchTileSetError.as
index 9ef68ef7..e8aad4a8 100644
--- a/src/main/as/com/threerings/media/tile/NoSuchTileSetError.as
+++ b/aslib/src/main/as/com/threerings/media/tile/NoSuchTileSetError.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/ObjectTile.as
rename to aslib/src/main/as/com/threerings/media/tile/ObjectTile.as
index 109cb9d3..4e006fb6 100644
--- a/src/main/as/com/threerings/media/tile/ObjectTile.as
+++ b/aslib/src/main/as/com/threerings/media/tile/ObjectTile.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/ObjectTileSet.as
rename to aslib/src/main/as/com/threerings/media/tile/ObjectTileSet.as
index 76836366..ba70c653 100644
--- a/src/main/as/com/threerings/media/tile/ObjectTileSet.as
+++ b/aslib/src/main/as/com/threerings/media/tile/ObjectTileSet.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/RecolorableTileSet.as
rename to aslib/src/main/as/com/threerings/media/tile/RecolorableTileSet.as
index a1123a8c..ab8710ec 100644
--- a/src/main/as/com/threerings/media/tile/RecolorableTileSet.as
+++ b/aslib/src/main/as/com/threerings/media/tile/RecolorableTileSet.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/SwissArmyTileSet.as
rename to aslib/src/main/as/com/threerings/media/tile/SwissArmyTileSet.as
index 25f2d81c..bdea61e9 100644
--- a/src/main/as/com/threerings/media/tile/SwissArmyTileSet.as
+++ b/aslib/src/main/as/com/threerings/media/tile/SwissArmyTileSet.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/Tile.as
rename to aslib/src/main/as/com/threerings/media/tile/Tile.as
index c90f4c51..c901dd91 100644
--- a/src/main/as/com/threerings/media/tile/Tile.as
+++ b/aslib/src/main/as/com/threerings/media/tile/Tile.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/TileDataPack.as
rename to aslib/src/main/as/com/threerings/media/tile/TileDataPack.as
index be4112db..4be5aa19 100644
--- a/src/main/as/com/threerings/media/tile/TileDataPack.as
+++ b/aslib/src/main/as/com/threerings/media/tile/TileDataPack.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/TileManager.as
rename to aslib/src/main/as/com/threerings/media/tile/TileManager.as
index d4f664e3..94340958 100644
--- a/src/main/as/com/threerings/media/tile/TileManager.as
+++ b/aslib/src/main/as/com/threerings/media/tile/TileManager.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/TileSet.as
rename to aslib/src/main/as/com/threerings/media/tile/TileSet.as
index 06f5d4cc..cdf017c7 100644
--- a/src/main/as/com/threerings/media/tile/TileSet.as
+++ b/aslib/src/main/as/com/threerings/media/tile/TileSet.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/TileSetIdMap.as
rename to aslib/src/main/as/com/threerings/media/tile/TileSetIdMap.as
index 71f91785..4c8f9774 100644
--- a/src/main/as/com/threerings/media/tile/TileSetIdMap.as
+++ b/aslib/src/main/as/com/threerings/media/tile/TileSetIdMap.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/TileSetRepository.as
rename to aslib/src/main/as/com/threerings/media/tile/TileSetRepository.as
index 6db395ff..d81acc26 100644
--- a/src/main/as/com/threerings/media/tile/TileSetRepository.as
+++ b/aslib/src/main/as/com/threerings/media/tile/TileSetRepository.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/tile/TileUtil.as
rename to aslib/src/main/as/com/threerings/media/tile/TileUtil.as
index a662b7b4..5a7bd22f 100644
--- a/src/main/as/com/threerings/media/tile/TileUtil.as
+++ b/aslib/src/main/as/com/threerings/media/tile/TileUtil.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 8826a043..08f88ca9 100644
--- a/src/main/as/com/threerings/media/tile/Tile_Key.as
+++ b/aslib/src/main/as/com/threerings/media/tile/Tile_Key.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 0bed88c6..aa814d14 100644
--- a/src/main/as/com/threerings/media/tile/bundle/TileSetBundle.as
+++ b/aslib/src/main/as/com/threerings/media/tile/bundle/TileSetBundle.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/util/AStarPathSearch.as
rename to aslib/src/main/as/com/threerings/media/util/AStarPathSearch.as
index 12d8fb2e..7a406495 100644
--- a/src/main/as/com/threerings/media/util/AStarPathSearch.as
+++ b/aslib/src/main/as/com/threerings/media/util/AStarPathSearch.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index ecd96078..2432e16a 100644
--- a/src/main/as/com/threerings/media/util/AStarPathSearch_Info.as
+++ b/aslib/src/main/as/com/threerings/media/util/AStarPathSearch_Info.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 4b0c42a5..f2389a6a 100644
--- a/src/main/as/com/threerings/media/util/AStarPathSearch_Node.as
+++ b/aslib/src/main/as/com/threerings/media/util/AStarPathSearch_Node.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 87fd2078..4447911d 100644
--- a/src/main/as/com/threerings/media/util/AStarPathSearch_Stepper.as
+++ b/aslib/src/main/as/com/threerings/media/util/AStarPathSearch_Stepper.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/util/ExtendedTraversalPred.as
rename to aslib/src/main/as/com/threerings/media/util/ExtendedTraversalPred.as
index c0bc22a4..ccc3dea7 100644
--- a/src/main/as/com/threerings/media/util/ExtendedTraversalPred.as
+++ b/aslib/src/main/as/com/threerings/media/util/ExtendedTraversalPred.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/util/LineSegmentPath.as
rename to aslib/src/main/as/com/threerings/media/util/LineSegmentPath.as
index 6c77f8f5..dd12ecef 100644
--- a/src/main/as/com/threerings/media/util/LineSegmentPath.as
+++ b/aslib/src/main/as/com/threerings/media/util/LineSegmentPath.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/util/Path.as
rename to aslib/src/main/as/com/threerings/media/util/Path.as
index 5a29edba..d90bcc5a 100644
--- a/src/main/as/com/threerings/media/util/Path.as
+++ b/aslib/src/main/as/com/threerings/media/util/Path.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/util/PathNode.as
rename to aslib/src/main/as/com/threerings/media/util/PathNode.as
index a35d0da9..a6ed1a1e 100644
--- a/src/main/as/com/threerings/media/util/PathNode.as
+++ b/aslib/src/main/as/com/threerings/media/util/PathNode.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/util/Pathable.as
rename to aslib/src/main/as/com/threerings/media/util/Pathable.as
index aed5dbbc..1780a7fa 100644
--- a/src/main/as/com/threerings/media/util/Pathable.as
+++ b/aslib/src/main/as/com/threerings/media/util/Pathable.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/media/util/TraversalPred.as
rename to aslib/src/main/as/com/threerings/media/util/TraversalPred.as
index afc98c89..48242fc7 100644
--- a/src/main/as/com/threerings/media/util/TraversalPred.as
+++ b/aslib/src/main/as/com/threerings/media/util/TraversalPred.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/client/BaseTileIsoSprite.as
rename to aslib/src/main/as/com/threerings/miso/client/BaseTileIsoSprite.as
index e10f2466..769f5858 100644
--- a/src/main/as/com/threerings/miso/client/BaseTileIsoSprite.as
+++ b/aslib/src/main/as/com/threerings/miso/client/BaseTileIsoSprite.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/client/MisoMetricsTransformation.as
rename to aslib/src/main/as/com/threerings/miso/client/MisoMetricsTransformation.as
index 6407aff3..57952fc9 100644
--- a/src/main/as/com/threerings/miso/client/MisoMetricsTransformation.as
+++ b/aslib/src/main/as/com/threerings/miso/client/MisoMetricsTransformation.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/client/MisoScenePanel.as
rename to aslib/src/main/as/com/threerings/miso/client/MisoScenePanel.as
index ceea4f32..509fa5d8 100644
--- a/src/main/as/com/threerings/miso/client/MisoScenePanel.as
+++ b/aslib/src/main/as/com/threerings/miso/client/MisoScenePanel.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/client/ObjectTileIsoSprite.as
rename to aslib/src/main/as/com/threerings/miso/client/ObjectTileIsoSprite.as
index 517ac732..6c1ee245 100644
--- a/src/main/as/com/threerings/miso/client/ObjectTileIsoSprite.as
+++ b/aslib/src/main/as/com/threerings/miso/client/ObjectTileIsoSprite.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/client/PrioritizedSceneLayoutRenderer.as
rename to aslib/src/main/as/com/threerings/miso/client/PrioritizedSceneLayoutRenderer.as
index 1e1fdcc7..e754ab6e 100644
--- a/src/main/as/com/threerings/miso/client/PrioritizedSceneLayoutRenderer.as
+++ b/aslib/src/main/as/com/threerings/miso/client/PrioritizedSceneLayoutRenderer.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/client/PriorityIsoDisplayObject.as
rename to aslib/src/main/as/com/threerings/miso/client/PriorityIsoDisplayObject.as
index 01d27ca2..43460036 100644
--- a/src/main/as/com/threerings/miso/client/PriorityIsoDisplayObject.as
+++ b/aslib/src/main/as/com/threerings/miso/client/PriorityIsoDisplayObject.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/client/SceneBlock.as
rename to aslib/src/main/as/com/threerings/miso/client/SceneBlock.as
index 8c2c65e2..01fe6dbf 100644
--- a/src/main/as/com/threerings/miso/client/SceneBlock.as
+++ b/aslib/src/main/as/com/threerings/miso/client/SceneBlock.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/client/TileIsoSprite.as
rename to aslib/src/main/as/com/threerings/miso/client/TileIsoSprite.as
index 8dba685e..bf2ae554 100644
--- a/src/main/as/com/threerings/miso/client/TileIsoSprite.as
+++ b/aslib/src/main/as/com/threerings/miso/client/TileIsoSprite.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/data/MisoSceneModel.as
rename to aslib/src/main/as/com/threerings/miso/data/MisoSceneModel.as
index ed902149..74a4cde3 100644
--- a/src/main/as/com/threerings/miso/data/MisoSceneModel.as
+++ b/aslib/src/main/as/com/threerings/miso/data/MisoSceneModel.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/data/ObjectInfo.as
rename to aslib/src/main/as/com/threerings/miso/data/ObjectInfo.as
index fee33af1..90b20d4e 100644
--- a/src/main/as/com/threerings/miso/data/ObjectInfo.as
+++ b/aslib/src/main/as/com/threerings/miso/data/ObjectInfo.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/data/SparseMisoSceneModel.as
rename to aslib/src/main/as/com/threerings/miso/data/SparseMisoSceneModel.as
index 0fda1828..2bafef0b 100644
--- a/src/main/as/com/threerings/miso/data/SparseMisoSceneModel.as
+++ b/aslib/src/main/as/com/threerings/miso/data/SparseMisoSceneModel.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index fd46bcba..57399f41 100644
--- a/src/main/as/com/threerings/miso/data/SparseMisoSceneModel_ObjectVisitor.as
+++ b/aslib/src/main/as/com/threerings/miso/data/SparseMisoSceneModel_ObjectVisitor.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 66a0541f..a6e80332 100644
--- a/src/main/as/com/threerings/miso/data/SparseMisoSceneModel_Section.as
+++ b/aslib/src/main/as/com/threerings/miso/data/SparseMisoSceneModel_Section.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/data/VirtualMisoSceneModel.as
rename to aslib/src/main/as/com/threerings/miso/data/VirtualMisoSceneModel.as
index 29c5b2d8..91dbac4e 100644
--- a/src/main/as/com/threerings/miso/data/VirtualMisoSceneModel.as
+++ b/aslib/src/main/as/com/threerings/miso/data/VirtualMisoSceneModel.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/tile/AutoFringer.as
rename to aslib/src/main/as/com/threerings/miso/tile/AutoFringer.as
index 9c5fe425..7bca503c 100644
--- a/src/main/as/com/threerings/miso/tile/AutoFringer.as
+++ b/aslib/src/main/as/com/threerings/miso/tile/AutoFringer.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/tile/FringeConfiguration.as
rename to aslib/src/main/as/com/threerings/miso/tile/FringeConfiguration.as
index b96f63c5..517f0c8f 100644
--- a/src/main/as/com/threerings/miso/tile/FringeConfiguration.as
+++ b/aslib/src/main/as/com/threerings/miso/tile/FringeConfiguration.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/tile/FringeRecord.as
rename to aslib/src/main/as/com/threerings/miso/tile/FringeRecord.as
index 3cc8de4e..dbf41bd2 100644
--- a/src/main/as/com/threerings/miso/tile/FringeRecord.as
+++ b/aslib/src/main/as/com/threerings/miso/tile/FringeRecord.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/tile/FringeTile.as
rename to aslib/src/main/as/com/threerings/miso/tile/FringeTile.as
index 09ada5c2..00409151 100644
--- a/src/main/as/com/threerings/miso/tile/FringeTile.as
+++ b/aslib/src/main/as/com/threerings/miso/tile/FringeTile.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/tile/FringeTileSetRecord.as
rename to aslib/src/main/as/com/threerings/miso/tile/FringeTileSetRecord.as
index f7955fa4..b3917bf5 100644
--- a/src/main/as/com/threerings/miso/tile/FringeTileSetRecord.as
+++ b/aslib/src/main/as/com/threerings/miso/tile/FringeTileSetRecord.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/tile/MisoTileManager.as
rename to aslib/src/main/as/com/threerings/miso/tile/MisoTileManager.as
index 1d6fb5ae..98dd6e5d 100644
--- a/src/main/as/com/threerings/miso/tile/MisoTileManager.as
+++ b/aslib/src/main/as/com/threerings/miso/tile/MisoTileManager.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/util/MisoContext.as
rename to aslib/src/main/as/com/threerings/miso/util/MisoContext.as
index d9cbbf32..4879f4e7 100644
--- a/src/main/as/com/threerings/miso/util/MisoContext.as
+++ b/aslib/src/main/as/com/threerings/miso/util/MisoContext.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/util/MisoSceneMetrics.as
rename to aslib/src/main/as/com/threerings/miso/util/MisoSceneMetrics.as
index bd8fc012..54a917e9 100644
--- a/src/main/as/com/threerings/miso/util/MisoSceneMetrics.as
+++ b/aslib/src/main/as/com/threerings/miso/util/MisoSceneMetrics.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/util/MisoUtil.as
rename to aslib/src/main/as/com/threerings/miso/util/MisoUtil.as
index d231e698..012c158a 100644
--- a/src/main/as/com/threerings/miso/util/MisoUtil.as
+++ b/aslib/src/main/as/com/threerings/miso/util/MisoUtil.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/as/com/threerings/miso/util/ObjectSet.as
rename to aslib/src/main/as/com/threerings/miso/util/ObjectSet.as
index 35765c6c..396b22f0 100644
--- a/src/main/as/com/threerings/miso/util/ObjectSet.as
+++ b/aslib/src/main/as/com/threerings/miso/util/ObjectSet.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/util/DirectionCodes.as b/aslib/src/main/as/com/threerings/util/DirectionCodes.as
similarity index 99%
rename from src/main/as/com/threerings/util/DirectionCodes.as
rename to aslib/src/main/as/com/threerings/util/DirectionCodes.as
index a1869830..fd04a6b3 100644
--- a/src/main/as/com/threerings/util/DirectionCodes.as
+++ b/aslib/src/main/as/com/threerings/util/DirectionCodes.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/as/com/threerings/util/DirectionUtil.as b/aslib/src/main/as/com/threerings/util/DirectionUtil.as
similarity index 99%
rename from src/main/as/com/threerings/util/DirectionUtil.as
rename to aslib/src/main/as/com/threerings/util/DirectionUtil.as
index 8f715314..10ac8e5f 100644
--- a/src/main/as/com/threerings/util/DirectionUtil.as
+++ b/aslib/src/main/as/com/threerings/util/DirectionUtil.as
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/build.xml b/build.xml
index e09a500a..897c4fef 100644
--- a/build.xml
+++ b/build.xml
@@ -1,30 +1,53 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
@@ -38,20 +61,20 @@
-
+
-
+
-
+
-
-
+
+
@@ -61,17 +84,22 @@
-
+
-
-
+
+
+
+
+
+
-
-
+
+
+
-
+
+ configdef="${test-rsrc.dir}/config/media/colordefs.xml"
+ target="${test-rsrc.dir}/config/media/colordefs.dat"/>
-
+
@@ -155,8 +184,8 @@
+ fringedef="${test-rsrc.dir}/config/miso/tile/fringeconf.xml"
+ target="${test-rsrc.dir}/config/miso/tile/fringeconf.dat"/>
-
+
@@ -190,13 +219,14 @@
-
-
+
+
-
+
+
@@ -208,39 +238,14 @@
description="Cleans and rebuilds everything, including javadocs."/>
+ description="Compiles everything and builds distribution jar file.">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -250,28 +255,28 @@
description="Runs the Miso scene viewer.">
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 00000000..b62e1216
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,118 @@
+
+
+ 4.0.0
+
+ com.threerings
+ nenya-parent
+ 1.5-SNAPSHOT
+
+
+ nenya
+ jar
+ Nenya Core
+
+
+
+ lwjgl-repo
+ http://lwjgl-maven.googlecode.com/svn/trunk/repository
+
+
+ ooo-repo
+ http://threerings.github.com/maven-repo
+
+
+ ooo-ext-repo
+ http://ooo-maven.googlecode.com/hg/repository
+
+
+
+
+
+
+ com.samskivert
+ samskivert
+ 1.5
+
+
+ com.google.guava
+ guava
+ 11.0.1
+
+
+
+
+ com.threerings
+ narya
+ ${narya.version}
+ true
+
+
+ org.lwjgl
+ lwjgl
+ 2.6
+ true
+
+
+ org.lwjgl
+ lwjgl_util
+ 2.6
+ true
+
+
+ net.javazoom
+ jlayer
+ 1.0
+ true
+
+
+ com.jcraft
+ jorbis
+ 0.0.15
+ true
+
+
+ com.jcraft
+ jogg
+ 0.0.7
+ true
+
+
+ javassist
+ javassist
+ 3.8.0.GA
+ true
+
+
+
+
+ org.apache.ant
+ ant
+ 1.7.1
+ provided
+
+
+ junit
+ junit
+ 4.8.1
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+
+ **/OggPlayer.java
+ **/ModPlayer.java
+ **/MidiPlayer.java
+ **/Mp3Player.java
+
+
+
+
+
+
diff --git a/src/main/java/com/threerings/NenyaLog.java b/core/src/main/java/com/threerings/NenyaLog.java
similarity index 99%
rename from src/main/java/com/threerings/NenyaLog.java
rename to core/src/main/java/com/threerings/NenyaLog.java
index 18adc40b..5bf97dad 100644
--- a/src/main/java/com/threerings/NenyaLog.java
+++ b/core/src/main/java/com/threerings/NenyaLog.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/ActionCache.java b/core/src/main/java/com/threerings/cast/ActionCache.java
similarity index 99%
rename from src/main/java/com/threerings/cast/ActionCache.java
rename to core/src/main/java/com/threerings/cast/ActionCache.java
index de3ad3ef..0af4ffa0 100644
--- a/src/main/java/com/threerings/cast/ActionCache.java
+++ b/core/src/main/java/com/threerings/cast/ActionCache.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/ActionFrames.java b/core/src/main/java/com/threerings/cast/ActionFrames.java
similarity index 99%
rename from src/main/java/com/threerings/cast/ActionFrames.java
rename to core/src/main/java/com/threerings/cast/ActionFrames.java
index 98325516..5feac1c2 100644
--- a/src/main/java/com/threerings/cast/ActionFrames.java
+++ b/core/src/main/java/com/threerings/cast/ActionFrames.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/ActionSequence.java b/core/src/main/java/com/threerings/cast/ActionSequence.java
similarity index 99%
rename from src/main/java/com/threerings/cast/ActionSequence.java
rename to core/src/main/java/com/threerings/cast/ActionSequence.java
index 458b3777..4667a754 100644
--- a/src/main/java/com/threerings/cast/ActionSequence.java
+++ b/core/src/main/java/com/threerings/cast/ActionSequence.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/CastPrefs.java b/core/src/main/java/com/threerings/cast/CastPrefs.java
similarity index 99%
rename from src/main/java/com/threerings/cast/CastPrefs.java
rename to core/src/main/java/com/threerings/cast/CastPrefs.java
index ef164bda..ed684d18 100644
--- a/src/main/java/com/threerings/cast/CastPrefs.java
+++ b/core/src/main/java/com/threerings/cast/CastPrefs.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/CharacterComponent.java b/core/src/main/java/com/threerings/cast/CharacterComponent.java
similarity index 99%
rename from src/main/java/com/threerings/cast/CharacterComponent.java
rename to core/src/main/java/com/threerings/cast/CharacterComponent.java
index 7265d04f..469b929d 100644
--- a/src/main/java/com/threerings/cast/CharacterComponent.java
+++ b/core/src/main/java/com/threerings/cast/CharacterComponent.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/CharacterDescriptor.java b/core/src/main/java/com/threerings/cast/CharacterDescriptor.java
similarity index 99%
rename from src/main/java/com/threerings/cast/CharacterDescriptor.java
rename to core/src/main/java/com/threerings/cast/CharacterDescriptor.java
index b0205476..464504d5 100644
--- a/src/main/java/com/threerings/cast/CharacterDescriptor.java
+++ b/core/src/main/java/com/threerings/cast/CharacterDescriptor.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/CharacterManager.java b/core/src/main/java/com/threerings/cast/CharacterManager.java
similarity index 99%
rename from src/main/java/com/threerings/cast/CharacterManager.java
rename to core/src/main/java/com/threerings/cast/CharacterManager.java
index a7bde3de..b3375ceb 100644
--- a/src/main/java/com/threerings/cast/CharacterManager.java
+++ b/core/src/main/java/com/threerings/cast/CharacterManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/CharacterSprite.java b/core/src/main/java/com/threerings/cast/CharacterSprite.java
similarity index 99%
rename from src/main/java/com/threerings/cast/CharacterSprite.java
rename to core/src/main/java/com/threerings/cast/CharacterSprite.java
index 4e29b952..8d802096 100644
--- a/src/main/java/com/threerings/cast/CharacterSprite.java
+++ b/core/src/main/java/com/threerings/cast/CharacterSprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/ComponentClass.java b/core/src/main/java/com/threerings/cast/ComponentClass.java
similarity index 99%
rename from src/main/java/com/threerings/cast/ComponentClass.java
rename to core/src/main/java/com/threerings/cast/ComponentClass.java
index 9093cac6..11b64b37 100644
--- a/src/main/java/com/threerings/cast/ComponentClass.java
+++ b/core/src/main/java/com/threerings/cast/ComponentClass.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/ComponentIDBroker.java b/core/src/main/java/com/threerings/cast/ComponentIDBroker.java
similarity index 99%
rename from src/main/java/com/threerings/cast/ComponentIDBroker.java
rename to core/src/main/java/com/threerings/cast/ComponentIDBroker.java
index fc56739e..93fb197d 100644
--- a/src/main/java/com/threerings/cast/ComponentIDBroker.java
+++ b/core/src/main/java/com/threerings/cast/ComponentIDBroker.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/ComponentRepository.java b/core/src/main/java/com/threerings/cast/ComponentRepository.java
similarity index 99%
rename from src/main/java/com/threerings/cast/ComponentRepository.java
rename to core/src/main/java/com/threerings/cast/ComponentRepository.java
index a6ef7e25..313eba20 100644
--- a/src/main/java/com/threerings/cast/ComponentRepository.java
+++ b/core/src/main/java/com/threerings/cast/ComponentRepository.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/CompositedActionFrames.java b/core/src/main/java/com/threerings/cast/CompositedActionFrames.java
similarity index 99%
rename from src/main/java/com/threerings/cast/CompositedActionFrames.java
rename to core/src/main/java/com/threerings/cast/CompositedActionFrames.java
index e7794377..176cb425 100644
--- a/src/main/java/com/threerings/cast/CompositedActionFrames.java
+++ b/core/src/main/java/com/threerings/cast/CompositedActionFrames.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/CompositedMaskedImage.java b/core/src/main/java/com/threerings/cast/CompositedMaskedImage.java
similarity index 99%
rename from src/main/java/com/threerings/cast/CompositedMaskedImage.java
rename to core/src/main/java/com/threerings/cast/CompositedMaskedImage.java
index af952152..e7d97cec 100644
--- a/src/main/java/com/threerings/cast/CompositedMaskedImage.java
+++ b/core/src/main/java/com/threerings/cast/CompositedMaskedImage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/CompositedMirage.java b/core/src/main/java/com/threerings/cast/CompositedMirage.java
similarity index 99%
rename from src/main/java/com/threerings/cast/CompositedMirage.java
rename to core/src/main/java/com/threerings/cast/CompositedMirage.java
index 38e6f558..d55cad74 100644
--- a/src/main/java/com/threerings/cast/CompositedMirage.java
+++ b/core/src/main/java/com/threerings/cast/CompositedMirage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/CompositedMultiFrameImage.java b/core/src/main/java/com/threerings/cast/CompositedMultiFrameImage.java
similarity index 99%
rename from src/main/java/com/threerings/cast/CompositedMultiFrameImage.java
rename to core/src/main/java/com/threerings/cast/CompositedMultiFrameImage.java
index 4c6a4e6d..b03f5886 100644
--- a/src/main/java/com/threerings/cast/CompositedMultiFrameImage.java
+++ b/core/src/main/java/com/threerings/cast/CompositedMultiFrameImage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/CompositedShadowImage.java b/core/src/main/java/com/threerings/cast/CompositedShadowImage.java
similarity index 99%
rename from src/main/java/com/threerings/cast/CompositedShadowImage.java
rename to core/src/main/java/com/threerings/cast/CompositedShadowImage.java
index 3669ba7a..685843a9 100644
--- a/src/main/java/com/threerings/cast/CompositedShadowImage.java
+++ b/core/src/main/java/com/threerings/cast/CompositedShadowImage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/FrameProvider.java b/core/src/main/java/com/threerings/cast/FrameProvider.java
similarity index 99%
rename from src/main/java/com/threerings/cast/FrameProvider.java
rename to core/src/main/java/com/threerings/cast/FrameProvider.java
index f2181a91..5cee43fe 100644
--- a/src/main/java/com/threerings/cast/FrameProvider.java
+++ b/core/src/main/java/com/threerings/cast/FrameProvider.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/Log.java b/core/src/main/java/com/threerings/cast/Log.java
similarity index 99%
rename from src/main/java/com/threerings/cast/Log.java
rename to core/src/main/java/com/threerings/cast/Log.java
index b57aeb60..889990bb 100644
--- a/src/main/java/com/threerings/cast/Log.java
+++ b/core/src/main/java/com/threerings/cast/Log.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/NoSuchComponentException.java b/core/src/main/java/com/threerings/cast/NoSuchComponentException.java
similarity index 99%
rename from src/main/java/com/threerings/cast/NoSuchComponentException.java
rename to core/src/main/java/com/threerings/cast/NoSuchComponentException.java
index 98ed3c21..9949c1a7 100644
--- a/src/main/java/com/threerings/cast/NoSuchComponentException.java
+++ b/core/src/main/java/com/threerings/cast/NoSuchComponentException.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/StandardActions.java b/core/src/main/java/com/threerings/cast/StandardActions.java
similarity index 99%
rename from src/main/java/com/threerings/cast/StandardActions.java
rename to core/src/main/java/com/threerings/cast/StandardActions.java
index 3f4d8fb5..1928616a 100644
--- a/src/main/java/com/threerings/cast/StandardActions.java
+++ b/core/src/main/java/com/threerings/cast/StandardActions.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/cast/TrimmedMultiFrameImage.java b/core/src/main/java/com/threerings/cast/TrimmedMultiFrameImage.java
similarity index 99%
rename from src/main/java/com/threerings/cast/TrimmedMultiFrameImage.java
rename to core/src/main/java/com/threerings/cast/TrimmedMultiFrameImage.java
index 027c0032..9532f02c 100644
--- a/src/main/java/com/threerings/cast/TrimmedMultiFrameImage.java
+++ b/core/src/main/java/com/threerings/cast/TrimmedMultiFrameImage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/cast/builder/BuilderModel.java
rename to core/src/main/java/com/threerings/cast/builder/BuilderModel.java
index 2a64983c..878627b6 100644
--- a/src/main/java/com/threerings/cast/builder/BuilderModel.java
+++ b/core/src/main/java/com/threerings/cast/builder/BuilderModel.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/cast/builder/BuilderModelListener.java
rename to core/src/main/java/com/threerings/cast/builder/BuilderModelListener.java
index fc08329e..b51e05dc 100644
--- a/src/main/java/com/threerings/cast/builder/BuilderModelListener.java
+++ b/core/src/main/java/com/threerings/cast/builder/BuilderModelListener.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/cast/builder/BuilderPanel.java
rename to core/src/main/java/com/threerings/cast/builder/BuilderPanel.java
index b7d87577..3912eacf 100644
--- a/src/main/java/com/threerings/cast/builder/BuilderPanel.java
+++ b/core/src/main/java/com/threerings/cast/builder/BuilderPanel.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/cast/builder/ClassEditor.java
rename to core/src/main/java/com/threerings/cast/builder/ClassEditor.java
index e452b3da..353ef1e5 100644
--- a/src/main/java/com/threerings/cast/builder/ClassEditor.java
+++ b/core/src/main/java/com/threerings/cast/builder/ClassEditor.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/cast/builder/ComponentPanel.java
rename to core/src/main/java/com/threerings/cast/builder/ComponentPanel.java
index c9d7f3a3..12b8e122 100644
--- a/src/main/java/com/threerings/cast/builder/ComponentPanel.java
+++ b/core/src/main/java/com/threerings/cast/builder/ComponentPanel.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/cast/builder/SpritePanel.java
rename to core/src/main/java/com/threerings/cast/builder/SpritePanel.java
index 6beb888a..0ad93603 100644
--- a/src/main/java/com/threerings/cast/builder/SpritePanel.java
+++ b/core/src/main/java/com/threerings/cast/builder/SpritePanel.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/cast/bundle/BundleUtil.java
rename to core/src/main/java/com/threerings/cast/bundle/BundleUtil.java
index 3cdcd90f..3714b918 100644
--- a/src/main/java/com/threerings/cast/bundle/BundleUtil.java
+++ b/core/src/main/java/com/threerings/cast/bundle/BundleUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/cast/bundle/BundledComponentRepository.java
rename to core/src/main/java/com/threerings/cast/bundle/BundledComponentRepository.java
index 8d1f1a14..1e6b881b 100644
--- a/src/main/java/com/threerings/cast/bundle/BundledComponentRepository.java
+++ b/core/src/main/java/com/threerings/cast/bundle/BundledComponentRepository.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/cast/util/CastUtil.java
rename to core/src/main/java/com/threerings/cast/util/CastUtil.java
index 92f91da6..9f88abdf 100644
--- a/src/main/java/com/threerings/cast/util/CastUtil.java
+++ b/core/src/main/java/com/threerings/cast/util/CastUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/chat/ChatGlyph.java b/core/src/main/java/com/threerings/chat/ChatGlyph.java
similarity index 99%
rename from src/main/java/com/threerings/chat/ChatGlyph.java
rename to core/src/main/java/com/threerings/chat/ChatGlyph.java
index c9e9d1ab..49da60bf 100644
--- a/src/main/java/com/threerings/chat/ChatGlyph.java
+++ b/core/src/main/java/com/threerings/chat/ChatGlyph.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/chat/ChatLogic.java b/core/src/main/java/com/threerings/chat/ChatLogic.java
similarity index 99%
rename from src/main/java/com/threerings/chat/ChatLogic.java
rename to core/src/main/java/com/threerings/chat/ChatLogic.java
index 2b1e5541..c159a35f 100644
--- a/src/main/java/com/threerings/chat/ChatLogic.java
+++ b/core/src/main/java/com/threerings/chat/ChatLogic.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/chat/ChatOverlay.java b/core/src/main/java/com/threerings/chat/ChatOverlay.java
similarity index 99%
rename from src/main/java/com/threerings/chat/ChatOverlay.java
rename to core/src/main/java/com/threerings/chat/ChatOverlay.java
index 0c9c11f4..6702108d 100644
--- a/src/main/java/com/threerings/chat/ChatOverlay.java
+++ b/core/src/main/java/com/threerings/chat/ChatOverlay.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/chat/ComicChatOverlay.java b/core/src/main/java/com/threerings/chat/ComicChatOverlay.java
similarity index 99%
rename from src/main/java/com/threerings/chat/ComicChatOverlay.java
rename to core/src/main/java/com/threerings/chat/ComicChatOverlay.java
index f84297f1..8dbd0258 100644
--- a/src/main/java/com/threerings/chat/ComicChatOverlay.java
+++ b/core/src/main/java/com/threerings/chat/ComicChatOverlay.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/chat/SubtitleChatOverlay.java b/core/src/main/java/com/threerings/chat/SubtitleChatOverlay.java
similarity index 99%
rename from src/main/java/com/threerings/chat/SubtitleChatOverlay.java
rename to core/src/main/java/com/threerings/chat/SubtitleChatOverlay.java
index 70435edd..c29bd3ac 100644
--- a/src/main/java/com/threerings/chat/SubtitleChatOverlay.java
+++ b/core/src/main/java/com/threerings/chat/SubtitleChatOverlay.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/geom/GeomUtil.java b/core/src/main/java/com/threerings/geom/GeomUtil.java
similarity index 99%
rename from src/main/java/com/threerings/geom/GeomUtil.java
rename to core/src/main/java/com/threerings/geom/GeomUtil.java
index 12a76d1a..dceac8d4 100644
--- a/src/main/java/com/threerings/geom/GeomUtil.java
+++ b/core/src/main/java/com/threerings/geom/GeomUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/geom/Log.java b/core/src/main/java/com/threerings/geom/Log.java
similarity index 99%
rename from src/main/java/com/threerings/geom/Log.java
rename to core/src/main/java/com/threerings/geom/Log.java
index 1795db91..167666dc 100644
--- a/src/main/java/com/threerings/geom/Log.java
+++ b/core/src/main/java/com/threerings/geom/Log.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/AbstractMedia.java b/core/src/main/java/com/threerings/media/AbstractMedia.java
similarity index 99%
rename from src/main/java/com/threerings/media/AbstractMedia.java
rename to core/src/main/java/com/threerings/media/AbstractMedia.java
index 0d99477b..261a999f 100644
--- a/src/main/java/com/threerings/media/AbstractMedia.java
+++ b/core/src/main/java/com/threerings/media/AbstractMedia.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/AbstractMediaManager.java b/core/src/main/java/com/threerings/media/AbstractMediaManager.java
similarity index 99%
rename from src/main/java/com/threerings/media/AbstractMediaManager.java
rename to core/src/main/java/com/threerings/media/AbstractMediaManager.java
index 229a6713..3a0bf672 100644
--- a/src/main/java/com/threerings/media/AbstractMediaManager.java
+++ b/core/src/main/java/com/threerings/media/AbstractMediaManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/ActiveRepaintManager.java b/core/src/main/java/com/threerings/media/ActiveRepaintManager.java
similarity index 99%
rename from src/main/java/com/threerings/media/ActiveRepaintManager.java
rename to core/src/main/java/com/threerings/media/ActiveRepaintManager.java
index 68fe1ae1..96cdbf14 100644
--- a/src/main/java/com/threerings/media/ActiveRepaintManager.java
+++ b/core/src/main/java/com/threerings/media/ActiveRepaintManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/BackFrameManager.java b/core/src/main/java/com/threerings/media/BackFrameManager.java
similarity index 99%
rename from src/main/java/com/threerings/media/BackFrameManager.java
rename to core/src/main/java/com/threerings/media/BackFrameManager.java
index 612d9c38..8e5c9459 100644
--- a/src/main/java/com/threerings/media/BackFrameManager.java
+++ b/core/src/main/java/com/threerings/media/BackFrameManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/FlipFrameManager.java b/core/src/main/java/com/threerings/media/FlipFrameManager.java
similarity index 99%
rename from src/main/java/com/threerings/media/FlipFrameManager.java
rename to core/src/main/java/com/threerings/media/FlipFrameManager.java
index 02d74d2d..eaabcb0f 100644
--- a/src/main/java/com/threerings/media/FlipFrameManager.java
+++ b/core/src/main/java/com/threerings/media/FlipFrameManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/FrameInterval.java b/core/src/main/java/com/threerings/media/FrameInterval.java
similarity index 99%
rename from src/main/java/com/threerings/media/FrameInterval.java
rename to core/src/main/java/com/threerings/media/FrameInterval.java
index 3c84cd52..03f4a4e2 100644
--- a/src/main/java/com/threerings/media/FrameInterval.java
+++ b/core/src/main/java/com/threerings/media/FrameInterval.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/FrameManager.java b/core/src/main/java/com/threerings/media/FrameManager.java
similarity index 99%
rename from src/main/java/com/threerings/media/FrameManager.java
rename to core/src/main/java/com/threerings/media/FrameManager.java
index 747e09c6..3fa79509 100644
--- a/src/main/java/com/threerings/media/FrameManager.java
+++ b/core/src/main/java/com/threerings/media/FrameManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/FrameParticipant.java b/core/src/main/java/com/threerings/media/FrameParticipant.java
similarity index 99%
rename from src/main/java/com/threerings/media/FrameParticipant.java
rename to core/src/main/java/com/threerings/media/FrameParticipant.java
index 894521e4..d675ff1c 100644
--- a/src/main/java/com/threerings/media/FrameParticipant.java
+++ b/core/src/main/java/com/threerings/media/FrameParticipant.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/HourglassView.java b/core/src/main/java/com/threerings/media/HourglassView.java
similarity index 99%
rename from src/main/java/com/threerings/media/HourglassView.java
rename to core/src/main/java/com/threerings/media/HourglassView.java
index a5df207e..58a8ee9c 100644
--- a/src/main/java/com/threerings/media/HourglassView.java
+++ b/core/src/main/java/com/threerings/media/HourglassView.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/IconManager.java b/core/src/main/java/com/threerings/media/IconManager.java
similarity index 99%
rename from src/main/java/com/threerings/media/IconManager.java
rename to core/src/main/java/com/threerings/media/IconManager.java
index 6ee450a4..b9b575f9 100644
--- a/src/main/java/com/threerings/media/IconManager.java
+++ b/core/src/main/java/com/threerings/media/IconManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/Log.java b/core/src/main/java/com/threerings/media/Log.java
similarity index 99%
rename from src/main/java/com/threerings/media/Log.java
rename to core/src/main/java/com/threerings/media/Log.java
index 6e39f63a..4abb3960 100644
--- a/src/main/java/com/threerings/media/Log.java
+++ b/core/src/main/java/com/threerings/media/Log.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/ManagedJApplet.java b/core/src/main/java/com/threerings/media/ManagedJApplet.java
similarity index 99%
rename from src/main/java/com/threerings/media/ManagedJApplet.java
rename to core/src/main/java/com/threerings/media/ManagedJApplet.java
index d2622796..5db5d45b 100644
--- a/src/main/java/com/threerings/media/ManagedJApplet.java
+++ b/core/src/main/java/com/threerings/media/ManagedJApplet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/ManagedJFrame.java b/core/src/main/java/com/threerings/media/ManagedJFrame.java
similarity index 99%
rename from src/main/java/com/threerings/media/ManagedJFrame.java
rename to core/src/main/java/com/threerings/media/ManagedJFrame.java
index ce04e65e..2d48f30e 100644
--- a/src/main/java/com/threerings/media/ManagedJFrame.java
+++ b/core/src/main/java/com/threerings/media/ManagedJFrame.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/MediaConstants.java b/core/src/main/java/com/threerings/media/MediaConstants.java
similarity index 99%
rename from src/main/java/com/threerings/media/MediaConstants.java
rename to core/src/main/java/com/threerings/media/MediaConstants.java
index 3a5b5fe1..c958f17b 100644
--- a/src/main/java/com/threerings/media/MediaConstants.java
+++ b/core/src/main/java/com/threerings/media/MediaConstants.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/MediaHost.java b/core/src/main/java/com/threerings/media/MediaHost.java
similarity index 99%
rename from src/main/java/com/threerings/media/MediaHost.java
rename to core/src/main/java/com/threerings/media/MediaHost.java
index 90851483..05bb1b2d 100644
--- a/src/main/java/com/threerings/media/MediaHost.java
+++ b/core/src/main/java/com/threerings/media/MediaHost.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/MediaOverlay.java b/core/src/main/java/com/threerings/media/MediaOverlay.java
similarity index 99%
rename from src/main/java/com/threerings/media/MediaOverlay.java
rename to core/src/main/java/com/threerings/media/MediaOverlay.java
index aa60ed9b..665344af 100644
--- a/src/main/java/com/threerings/media/MediaOverlay.java
+++ b/core/src/main/java/com/threerings/media/MediaOverlay.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/MediaPanel.java b/core/src/main/java/com/threerings/media/MediaPanel.java
similarity index 99%
rename from src/main/java/com/threerings/media/MediaPanel.java
rename to core/src/main/java/com/threerings/media/MediaPanel.java
index e58c7d42..7f180815 100644
--- a/src/main/java/com/threerings/media/MediaPanel.java
+++ b/core/src/main/java/com/threerings/media/MediaPanel.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/MediaPrefs.java b/core/src/main/java/com/threerings/media/MediaPrefs.java
similarity index 99%
rename from src/main/java/com/threerings/media/MediaPrefs.java
rename to core/src/main/java/com/threerings/media/MediaPrefs.java
index 8b95db67..7377c7bd 100644
--- a/src/main/java/com/threerings/media/MediaPrefs.java
+++ b/core/src/main/java/com/threerings/media/MediaPrefs.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/MetaMediaManager.java b/core/src/main/java/com/threerings/media/MetaMediaManager.java
similarity index 99%
rename from src/main/java/com/threerings/media/MetaMediaManager.java
rename to core/src/main/java/com/threerings/media/MetaMediaManager.java
index 98abd911..e5429e7d 100644
--- a/src/main/java/com/threerings/media/MetaMediaManager.java
+++ b/core/src/main/java/com/threerings/media/MetaMediaManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/RegionManager.java b/core/src/main/java/com/threerings/media/RegionManager.java
similarity index 99%
rename from src/main/java/com/threerings/media/RegionManager.java
rename to core/src/main/java/com/threerings/media/RegionManager.java
index cc866bda..e72380f0 100644
--- a/src/main/java/com/threerings/media/RegionManager.java
+++ b/core/src/main/java/com/threerings/media/RegionManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/SafeScrollPane.java b/core/src/main/java/com/threerings/media/SafeScrollPane.java
similarity index 99%
rename from src/main/java/com/threerings/media/SafeScrollPane.java
rename to core/src/main/java/com/threerings/media/SafeScrollPane.java
index c2c81cba..c90065ff 100644
--- a/src/main/java/com/threerings/media/SafeScrollPane.java
+++ b/core/src/main/java/com/threerings/media/SafeScrollPane.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/TimerView.java b/core/src/main/java/com/threerings/media/TimerView.java
similarity index 99%
rename from src/main/java/com/threerings/media/TimerView.java
rename to core/src/main/java/com/threerings/media/TimerView.java
index 7851c314..76776cd6 100644
--- a/src/main/java/com/threerings/media/TimerView.java
+++ b/core/src/main/java/com/threerings/media/TimerView.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/ViewTracker.java b/core/src/main/java/com/threerings/media/ViewTracker.java
similarity index 99%
rename from src/main/java/com/threerings/media/ViewTracker.java
rename to core/src/main/java/com/threerings/media/ViewTracker.java
index 030a33a8..812c6224 100644
--- a/src/main/java/com/threerings/media/ViewTracker.java
+++ b/core/src/main/java/com/threerings/media/ViewTracker.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/VirtualMediaPanel.java b/core/src/main/java/com/threerings/media/VirtualMediaPanel.java
similarity index 99%
rename from src/main/java/com/threerings/media/VirtualMediaPanel.java
rename to core/src/main/java/com/threerings/media/VirtualMediaPanel.java
index a07310f8..289e5924 100644
--- a/src/main/java/com/threerings/media/VirtualMediaPanel.java
+++ b/core/src/main/java/com/threerings/media/VirtualMediaPanel.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/media/VirtualRangeModel.java b/core/src/main/java/com/threerings/media/VirtualRangeModel.java
similarity index 99%
rename from src/main/java/com/threerings/media/VirtualRangeModel.java
rename to core/src/main/java/com/threerings/media/VirtualRangeModel.java
index 9c10a43a..02cfc034 100644
--- a/src/main/java/com/threerings/media/VirtualRangeModel.java
+++ b/core/src/main/java/com/threerings/media/VirtualRangeModel.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/Animation.java
rename to core/src/main/java/com/threerings/media/animation/Animation.java
index 3e0089cd..17d6eed9 100644
--- a/src/main/java/com/threerings/media/animation/Animation.java
+++ b/core/src/main/java/com/threerings/media/animation/Animation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/AnimationAdapter.java
rename to core/src/main/java/com/threerings/media/animation/AnimationAdapter.java
index 82af1a7b..23b1a762 100644
--- a/src/main/java/com/threerings/media/animation/AnimationAdapter.java
+++ b/core/src/main/java/com/threerings/media/animation/AnimationAdapter.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/AnimationArranger.java
rename to core/src/main/java/com/threerings/media/animation/AnimationArranger.java
index aba52d0f..127e5fd0 100644
--- a/src/main/java/com/threerings/media/animation/AnimationArranger.java
+++ b/core/src/main/java/com/threerings/media/animation/AnimationArranger.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/AnimationFrameSequencer.java
rename to core/src/main/java/com/threerings/media/animation/AnimationFrameSequencer.java
index 873e31e8..faa2af6c 100644
--- a/src/main/java/com/threerings/media/animation/AnimationFrameSequencer.java
+++ b/core/src/main/java/com/threerings/media/animation/AnimationFrameSequencer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/AnimationManager.java
rename to core/src/main/java/com/threerings/media/animation/AnimationManager.java
index d1433ceb..ea57d19b 100644
--- a/src/main/java/com/threerings/media/animation/AnimationManager.java
+++ b/core/src/main/java/com/threerings/media/animation/AnimationManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/AnimationObserver.java
rename to core/src/main/java/com/threerings/media/animation/AnimationObserver.java
index 2e58c071..e2bcdfe2 100644
--- a/src/main/java/com/threerings/media/animation/AnimationObserver.java
+++ b/core/src/main/java/com/threerings/media/animation/AnimationObserver.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/AnimationSequencer.java
rename to core/src/main/java/com/threerings/media/animation/AnimationSequencer.java
index a26ba233..bd69dfa3 100644
--- a/src/main/java/com/threerings/media/animation/AnimationSequencer.java
+++ b/core/src/main/java/com/threerings/media/animation/AnimationSequencer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/AnimationSprite.java
rename to core/src/main/java/com/threerings/media/animation/AnimationSprite.java
index aef5f0b0..ec688d54 100644
--- a/src/main/java/com/threerings/media/animation/AnimationSprite.java
+++ b/core/src/main/java/com/threerings/media/animation/AnimationSprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/AnimationWaiter.java
rename to core/src/main/java/com/threerings/media/animation/AnimationWaiter.java
index 4ddbbb57..a85757a1 100644
--- a/src/main/java/com/threerings/media/animation/AnimationWaiter.java
+++ b/core/src/main/java/com/threerings/media/animation/AnimationWaiter.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/BlankAnimation.java
rename to core/src/main/java/com/threerings/media/animation/BlankAnimation.java
index db263fbe..ddad0da1 100644
--- a/src/main/java/com/threerings/media/animation/BlankAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/BlankAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/BlendAnimation.java
rename to core/src/main/java/com/threerings/media/animation/BlendAnimation.java
index 0470c0bd..1cfa6e3b 100644
--- a/src/main/java/com/threerings/media/animation/BlendAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/BlendAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/BobbleAnimation.java
rename to core/src/main/java/com/threerings/media/animation/BobbleAnimation.java
index 848cb75f..14d562c2 100644
--- a/src/main/java/com/threerings/media/animation/BobbleAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/BobbleAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/ExplodeAnimation.java
rename to core/src/main/java/com/threerings/media/animation/ExplodeAnimation.java
index e2c3cb9f..842aeffa 100644
--- a/src/main/java/com/threerings/media/animation/ExplodeAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/ExplodeAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/FadeAnimation.java
rename to core/src/main/java/com/threerings/media/animation/FadeAnimation.java
index ba4ef973..9f7084db 100644
--- a/src/main/java/com/threerings/media/animation/FadeAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/FadeAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/FadeImageAnimation.java
rename to core/src/main/java/com/threerings/media/animation/FadeImageAnimation.java
index 00a6bd93..61713208 100644
--- a/src/main/java/com/threerings/media/animation/FadeImageAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/FadeImageAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/FadeLabelAnimation.java
rename to core/src/main/java/com/threerings/media/animation/FadeLabelAnimation.java
index 1ba410a8..bbdd8b10 100644
--- a/src/main/java/com/threerings/media/animation/FadeLabelAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/FadeLabelAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/FloatingTextAnimation.java
rename to core/src/main/java/com/threerings/media/animation/FloatingTextAnimation.java
index 438ab9cf..345cd6f3 100644
--- a/src/main/java/com/threerings/media/animation/FloatingTextAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/FloatingTextAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/GleamAnimation.java
rename to core/src/main/java/com/threerings/media/animation/GleamAnimation.java
index 83a2f264..3950f5d3 100644
--- a/src/main/java/com/threerings/media/animation/GleamAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/GleamAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/MultiFrameAnimation.java
rename to core/src/main/java/com/threerings/media/animation/MultiFrameAnimation.java
index 21e47bf0..f2210f9a 100644
--- a/src/main/java/com/threerings/media/animation/MultiFrameAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/MultiFrameAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/RainAnimation.java
rename to core/src/main/java/com/threerings/media/animation/RainAnimation.java
index 04903315..9b717199 100644
--- a/src/main/java/com/threerings/media/animation/RainAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/RainAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/ScaleAnimation.java
rename to core/src/main/java/com/threerings/media/animation/ScaleAnimation.java
index 8811c1db..ab898233 100644
--- a/src/main/java/com/threerings/media/animation/ScaleAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/ScaleAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/SequencedAnimationObserver.java
rename to core/src/main/java/com/threerings/media/animation/SequencedAnimationObserver.java
index e1e5829a..973a8903 100644
--- a/src/main/java/com/threerings/media/animation/SequencedAnimationObserver.java
+++ b/core/src/main/java/com/threerings/media/animation/SequencedAnimationObserver.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/SparkAnimation.java
rename to core/src/main/java/com/threerings/media/animation/SparkAnimation.java
index 6d4c2593..88e4d94b 100644
--- a/src/main/java/com/threerings/media/animation/SparkAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/SparkAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/SpriteAnimation.java
rename to core/src/main/java/com/threerings/media/animation/SpriteAnimation.java
index 1b17b79c..c83622e0 100644
--- a/src/main/java/com/threerings/media/animation/SpriteAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/SpriteAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/animation/SpritePathAnimation.java
rename to core/src/main/java/com/threerings/media/animation/SpritePathAnimation.java
index 9d3526fa..ec482abf 100644
--- a/src/main/java/com/threerings/media/animation/SpritePathAnimation.java
+++ b/core/src/main/java/com/threerings/media/animation/SpritePathAnimation.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/effects/FadeEffect.java
rename to core/src/main/java/com/threerings/media/effects/FadeEffect.java
index 8f2b1466..10443f60 100644
--- a/src/main/java/com/threerings/media/effects/FadeEffect.java
+++ b/core/src/main/java/com/threerings/media/effects/FadeEffect.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/AWTImageCreator.java
rename to core/src/main/java/com/threerings/media/image/AWTImageCreator.java
index 621db1d2..2191de08 100644
--- a/src/main/java/com/threerings/media/image/AWTImageCreator.java
+++ b/core/src/main/java/com/threerings/media/image/AWTImageCreator.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/BackedVolatileMirage.java
rename to core/src/main/java/com/threerings/media/image/BackedVolatileMirage.java
index 849bfc8b..82593218 100644
--- a/src/main/java/com/threerings/media/image/BackedVolatileMirage.java
+++ b/core/src/main/java/com/threerings/media/image/BackedVolatileMirage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/BlankMirage.java
rename to core/src/main/java/com/threerings/media/image/BlankMirage.java
index bc14be5f..9e4041de 100644
--- a/src/main/java/com/threerings/media/image/BlankMirage.java
+++ b/core/src/main/java/com/threerings/media/image/BlankMirage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/BufferedMirage.java
rename to core/src/main/java/com/threerings/media/image/BufferedMirage.java
index 9b627434..293626a7 100644
--- a/src/main/java/com/threerings/media/image/BufferedMirage.java
+++ b/core/src/main/java/com/threerings/media/image/BufferedMirage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/CachedVolatileMirage.java
rename to core/src/main/java/com/threerings/media/image/CachedVolatileMirage.java
index 635b5896..6b040d60 100644
--- a/src/main/java/com/threerings/media/image/CachedVolatileMirage.java
+++ b/core/src/main/java/com/threerings/media/image/CachedVolatileMirage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/ClientImageManager.java
rename to core/src/main/java/com/threerings/media/image/ClientImageManager.java
index 6164d806..1bfa8310 100644
--- a/src/main/java/com/threerings/media/image/ClientImageManager.java
+++ b/core/src/main/java/com/threerings/media/image/ClientImageManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/ColorPository.java
rename to core/src/main/java/com/threerings/media/image/ColorPository.java
index 7609ebf4..59a12723 100644
--- a/src/main/java/com/threerings/media/image/ColorPository.java
+++ b/core/src/main/java/com/threerings/media/image/ColorPository.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/ColorUtil.java
rename to core/src/main/java/com/threerings/media/image/ColorUtil.java
index 0a5a623d..0891c14a 100644
--- a/src/main/java/com/threerings/media/image/ColorUtil.java
+++ b/core/src/main/java/com/threerings/media/image/ColorUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/Colorization.java
rename to core/src/main/java/com/threerings/media/image/Colorization.java
index 7c7297b6..0c02b2d5 100644
--- a/src/main/java/com/threerings/media/image/Colorization.java
+++ b/core/src/main/java/com/threerings/media/image/Colorization.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/CompositeMirage.java
rename to core/src/main/java/com/threerings/media/image/CompositeMirage.java
index cc9255d1..f8d55e21 100644
--- a/src/main/java/com/threerings/media/image/CompositeMirage.java
+++ b/core/src/main/java/com/threerings/media/image/CompositeMirage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/ImageDataProvider.java
rename to core/src/main/java/com/threerings/media/image/ImageDataProvider.java
index 0a34692a..f975709e 100644
--- a/src/main/java/com/threerings/media/image/ImageDataProvider.java
+++ b/core/src/main/java/com/threerings/media/image/ImageDataProvider.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/ImageManager.java
rename to core/src/main/java/com/threerings/media/image/ImageManager.java
index 83943798..011c045f 100644
--- a/src/main/java/com/threerings/media/image/ImageManager.java
+++ b/core/src/main/java/com/threerings/media/image/ImageManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/ImageUtil.java
rename to core/src/main/java/com/threerings/media/image/ImageUtil.java
index 1f872afc..781bc965 100644
--- a/src/main/java/com/threerings/media/image/ImageUtil.java
+++ b/core/src/main/java/com/threerings/media/image/ImageUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/Mirage.java
rename to core/src/main/java/com/threerings/media/image/Mirage.java
index 1847cd16..87ffcf12 100644
--- a/src/main/java/com/threerings/media/image/Mirage.java
+++ b/core/src/main/java/com/threerings/media/image/Mirage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/MirageIcon.java
rename to core/src/main/java/com/threerings/media/image/MirageIcon.java
index 4f726ed8..7222ac15 100644
--- a/src/main/java/com/threerings/media/image/MirageIcon.java
+++ b/core/src/main/java/com/threerings/media/image/MirageIcon.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/NinePatch.java
rename to core/src/main/java/com/threerings/media/image/NinePatch.java
index 6350906d..16f919ca 100644
--- a/src/main/java/com/threerings/media/image/NinePatch.java
+++ b/core/src/main/java/com/threerings/media/image/NinePatch.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/NinePatchMirage.java
rename to core/src/main/java/com/threerings/media/image/NinePatchMirage.java
index 529fb9ff..a650257b 100644
--- a/src/main/java/com/threerings/media/image/NinePatchMirage.java
+++ b/core/src/main/java/com/threerings/media/image/NinePatchMirage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/Quantize.java
rename to core/src/main/java/com/threerings/media/image/Quantize.java
index 2103bec6..575260a7 100644
--- a/src/main/java/com/threerings/media/image/Quantize.java
+++ b/core/src/main/java/com/threerings/media/image/Quantize.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/SolidMirage.java
rename to core/src/main/java/com/threerings/media/image/SolidMirage.java
index 5eb33b9b..013074a4 100644
--- a/src/main/java/com/threerings/media/image/SolidMirage.java
+++ b/core/src/main/java/com/threerings/media/image/SolidMirage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/TransformedMirage.java
rename to core/src/main/java/com/threerings/media/image/TransformedMirage.java
index 20a2f1f3..7d3cd432 100644
--- a/src/main/java/com/threerings/media/image/TransformedMirage.java
+++ b/core/src/main/java/com/threerings/media/image/TransformedMirage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/image/VolatileMirage.java
rename to core/src/main/java/com/threerings/media/image/VolatileMirage.java
index cb1a680b..2e66f90f 100644
--- a/src/main/java/com/threerings/media/image/VolatileMirage.java
+++ b/core/src/main/java/com/threerings/media/image/VolatileMirage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sound/JavaSoundPlayer.java
rename to core/src/main/java/com/threerings/media/sound/JavaSoundPlayer.java
index 4fce9a15..39497052 100644
--- a/src/main/java/com/threerings/media/sound/JavaSoundPlayer.java
+++ b/core/src/main/java/com/threerings/media/sound/JavaSoundPlayer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sound/SoundCodes.java
rename to core/src/main/java/com/threerings/media/sound/SoundCodes.java
index 7e33220d..ed20dab3 100644
--- a/src/main/java/com/threerings/media/sound/SoundCodes.java
+++ b/core/src/main/java/com/threerings/media/sound/SoundCodes.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sound/SoundEnabledObserver.java
rename to core/src/main/java/com/threerings/media/sound/SoundEnabledObserver.java
index 44544544..7c3d03e3 100644
--- a/src/main/java/com/threerings/media/sound/SoundEnabledObserver.java
+++ b/core/src/main/java/com/threerings/media/sound/SoundEnabledObserver.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sound/SoundLoader.java
rename to core/src/main/java/com/threerings/media/sound/SoundLoader.java
index 2900ebdf..5e8df76c 100644
--- a/src/main/java/com/threerings/media/sound/SoundLoader.java
+++ b/core/src/main/java/com/threerings/media/sound/SoundLoader.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sound/SoundManager.java
rename to core/src/main/java/com/threerings/media/sound/SoundManager.java
index ea453211..837a55b9 100644
--- a/src/main/java/com/threerings/media/sound/SoundManager.java
+++ b/core/src/main/java/com/threerings/media/sound/SoundManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sound/SoundPlayer.java
rename to core/src/main/java/com/threerings/media/sound/SoundPlayer.java
index a11b2746..e6f340c9 100644
--- a/src/main/java/com/threerings/media/sound/SoundPlayer.java
+++ b/core/src/main/java/com/threerings/media/sound/SoundPlayer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sound/Sounds.java
rename to core/src/main/java/com/threerings/media/sound/Sounds.java
index 49b039c8..16fa9f43 100644
--- a/src/main/java/com/threerings/media/sound/Sounds.java
+++ b/core/src/main/java/com/threerings/media/sound/Sounds.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sprite/ButtonSprite.java
rename to core/src/main/java/com/threerings/media/sprite/ButtonSprite.java
index 842d6d50..cfdc72d1 100644
--- a/src/main/java/com/threerings/media/sprite/ButtonSprite.java
+++ b/core/src/main/java/com/threerings/media/sprite/ButtonSprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sprite/FadableImageSprite.java
rename to core/src/main/java/com/threerings/media/sprite/FadableImageSprite.java
index da173143..122332c2 100644
--- a/src/main/java/com/threerings/media/sprite/FadableImageSprite.java
+++ b/core/src/main/java/com/threerings/media/sprite/FadableImageSprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sprite/ImageSprite.java
rename to core/src/main/java/com/threerings/media/sprite/ImageSprite.java
index 1f9c94b6..6e68741d 100644
--- a/src/main/java/com/threerings/media/sprite/ImageSprite.java
+++ b/core/src/main/java/com/threerings/media/sprite/ImageSprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sprite/LabelSprite.java
rename to core/src/main/java/com/threerings/media/sprite/LabelSprite.java
index 448b0346..4b76d32a 100644
--- a/src/main/java/com/threerings/media/sprite/LabelSprite.java
+++ b/core/src/main/java/com/threerings/media/sprite/LabelSprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sprite/OrientableImageSprite.java
rename to core/src/main/java/com/threerings/media/sprite/OrientableImageSprite.java
index ae940c38..7f64c4af 100644
--- a/src/main/java/com/threerings/media/sprite/OrientableImageSprite.java
+++ b/core/src/main/java/com/threerings/media/sprite/OrientableImageSprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sprite/PathAdapter.java
rename to core/src/main/java/com/threerings/media/sprite/PathAdapter.java
index 452f5084..1174538f 100644
--- a/src/main/java/com/threerings/media/sprite/PathAdapter.java
+++ b/core/src/main/java/com/threerings/media/sprite/PathAdapter.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sprite/PathObserver.java
rename to core/src/main/java/com/threerings/media/sprite/PathObserver.java
index abddace3..4b116ff5 100644
--- a/src/main/java/com/threerings/media/sprite/PathObserver.java
+++ b/core/src/main/java/com/threerings/media/sprite/PathObserver.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sprite/Sprite.java
rename to core/src/main/java/com/threerings/media/sprite/Sprite.java
index 550289e1..a04dfd96 100644
--- a/src/main/java/com/threerings/media/sprite/Sprite.java
+++ b/core/src/main/java/com/threerings/media/sprite/Sprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sprite/SpriteIcon.java
rename to core/src/main/java/com/threerings/media/sprite/SpriteIcon.java
index c41d72e8..5aa1c474 100644
--- a/src/main/java/com/threerings/media/sprite/SpriteIcon.java
+++ b/core/src/main/java/com/threerings/media/sprite/SpriteIcon.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/sprite/SpriteManager.java
rename to core/src/main/java/com/threerings/media/sprite/SpriteManager.java
index 8bdf32a1..735d314c 100644
--- a/src/main/java/com/threerings/media/sprite/SpriteManager.java
+++ b/core/src/main/java/com/threerings/media/sprite/SpriteManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index a065ddde..5e517132 100644
--- a/src/main/java/com/threerings/media/sprite/action/ActionSprite.java
+++ b/core/src/main/java/com/threerings/media/sprite/action/ActionSprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 1bddb6d8..91e4a649 100644
--- a/src/main/java/com/threerings/media/sprite/action/ArmingSprite.java
+++ b/core/src/main/java/com/threerings/media/sprite/action/ArmingSprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 78f441b9..71d26059 100644
--- a/src/main/java/com/threerings/media/sprite/action/CommandSprite.java
+++ b/core/src/main/java/com/threerings/media/sprite/action/CommandSprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index b552380e..fb495378 100644
--- a/src/main/java/com/threerings/media/sprite/action/DisableableSprite.java
+++ b/core/src/main/java/com/threerings/media/sprite/action/DisableableSprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 9dcc4822..f5988ba5 100644
--- a/src/main/java/com/threerings/media/sprite/action/HoverSprite.java
+++ b/core/src/main/java/com/threerings/media/sprite/action/HoverSprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/BaseSizableTileSet.java
rename to core/src/main/java/com/threerings/media/tile/BaseSizableTileSet.java
index 7b7ed61e..663388b9 100644
--- a/src/main/java/com/threerings/media/tile/BaseSizableTileSet.java
+++ b/core/src/main/java/com/threerings/media/tile/BaseSizableTileSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/IMImageProvider.java
rename to core/src/main/java/com/threerings/media/tile/IMImageProvider.java
index 9d602f1f..265d2986 100644
--- a/src/main/java/com/threerings/media/tile/IMImageProvider.java
+++ b/core/src/main/java/com/threerings/media/tile/IMImageProvider.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/ImageProvider.java
rename to core/src/main/java/com/threerings/media/tile/ImageProvider.java
index e219d612..4fbcbd2a 100644
--- a/src/main/java/com/threerings/media/tile/ImageProvider.java
+++ b/core/src/main/java/com/threerings/media/tile/ImageProvider.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/NoSuchTileSetException.java
rename to core/src/main/java/com/threerings/media/tile/NoSuchTileSetException.java
index d3ae7706..0d81c963 100644
--- a/src/main/java/com/threerings/media/tile/NoSuchTileSetException.java
+++ b/core/src/main/java/com/threerings/media/tile/NoSuchTileSetException.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/ObjectTile.java
rename to core/src/main/java/com/threerings/media/tile/ObjectTile.java
index 065943be..bfb4238e 100644
--- a/src/main/java/com/threerings/media/tile/ObjectTile.java
+++ b/core/src/main/java/com/threerings/media/tile/ObjectTile.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/ObjectTileSet.java
rename to core/src/main/java/com/threerings/media/tile/ObjectTileSet.java
index ae5fba86..ed8c120e 100644
--- a/src/main/java/com/threerings/media/tile/ObjectTileSet.java
+++ b/core/src/main/java/com/threerings/media/tile/ObjectTileSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/RecolorableTileSet.java
rename to core/src/main/java/com/threerings/media/tile/RecolorableTileSet.java
index c2fd9fac..a7ae96e3 100644
--- a/src/main/java/com/threerings/media/tile/RecolorableTileSet.java
+++ b/core/src/main/java/com/threerings/media/tile/RecolorableTileSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/SimpleCachingImageProvider.java
rename to core/src/main/java/com/threerings/media/tile/SimpleCachingImageProvider.java
index 888645c3..7ef4d6df 100644
--- a/src/main/java/com/threerings/media/tile/SimpleCachingImageProvider.java
+++ b/core/src/main/java/com/threerings/media/tile/SimpleCachingImageProvider.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/SwissArmyTileSet.java
rename to core/src/main/java/com/threerings/media/tile/SwissArmyTileSet.java
index 3dc10aaa..a341e36d 100644
--- a/src/main/java/com/threerings/media/tile/SwissArmyTileSet.java
+++ b/core/src/main/java/com/threerings/media/tile/SwissArmyTileSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/Tile.java
rename to core/src/main/java/com/threerings/media/tile/Tile.java
index 8cf6efd8..88e50d65 100644
--- a/src/main/java/com/threerings/media/tile/Tile.java
+++ b/core/src/main/java/com/threerings/media/tile/Tile.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/TileIcon.java
rename to core/src/main/java/com/threerings/media/tile/TileIcon.java
index f92aa1db..f51d88e3 100644
--- a/src/main/java/com/threerings/media/tile/TileIcon.java
+++ b/core/src/main/java/com/threerings/media/tile/TileIcon.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/TileManager.java
rename to core/src/main/java/com/threerings/media/tile/TileManager.java
index 37e18dcb..957d5d66 100644
--- a/src/main/java/com/threerings/media/tile/TileManager.java
+++ b/core/src/main/java/com/threerings/media/tile/TileManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/TileMultiFrameImage.java
rename to core/src/main/java/com/threerings/media/tile/TileMultiFrameImage.java
index 9293c3c7..62f57168 100644
--- a/src/main/java/com/threerings/media/tile/TileMultiFrameImage.java
+++ b/core/src/main/java/com/threerings/media/tile/TileMultiFrameImage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/TileSet.java
rename to core/src/main/java/com/threerings/media/tile/TileSet.java
index 00494efd..8cea1abd 100644
--- a/src/main/java/com/threerings/media/tile/TileSet.java
+++ b/core/src/main/java/com/threerings/media/tile/TileSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/TileSetIDBroker.java
rename to core/src/main/java/com/threerings/media/tile/TileSetIDBroker.java
index 26f10a2a..a81f66b9 100644
--- a/src/main/java/com/threerings/media/tile/TileSetIDBroker.java
+++ b/core/src/main/java/com/threerings/media/tile/TileSetIDBroker.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/TileSetRepository.java
rename to core/src/main/java/com/threerings/media/tile/TileSetRepository.java
index e4a10bdf..2d1b3260 100644
--- a/src/main/java/com/threerings/media/tile/TileSetRepository.java
+++ b/core/src/main/java/com/threerings/media/tile/TileSetRepository.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/TileSubsetMultiFrameImage.java
rename to core/src/main/java/com/threerings/media/tile/TileSubsetMultiFrameImage.java
index be40fa15..09c4ca8c 100644
--- a/src/main/java/com/threerings/media/tile/TileSubsetMultiFrameImage.java
+++ b/core/src/main/java/com/threerings/media/tile/TileSubsetMultiFrameImage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/TileUtil.java
rename to core/src/main/java/com/threerings/media/tile/TileUtil.java
index 9caf2660..596bb5d0 100644
--- a/src/main/java/com/threerings/media/tile/TileUtil.java
+++ b/core/src/main/java/com/threerings/media/tile/TileUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/TrimmedObjectTileSet.java
rename to core/src/main/java/com/threerings/media/tile/TrimmedObjectTileSet.java
index d12311b7..2bd486b2 100644
--- a/src/main/java/com/threerings/media/tile/TrimmedObjectTileSet.java
+++ b/core/src/main/java/com/threerings/media/tile/TrimmedObjectTileSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/TrimmedTile.java
rename to core/src/main/java/com/threerings/media/tile/TrimmedTile.java
index b694c415..10908148 100644
--- a/src/main/java/com/threerings/media/tile/TrimmedTile.java
+++ b/core/src/main/java/com/threerings/media/tile/TrimmedTile.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/TrimmedTileSet.java
rename to core/src/main/java/com/threerings/media/tile/TrimmedTileSet.java
index 90a64fc6..63410250 100644
--- a/src/main/java/com/threerings/media/tile/TrimmedTileSet.java
+++ b/core/src/main/java/com/threerings/media/tile/TrimmedTileSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tile/UniformTileSet.java
rename to core/src/main/java/com/threerings/media/tile/UniformTileSet.java
index f20c6dcd..ba558d1c 100644
--- a/src/main/java/com/threerings/media/tile/UniformTileSet.java
+++ b/core/src/main/java/com/threerings/media/tile/UniformTileSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 597a9c6e..620d161e 100644
--- a/src/main/java/com/threerings/media/tile/bundle/BundleUtil.java
+++ b/core/src/main/java/com/threerings/media/tile/bundle/BundleUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 0935dbd8..bf526541 100644
--- a/src/main/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java
+++ b/core/src/main/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 9429d3a2..30430121 100644
--- a/src/main/java/com/threerings/media/tile/bundle/TileSetBundle.java
+++ b/core/src/main/java/com/threerings/media/tile/bundle/TileSetBundle.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index ed18f96f..4687b63d 100644
--- a/src/main/java/com/threerings/media/tile/util/TileSetTrimmer.java
+++ b/core/src/main/java/com/threerings/media/tile/util/TileSetTrimmer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/timer/CalibratingTimer.java
rename to core/src/main/java/com/threerings/media/timer/CalibratingTimer.java
index 195c9a41..7a7b1a2c 100644
--- a/src/main/java/com/threerings/media/timer/CalibratingTimer.java
+++ b/core/src/main/java/com/threerings/media/timer/CalibratingTimer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/timer/MediaTimer.java
rename to core/src/main/java/com/threerings/media/timer/MediaTimer.java
index 36df3203..95c03f5b 100644
--- a/src/main/java/com/threerings/media/timer/MediaTimer.java
+++ b/core/src/main/java/com/threerings/media/timer/MediaTimer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/timer/MillisTimer.java
rename to core/src/main/java/com/threerings/media/timer/MillisTimer.java
index 470a77bf..5697a2e6 100644
--- a/src/main/java/com/threerings/media/timer/MillisTimer.java
+++ b/core/src/main/java/com/threerings/media/timer/MillisTimer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/timer/NanoTimer.java
rename to core/src/main/java/com/threerings/media/timer/NanoTimer.java
index a1c2cffc..69899499 100644
--- a/src/main/java/com/threerings/media/timer/NanoTimer.java
+++ b/core/src/main/java/com/threerings/media/timer/NanoTimer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/timer/PerfTimer.java
rename to core/src/main/java/com/threerings/media/timer/PerfTimer.java
index 571a7b22..11835789 100644
--- a/src/main/java/com/threerings/media/timer/PerfTimer.java
+++ b/core/src/main/java/com/threerings/media/timer/PerfTimer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/AStarPathUtil.java
rename to core/src/main/java/com/threerings/media/util/AStarPathUtil.java
index c79f271c..3e8a3fcf 100644
--- a/src/main/java/com/threerings/media/util/AStarPathUtil.java
+++ b/core/src/main/java/com/threerings/media/util/AStarPathUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/ArcPath.java
rename to core/src/main/java/com/threerings/media/util/ArcPath.java
index 702c73c4..9633c752 100644
--- a/src/main/java/com/threerings/media/util/ArcPath.java
+++ b/core/src/main/java/com/threerings/media/util/ArcPath.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/BackgroundTiler.java
rename to core/src/main/java/com/threerings/media/util/BackgroundTiler.java
index a18ab988..9c4a98b1 100644
--- a/src/main/java/com/threerings/media/util/BackgroundTiler.java
+++ b/core/src/main/java/com/threerings/media/util/BackgroundTiler.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/BobblePath.java
rename to core/src/main/java/com/threerings/media/util/BobblePath.java
index 1f732ef2..e9fafbfb 100644
--- a/src/main/java/com/threerings/media/util/BobblePath.java
+++ b/core/src/main/java/com/threerings/media/util/BobblePath.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/DelayPath.java
rename to core/src/main/java/com/threerings/media/util/DelayPath.java
index 1a927701..a7c401f2 100644
--- a/src/main/java/com/threerings/media/util/DelayPath.java
+++ b/core/src/main/java/com/threerings/media/util/DelayPath.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/DelegatingPathable.java
rename to core/src/main/java/com/threerings/media/util/DelegatingPathable.java
index e514fb41..1c27c70b 100644
--- a/src/main/java/com/threerings/media/util/DelegatingPathable.java
+++ b/core/src/main/java/com/threerings/media/util/DelegatingPathable.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/FrameSequencer.java
rename to core/src/main/java/com/threerings/media/util/FrameSequencer.java
index 66d69699..a16f9b2e 100644
--- a/src/main/java/com/threerings/media/util/FrameSequencer.java
+++ b/core/src/main/java/com/threerings/media/util/FrameSequencer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/LinePath.java
rename to core/src/main/java/com/threerings/media/util/LinePath.java
index 76f06631..73c39e8f 100644
--- a/src/main/java/com/threerings/media/util/LinePath.java
+++ b/core/src/main/java/com/threerings/media/util/LinePath.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/LineSegmentPath.java
rename to core/src/main/java/com/threerings/media/util/LineSegmentPath.java
index a64d8463..86519e64 100644
--- a/src/main/java/com/threerings/media/util/LineSegmentPath.java
+++ b/core/src/main/java/com/threerings/media/util/LineSegmentPath.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/LinearTimeFunction.java
rename to core/src/main/java/com/threerings/media/util/LinearTimeFunction.java
index 606e5b9d..c4c634bd 100644
--- a/src/main/java/com/threerings/media/util/LinearTimeFunction.java
+++ b/core/src/main/java/com/threerings/media/util/LinearTimeFunction.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/MathUtil.java
rename to core/src/main/java/com/threerings/media/util/MathUtil.java
index 4d277335..5c50fbbc 100644
--- a/src/main/java/com/threerings/media/util/MathUtil.java
+++ b/core/src/main/java/com/threerings/media/util/MathUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/ModeUtil.java
rename to core/src/main/java/com/threerings/media/util/ModeUtil.java
index 79c51b7d..5de0bfab 100644
--- a/src/main/java/com/threerings/media/util/ModeUtil.java
+++ b/core/src/main/java/com/threerings/media/util/ModeUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/MultiFrameImage.java
rename to core/src/main/java/com/threerings/media/util/MultiFrameImage.java
index d62befd4..51eaabcd 100644
--- a/src/main/java/com/threerings/media/util/MultiFrameImage.java
+++ b/core/src/main/java/com/threerings/media/util/MultiFrameImage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/MultiFrameImageImpl.java
rename to core/src/main/java/com/threerings/media/util/MultiFrameImageImpl.java
index 75fde033..63157559 100644
--- a/src/main/java/com/threerings/media/util/MultiFrameImageImpl.java
+++ b/core/src/main/java/com/threerings/media/util/MultiFrameImageImpl.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/Path.java
rename to core/src/main/java/com/threerings/media/util/Path.java
index fbf4f097..940d87b2 100644
--- a/src/main/java/com/threerings/media/util/Path.java
+++ b/core/src/main/java/com/threerings/media/util/Path.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/PathNode.java
rename to core/src/main/java/com/threerings/media/util/PathNode.java
index e13b4c91..f9d17169 100644
--- a/src/main/java/com/threerings/media/util/PathNode.java
+++ b/core/src/main/java/com/threerings/media/util/PathNode.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/PathSequence.java
rename to core/src/main/java/com/threerings/media/util/PathSequence.java
index 600c2392..156b95f5 100644
--- a/src/main/java/com/threerings/media/util/PathSequence.java
+++ b/core/src/main/java/com/threerings/media/util/PathSequence.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/Pathable.java
rename to core/src/main/java/com/threerings/media/util/Pathable.java
index 0103da18..9dd2e2ba 100644
--- a/src/main/java/com/threerings/media/util/Pathable.java
+++ b/core/src/main/java/com/threerings/media/util/Pathable.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/PerformanceMonitor.java
rename to core/src/main/java/com/threerings/media/util/PerformanceMonitor.java
index f4daf093..8939f43a 100644
--- a/src/main/java/com/threerings/media/util/PerformanceMonitor.java
+++ b/core/src/main/java/com/threerings/media/util/PerformanceMonitor.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/PerformanceObserver.java
rename to core/src/main/java/com/threerings/media/util/PerformanceObserver.java
index 28efe0b7..7e28447f 100644
--- a/src/main/java/com/threerings/media/util/PerformanceObserver.java
+++ b/core/src/main/java/com/threerings/media/util/PerformanceObserver.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/SingleFrameImageImpl.java
rename to core/src/main/java/com/threerings/media/util/SingleFrameImageImpl.java
index 0bc220c5..a269542a 100644
--- a/src/main/java/com/threerings/media/util/SingleFrameImageImpl.java
+++ b/core/src/main/java/com/threerings/media/util/SingleFrameImageImpl.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/SingleTileImageImpl.java
rename to core/src/main/java/com/threerings/media/util/SingleTileImageImpl.java
index 2a34735d..d8003f9b 100644
--- a/src/main/java/com/threerings/media/util/SingleTileImageImpl.java
+++ b/core/src/main/java/com/threerings/media/util/SingleTileImageImpl.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/SmoothBobblePath.java
rename to core/src/main/java/com/threerings/media/util/SmoothBobblePath.java
index f64dddfb..9c3387db 100644
--- a/src/main/java/com/threerings/media/util/SmoothBobblePath.java
+++ b/core/src/main/java/com/threerings/media/util/SmoothBobblePath.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/TiledArea.java
rename to core/src/main/java/com/threerings/media/util/TiledArea.java
index 0824d599..24331ff0 100644
--- a/src/main/java/com/threerings/media/util/TiledArea.java
+++ b/core/src/main/java/com/threerings/media/util/TiledArea.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/TimeFunction.java
rename to core/src/main/java/com/threerings/media/util/TimeFunction.java
index 1a1fd6a4..68b18fc7 100644
--- a/src/main/java/com/threerings/media/util/TimeFunction.java
+++ b/core/src/main/java/com/threerings/media/util/TimeFunction.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/TimedPath.java
rename to core/src/main/java/com/threerings/media/util/TimedPath.java
index 8471f628..6633f43f 100644
--- a/src/main/java/com/threerings/media/util/TimedPath.java
+++ b/core/src/main/java/com/threerings/media/util/TimedPath.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/util/TrailingAverage.java
rename to core/src/main/java/com/threerings/media/util/TrailingAverage.java
index 3be32553..9c36db21 100644
--- a/src/main/java/com/threerings/media/util/TrailingAverage.java
+++ b/core/src/main/java/com/threerings/media/util/TrailingAverage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/miso/Log.java b/core/src/main/java/com/threerings/miso/Log.java
similarity index 99%
rename from src/main/java/com/threerings/miso/Log.java
rename to core/src/main/java/com/threerings/miso/Log.java
index 417229c3..e19f5ed2 100644
--- a/src/main/java/com/threerings/miso/Log.java
+++ b/core/src/main/java/com/threerings/miso/Log.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/miso/MisoConfig.java b/core/src/main/java/com/threerings/miso/MisoConfig.java
similarity index 99%
rename from src/main/java/com/threerings/miso/MisoConfig.java
rename to core/src/main/java/com/threerings/miso/MisoConfig.java
index 58ecde38..7a8171fb 100644
--- a/src/main/java/com/threerings/miso/MisoConfig.java
+++ b/core/src/main/java/com/threerings/miso/MisoConfig.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/miso/MisoPrefs.java b/core/src/main/java/com/threerings/miso/MisoPrefs.java
similarity index 99%
rename from src/main/java/com/threerings/miso/MisoPrefs.java
rename to core/src/main/java/com/threerings/miso/MisoPrefs.java
index 29e9e44b..640892a5 100644
--- a/src/main/java/com/threerings/miso/MisoPrefs.java
+++ b/core/src/main/java/com/threerings/miso/MisoPrefs.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/DirtyItemList.java
rename to core/src/main/java/com/threerings/miso/client/DirtyItemList.java
index 93fd127a..c375e640 100644
--- a/src/main/java/com/threerings/miso/client/DirtyItemList.java
+++ b/core/src/main/java/com/threerings/miso/client/DirtyItemList.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/MisoScenePanel.java
rename to core/src/main/java/com/threerings/miso/client/MisoScenePanel.java
index 987b3d65..dcaf4761 100644
--- a/src/main/java/com/threerings/miso/client/MisoScenePanel.java
+++ b/core/src/main/java/com/threerings/miso/client/MisoScenePanel.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/MultiTileSprite.java
rename to core/src/main/java/com/threerings/miso/client/MultiTileSprite.java
index 2e701829..663e58ea 100644
--- a/src/main/java/com/threerings/miso/client/MultiTileSprite.java
+++ b/core/src/main/java/com/threerings/miso/client/MultiTileSprite.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/ObjectActionHandler.java
rename to core/src/main/java/com/threerings/miso/client/ObjectActionHandler.java
index 9fbbc98d..a1ae8753 100644
--- a/src/main/java/com/threerings/miso/client/ObjectActionHandler.java
+++ b/core/src/main/java/com/threerings/miso/client/ObjectActionHandler.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/ResolutionView.java
rename to core/src/main/java/com/threerings/miso/client/ResolutionView.java
index 073f5ace..ba4332c8 100644
--- a/src/main/java/com/threerings/miso/client/ResolutionView.java
+++ b/core/src/main/java/com/threerings/miso/client/ResolutionView.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/RethinkOp.java
rename to core/src/main/java/com/threerings/miso/client/RethinkOp.java
index 0ace1960..810c9cdc 100644
--- a/src/main/java/com/threerings/miso/client/RethinkOp.java
+++ b/core/src/main/java/com/threerings/miso/client/RethinkOp.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/SceneBlock.java
rename to core/src/main/java/com/threerings/miso/client/SceneBlock.java
index c366f9c8..f30a7137 100644
--- a/src/main/java/com/threerings/miso/client/SceneBlock.java
+++ b/core/src/main/java/com/threerings/miso/client/SceneBlock.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/SceneBlockResolver.java
rename to core/src/main/java/com/threerings/miso/client/SceneBlockResolver.java
index d280a375..47af5e5e 100644
--- a/src/main/java/com/threerings/miso/client/SceneBlockResolver.java
+++ b/core/src/main/java/com/threerings/miso/client/SceneBlockResolver.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/SceneObject.java
rename to core/src/main/java/com/threerings/miso/client/SceneObject.java
index dec84a34..f452172f 100644
--- a/src/main/java/com/threerings/miso/client/SceneObject.java
+++ b/core/src/main/java/com/threerings/miso/client/SceneObject.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/SceneObjectActionEvent.java
rename to core/src/main/java/com/threerings/miso/client/SceneObjectActionEvent.java
index fb984edd..4f3ba28d 100644
--- a/src/main/java/com/threerings/miso/client/SceneObjectActionEvent.java
+++ b/core/src/main/java/com/threerings/miso/client/SceneObjectActionEvent.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/SceneObjectIndicator.java
rename to core/src/main/java/com/threerings/miso/client/SceneObjectIndicator.java
index c6347b1f..79581a7f 100644
--- a/src/main/java/com/threerings/miso/client/SceneObjectIndicator.java
+++ b/core/src/main/java/com/threerings/miso/client/SceneObjectIndicator.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/SceneObjectTip.java
rename to core/src/main/java/com/threerings/miso/client/SceneObjectTip.java
index 0c89d515..3a58bb8f 100644
--- a/src/main/java/com/threerings/miso/client/SceneObjectTip.java
+++ b/core/src/main/java/com/threerings/miso/client/SceneObjectTip.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/TileOp.java
rename to core/src/main/java/com/threerings/miso/client/TileOp.java
index 407b21f2..d94d4dd0 100644
--- a/src/main/java/com/threerings/miso/client/TileOp.java
+++ b/core/src/main/java/com/threerings/miso/client/TileOp.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/TileOpApplicator.java
rename to core/src/main/java/com/threerings/miso/client/TileOpApplicator.java
index f7ea80cf..baec1088 100644
--- a/src/main/java/com/threerings/miso/client/TileOpApplicator.java
+++ b/core/src/main/java/com/threerings/miso/client/TileOpApplicator.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/client/TilePath.java
rename to core/src/main/java/com/threerings/miso/client/TilePath.java
index 2e5b54b9..5f63e187 100644
--- a/src/main/java/com/threerings/miso/client/TilePath.java
+++ b/core/src/main/java/com/threerings/miso/client/TilePath.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/data/MisoSceneModel.java
rename to core/src/main/java/com/threerings/miso/data/MisoSceneModel.java
index b95473c3..404dbfc4 100644
--- a/src/main/java/com/threerings/miso/data/MisoSceneModel.java
+++ b/core/src/main/java/com/threerings/miso/data/MisoSceneModel.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/data/ObjectInfo.java
rename to core/src/main/java/com/threerings/miso/data/ObjectInfo.java
index c8904f57..34ea3c04 100644
--- a/src/main/java/com/threerings/miso/data/ObjectInfo.java
+++ b/core/src/main/java/com/threerings/miso/data/ObjectInfo.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/data/SimpleMisoSceneModel.java
rename to core/src/main/java/com/threerings/miso/data/SimpleMisoSceneModel.java
index edf3c74f..a6822ccb 100644
--- a/src/main/java/com/threerings/miso/data/SimpleMisoSceneModel.java
+++ b/core/src/main/java/com/threerings/miso/data/SimpleMisoSceneModel.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/data/SparseMisoSceneModel.java
rename to core/src/main/java/com/threerings/miso/data/SparseMisoSceneModel.java
index 753a5d6f..e4a5df71 100644
--- a/src/main/java/com/threerings/miso/data/SparseMisoSceneModel.java
+++ b/core/src/main/java/com/threerings/miso/data/SparseMisoSceneModel.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/data/VirtualMisoSceneModel.java
rename to core/src/main/java/com/threerings/miso/data/VirtualMisoSceneModel.java
index 110a40b7..90ab4e7c 100644
--- a/src/main/java/com/threerings/miso/data/VirtualMisoSceneModel.java
+++ b/core/src/main/java/com/threerings/miso/data/VirtualMisoSceneModel.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/tile/AutoFringer.java
rename to core/src/main/java/com/threerings/miso/tile/AutoFringer.java
index 6acac252..871683a5 100644
--- a/src/main/java/com/threerings/miso/tile/AutoFringer.java
+++ b/core/src/main/java/com/threerings/miso/tile/AutoFringer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/tile/BaseTile.java
rename to core/src/main/java/com/threerings/miso/tile/BaseTile.java
index 8a40fc21..4707858e 100644
--- a/src/main/java/com/threerings/miso/tile/BaseTile.java
+++ b/core/src/main/java/com/threerings/miso/tile/BaseTile.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/tile/BaseTileSet.java
rename to core/src/main/java/com/threerings/miso/tile/BaseTileSet.java
index 8c04e856..f2e4eb47 100644
--- a/src/main/java/com/threerings/miso/tile/BaseTileSet.java
+++ b/core/src/main/java/com/threerings/miso/tile/BaseTileSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/tile/FringeConfiguration.java
rename to core/src/main/java/com/threerings/miso/tile/FringeConfiguration.java
index 95506a90..ffa81fe8 100644
--- a/src/main/java/com/threerings/miso/tile/FringeConfiguration.java
+++ b/core/src/main/java/com/threerings/miso/tile/FringeConfiguration.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/tile/MisoTileManager.java
rename to core/src/main/java/com/threerings/miso/tile/MisoTileManager.java
index 4c366b89..fa3abdd1 100644
--- a/src/main/java/com/threerings/miso/tile/MisoTileManager.java
+++ b/core/src/main/java/com/threerings/miso/tile/MisoTileManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/util/MisoContext.java
rename to core/src/main/java/com/threerings/miso/util/MisoContext.java
index 5fe625ec..b38afdc9 100644
--- a/src/main/java/com/threerings/miso/util/MisoContext.java
+++ b/core/src/main/java/com/threerings/miso/util/MisoContext.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/util/MisoSceneMetrics.java
rename to core/src/main/java/com/threerings/miso/util/MisoSceneMetrics.java
index 194e6311..975cbdcf 100644
--- a/src/main/java/com/threerings/miso/util/MisoSceneMetrics.java
+++ b/core/src/main/java/com/threerings/miso/util/MisoSceneMetrics.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/util/MisoUtil.java
rename to core/src/main/java/com/threerings/miso/util/MisoUtil.java
index d2aff80d..d46400db 100644
--- a/src/main/java/com/threerings/miso/util/MisoUtil.java
+++ b/core/src/main/java/com/threerings/miso/util/MisoUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/miso/util/ObjectSet.java
rename to core/src/main/java/com/threerings/miso/util/ObjectSet.java
index d48d0840..424617b8 100644
--- a/src/main/java/com/threerings/miso/util/ObjectSet.java
+++ b/core/src/main/java/com/threerings/miso/util/ObjectSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/BlankSound.java b/core/src/main/java/com/threerings/openal/BlankSound.java
similarity index 99%
rename from src/main/java/com/threerings/openal/BlankSound.java
rename to core/src/main/java/com/threerings/openal/BlankSound.java
index ea77f0cc..10e233cd 100644
--- a/src/main/java/com/threerings/openal/BlankSound.java
+++ b/core/src/main/java/com/threerings/openal/BlankSound.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/Buffer.java b/core/src/main/java/com/threerings/openal/Buffer.java
similarity index 99%
rename from src/main/java/com/threerings/openal/Buffer.java
rename to core/src/main/java/com/threerings/openal/Buffer.java
index 2bb2cb4a..3ccf9cb2 100644
--- a/src/main/java/com/threerings/openal/Buffer.java
+++ b/core/src/main/java/com/threerings/openal/Buffer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/Clip.java b/core/src/main/java/com/threerings/openal/Clip.java
similarity index 99%
rename from src/main/java/com/threerings/openal/Clip.java
rename to core/src/main/java/com/threerings/openal/Clip.java
index f405e50d..cf8cf5a8 100644
--- a/src/main/java/com/threerings/openal/Clip.java
+++ b/core/src/main/java/com/threerings/openal/Clip.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/ClipBuffer.java b/core/src/main/java/com/threerings/openal/ClipBuffer.java
similarity index 99%
rename from src/main/java/com/threerings/openal/ClipBuffer.java
rename to core/src/main/java/com/threerings/openal/ClipBuffer.java
index 8f941750..bb5c8091 100644
--- a/src/main/java/com/threerings/openal/ClipBuffer.java
+++ b/core/src/main/java/com/threerings/openal/ClipBuffer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/ClipProvider.java b/core/src/main/java/com/threerings/openal/ClipProvider.java
similarity index 99%
rename from src/main/java/com/threerings/openal/ClipProvider.java
rename to core/src/main/java/com/threerings/openal/ClipProvider.java
index bb44a0d0..2b75c017 100644
--- a/src/main/java/com/threerings/openal/ClipProvider.java
+++ b/core/src/main/java/com/threerings/openal/ClipProvider.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/FileStream.java b/core/src/main/java/com/threerings/openal/FileStream.java
similarity index 99%
rename from src/main/java/com/threerings/openal/FileStream.java
rename to core/src/main/java/com/threerings/openal/FileStream.java
index b26f8a54..0d26c9d5 100644
--- a/src/main/java/com/threerings/openal/FileStream.java
+++ b/core/src/main/java/com/threerings/openal/FileStream.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/Listener.java b/core/src/main/java/com/threerings/openal/Listener.java
similarity index 99%
rename from src/main/java/com/threerings/openal/Listener.java
rename to core/src/main/java/com/threerings/openal/Listener.java
index 059fd7c9..121c493c 100644
--- a/src/main/java/com/threerings/openal/Listener.java
+++ b/core/src/main/java/com/threerings/openal/Listener.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/Log.java b/core/src/main/java/com/threerings/openal/Log.java
similarity index 99%
rename from src/main/java/com/threerings/openal/Log.java
rename to core/src/main/java/com/threerings/openal/Log.java
index 7db99303..02606fc5 100644
--- a/src/main/java/com/threerings/openal/Log.java
+++ b/core/src/main/java/com/threerings/openal/Log.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/Mp3StreamDecoder.java b/core/src/main/java/com/threerings/openal/Mp3StreamDecoder.java
similarity index 99%
rename from src/main/java/com/threerings/openal/Mp3StreamDecoder.java
rename to core/src/main/java/com/threerings/openal/Mp3StreamDecoder.java
index f06d70bc..14da6463 100644
--- a/src/main/java/com/threerings/openal/Mp3StreamDecoder.java
+++ b/core/src/main/java/com/threerings/openal/Mp3StreamDecoder.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/OggStreamDecoder.java b/core/src/main/java/com/threerings/openal/OggStreamDecoder.java
similarity index 99%
rename from src/main/java/com/threerings/openal/OggStreamDecoder.java
rename to core/src/main/java/com/threerings/openal/OggStreamDecoder.java
index 22be7420..099bef5d 100644
--- a/src/main/java/com/threerings/openal/OggStreamDecoder.java
+++ b/core/src/main/java/com/threerings/openal/OggStreamDecoder.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/OpenALSoundPlayer.java b/core/src/main/java/com/threerings/openal/OpenALSoundPlayer.java
similarity index 99%
rename from src/main/java/com/threerings/openal/OpenALSoundPlayer.java
rename to core/src/main/java/com/threerings/openal/OpenALSoundPlayer.java
index 0cc3c702..174d4f7f 100644
--- a/src/main/java/com/threerings/openal/OpenALSoundPlayer.java
+++ b/core/src/main/java/com/threerings/openal/OpenALSoundPlayer.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/ResourceStream.java b/core/src/main/java/com/threerings/openal/ResourceStream.java
similarity index 99%
rename from src/main/java/com/threerings/openal/ResourceStream.java
rename to core/src/main/java/com/threerings/openal/ResourceStream.java
index 7cd2c102..4228b622 100644
--- a/src/main/java/com/threerings/openal/ResourceStream.java
+++ b/core/src/main/java/com/threerings/openal/ResourceStream.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/Sound.java b/core/src/main/java/com/threerings/openal/Sound.java
similarity index 99%
rename from src/main/java/com/threerings/openal/Sound.java
rename to core/src/main/java/com/threerings/openal/Sound.java
index c30e2fab..8ea9a339 100644
--- a/src/main/java/com/threerings/openal/Sound.java
+++ b/core/src/main/java/com/threerings/openal/Sound.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/SoundGroup.java b/core/src/main/java/com/threerings/openal/SoundGroup.java
similarity index 99%
rename from src/main/java/com/threerings/openal/SoundGroup.java
rename to core/src/main/java/com/threerings/openal/SoundGroup.java
index 845aebb8..2667999a 100644
--- a/src/main/java/com/threerings/openal/SoundGroup.java
+++ b/core/src/main/java/com/threerings/openal/SoundGroup.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/SoundManager.java b/core/src/main/java/com/threerings/openal/SoundManager.java
similarity index 99%
rename from src/main/java/com/threerings/openal/SoundManager.java
rename to core/src/main/java/com/threerings/openal/SoundManager.java
index d61589df..ba21012b 100644
--- a/src/main/java/com/threerings/openal/SoundManager.java
+++ b/core/src/main/java/com/threerings/openal/SoundManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/Source.java b/core/src/main/java/com/threerings/openal/Source.java
similarity index 99%
rename from src/main/java/com/threerings/openal/Source.java
rename to core/src/main/java/com/threerings/openal/Source.java
index ed716e29..9b54ac30 100644
--- a/src/main/java/com/threerings/openal/Source.java
+++ b/core/src/main/java/com/threerings/openal/Source.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/Stream.java b/core/src/main/java/com/threerings/openal/Stream.java
similarity index 99%
rename from src/main/java/com/threerings/openal/Stream.java
rename to core/src/main/java/com/threerings/openal/Stream.java
index 8fe4a99d..b566b402 100644
--- a/src/main/java/com/threerings/openal/Stream.java
+++ b/core/src/main/java/com/threerings/openal/Stream.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/StreamDecoder.java b/core/src/main/java/com/threerings/openal/StreamDecoder.java
similarity index 99%
rename from src/main/java/com/threerings/openal/StreamDecoder.java
rename to core/src/main/java/com/threerings/openal/StreamDecoder.java
index f61f6849..85fb6691 100644
--- a/src/main/java/com/threerings/openal/StreamDecoder.java
+++ b/core/src/main/java/com/threerings/openal/StreamDecoder.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/URLStream.java b/core/src/main/java/com/threerings/openal/URLStream.java
similarity index 99%
rename from src/main/java/com/threerings/openal/URLStream.java
rename to core/src/main/java/com/threerings/openal/URLStream.java
index f51fe180..69a8f70a 100644
--- a/src/main/java/com/threerings/openal/URLStream.java
+++ b/core/src/main/java/com/threerings/openal/URLStream.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/openal/WaveDataClipProvider.java b/core/src/main/java/com/threerings/openal/WaveDataClipProvider.java
similarity index 99%
rename from src/main/java/com/threerings/openal/WaveDataClipProvider.java
rename to core/src/main/java/com/threerings/openal/WaveDataClipProvider.java
index c3a79e74..5c08169d 100644
--- a/src/main/java/com/threerings/openal/WaveDataClipProvider.java
+++ b/core/src/main/java/com/threerings/openal/WaveDataClipProvider.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/resource/FastImageIO.java b/core/src/main/java/com/threerings/resource/FastImageIO.java
similarity index 99%
rename from src/main/java/com/threerings/resource/FastImageIO.java
rename to core/src/main/java/com/threerings/resource/FastImageIO.java
index ac4eee7d..dd67f6ac 100644
--- a/src/main/java/com/threerings/resource/FastImageIO.java
+++ b/core/src/main/java/com/threerings/resource/FastImageIO.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/resource/FileResourceBundle.java b/core/src/main/java/com/threerings/resource/FileResourceBundle.java
similarity index 99%
rename from src/main/java/com/threerings/resource/FileResourceBundle.java
rename to core/src/main/java/com/threerings/resource/FileResourceBundle.java
index b999f576..da55bc6a 100644
--- a/src/main/java/com/threerings/resource/FileResourceBundle.java
+++ b/core/src/main/java/com/threerings/resource/FileResourceBundle.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/resource/Handler.java b/core/src/main/java/com/threerings/resource/Handler.java
similarity index 99%
rename from src/main/java/com/threerings/resource/Handler.java
rename to core/src/main/java/com/threerings/resource/Handler.java
index aece8bcf..7c590b0b 100644
--- a/src/main/java/com/threerings/resource/Handler.java
+++ b/core/src/main/java/com/threerings/resource/Handler.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/resource/KnownAvailabilityResourceBundle.java b/core/src/main/java/com/threerings/resource/KnownAvailabilityResourceBundle.java
similarity index 99%
rename from src/main/java/com/threerings/resource/KnownAvailabilityResourceBundle.java
rename to core/src/main/java/com/threerings/resource/KnownAvailabilityResourceBundle.java
index 05f7860f..c8b91b3a 100644
--- a/src/main/java/com/threerings/resource/KnownAvailabilityResourceBundle.java
+++ b/core/src/main/java/com/threerings/resource/KnownAvailabilityResourceBundle.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/resource/Log.java b/core/src/main/java/com/threerings/resource/Log.java
similarity index 99%
rename from src/main/java/com/threerings/resource/Log.java
rename to core/src/main/java/com/threerings/resource/Log.java
index 37c223ab..78b49820 100644
--- a/src/main/java/com/threerings/resource/Log.java
+++ b/core/src/main/java/com/threerings/resource/Log.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/resource/NetworkResourceBundle.java b/core/src/main/java/com/threerings/resource/NetworkResourceBundle.java
similarity index 99%
rename from src/main/java/com/threerings/resource/NetworkResourceBundle.java
rename to core/src/main/java/com/threerings/resource/NetworkResourceBundle.java
index 51aadcfe..dd968f46 100644
--- a/src/main/java/com/threerings/resource/NetworkResourceBundle.java
+++ b/core/src/main/java/com/threerings/resource/NetworkResourceBundle.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/resource/ResourceBundle.java b/core/src/main/java/com/threerings/resource/ResourceBundle.java
similarity index 99%
rename from src/main/java/com/threerings/resource/ResourceBundle.java
rename to core/src/main/java/com/threerings/resource/ResourceBundle.java
index fa994716..068fd862 100644
--- a/src/main/java/com/threerings/resource/ResourceBundle.java
+++ b/core/src/main/java/com/threerings/resource/ResourceBundle.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/resource/ResourceManager.java b/core/src/main/java/com/threerings/resource/ResourceManager.java
similarity index 99%
rename from src/main/java/com/threerings/resource/ResourceManager.java
rename to core/src/main/java/com/threerings/resource/ResourceManager.java
index ae4bd307..e1d060f6 100644
--- a/src/main/java/com/threerings/resource/ResourceManager.java
+++ b/core/src/main/java/com/threerings/resource/ResourceManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/util/BrowserUtil.java b/core/src/main/java/com/threerings/util/BrowserUtil.java
similarity index 99%
rename from src/main/java/com/threerings/util/BrowserUtil.java
rename to core/src/main/java/com/threerings/util/BrowserUtil.java
index db2c5f96..f06e2bbd 100644
--- a/src/main/java/com/threerings/util/BrowserUtil.java
+++ b/core/src/main/java/com/threerings/util/BrowserUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/util/CompiledConfig.java b/core/src/main/java/com/threerings/util/CompiledConfig.java
similarity index 99%
rename from src/main/java/com/threerings/util/CompiledConfig.java
rename to core/src/main/java/com/threerings/util/CompiledConfig.java
index 889a0eb1..74680fa8 100644
--- a/src/main/java/com/threerings/util/CompiledConfig.java
+++ b/core/src/main/java/com/threerings/util/CompiledConfig.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/util/DirectionCodes.java b/core/src/main/java/com/threerings/util/DirectionCodes.java
similarity index 99%
rename from src/main/java/com/threerings/util/DirectionCodes.java
rename to core/src/main/java/com/threerings/util/DirectionCodes.java
index 6df4277b..4d8979c7 100644
--- a/src/main/java/com/threerings/util/DirectionCodes.java
+++ b/core/src/main/java/com/threerings/util/DirectionCodes.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/util/DirectionUtil.java b/core/src/main/java/com/threerings/util/DirectionUtil.java
similarity index 99%
rename from src/main/java/com/threerings/util/DirectionUtil.java
rename to core/src/main/java/com/threerings/util/DirectionUtil.java
index 9bd323f8..e45e090e 100644
--- a/src/main/java/com/threerings/util/DirectionUtil.java
+++ b/core/src/main/java/com/threerings/util/DirectionUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/util/FileUtil.java b/core/src/main/java/com/threerings/util/FileUtil.java
similarity index 99%
rename from src/main/java/com/threerings/util/FileUtil.java
rename to core/src/main/java/com/threerings/util/FileUtil.java
index 5c80e5c3..b0a4698c 100644
--- a/src/main/java/com/threerings/util/FileUtil.java
+++ b/core/src/main/java/com/threerings/util/FileUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/util/IdleTracker.java b/core/src/main/java/com/threerings/util/IdleTracker.java
similarity index 99%
rename from src/main/java/com/threerings/util/IdleTracker.java
rename to core/src/main/java/com/threerings/util/IdleTracker.java
index cc04dd7d..102aa75e 100644
--- a/src/main/java/com/threerings/util/IdleTracker.java
+++ b/core/src/main/java/com/threerings/util/IdleTracker.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/util/KeyDispatcher.java b/core/src/main/java/com/threerings/util/KeyDispatcher.java
similarity index 99%
rename from src/main/java/com/threerings/util/KeyDispatcher.java
rename to core/src/main/java/com/threerings/util/KeyDispatcher.java
index cab588c8..c64643ee 100644
--- a/src/main/java/com/threerings/util/KeyDispatcher.java
+++ b/core/src/main/java/com/threerings/util/KeyDispatcher.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/util/KeyTranslator.java b/core/src/main/java/com/threerings/util/KeyTranslator.java
similarity index 99%
rename from src/main/java/com/threerings/util/KeyTranslator.java
rename to core/src/main/java/com/threerings/util/KeyTranslator.java
index e1718772..164f24c5 100644
--- a/src/main/java/com/threerings/util/KeyTranslator.java
+++ b/core/src/main/java/com/threerings/util/KeyTranslator.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/util/KeyTranslatorImpl.java b/core/src/main/java/com/threerings/util/KeyTranslatorImpl.java
similarity index 99%
rename from src/main/java/com/threerings/util/KeyTranslatorImpl.java
rename to core/src/main/java/com/threerings/util/KeyTranslatorImpl.java
index 32bac4dd..8091acc3 100644
--- a/src/main/java/com/threerings/util/KeyTranslatorImpl.java
+++ b/core/src/main/java/com/threerings/util/KeyTranslatorImpl.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/util/KeyboardManager.java b/core/src/main/java/com/threerings/util/KeyboardManager.java
similarity index 99%
rename from src/main/java/com/threerings/util/KeyboardManager.java
rename to core/src/main/java/com/threerings/util/KeyboardManager.java
index b69b0e54..244d3211 100644
--- a/src/main/java/com/threerings/util/KeyboardManager.java
+++ b/core/src/main/java/com/threerings/util/KeyboardManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/util/keybd/Keyboard.java
rename to core/src/main/java/com/threerings/util/keybd/Keyboard.java
index 35f1659e..1b7d38e1 100644
--- a/src/main/java/com/threerings/util/keybd/Keyboard.java
+++ b/core/src/main/java/com/threerings/util/keybd/Keyboard.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/util/unsafe/Unsafe.java
rename to core/src/main/java/com/threerings/util/unsafe/Unsafe.java
index de46ed74..870b382a 100644
--- a/src/main/java/com/threerings/util/unsafe/Unsafe.java
+++ b/core/src/main/java/com/threerings/util/unsafe/Unsafe.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/test/java/com/threerings/cast/CharSpriteViz.java
rename to core/src/test/java/com/threerings/cast/CharSpriteViz.java
index a1ea4c8d..45495f90 100644
--- a/src/test/java/com/threerings/cast/CharSpriteViz.java
+++ b/core/src/test/java/com/threerings/cast/CharSpriteViz.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/test/java/com/threerings/cast/builder/TestApp.java
rename to core/src/test/java/com/threerings/cast/builder/TestApp.java
index 5a780299..edef34f0 100644
--- a/src/test/java/com/threerings/cast/builder/TestApp.java
+++ b/core/src/test/java/com/threerings/cast/builder/TestApp.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/test/java/com/threerings/cast/builder/TestFrame.java
rename to core/src/test/java/com/threerings/cast/builder/TestFrame.java
index 5a956623..ba57aa18 100644
--- a/src/test/java/com/threerings/cast/builder/TestFrame.java
+++ b/core/src/test/java/com/threerings/cast/builder/TestFrame.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/test/java/com/threerings/geom/NearestViz.java b/core/src/test/java/com/threerings/geom/NearestViz.java
similarity index 99%
rename from src/test/java/com/threerings/geom/NearestViz.java
rename to core/src/test/java/com/threerings/geom/NearestViz.java
index a7e1d16d..a4a8034e 100644
--- a/src/test/java/com/threerings/geom/NearestViz.java
+++ b/core/src/test/java/com/threerings/geom/NearestViz.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/test/java/com/threerings/geom/WhichSideViz.java b/core/src/test/java/com/threerings/geom/WhichSideViz.java
similarity index 99%
rename from src/test/java/com/threerings/geom/WhichSideViz.java
rename to core/src/test/java/com/threerings/geom/WhichSideViz.java
index 4db83468..e9fe9ae7 100644
--- a/src/test/java/com/threerings/geom/WhichSideViz.java
+++ b/core/src/test/java/com/threerings/geom/WhichSideViz.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/test/java/com/threerings/media/ImageLoadingSpeed.java b/core/src/test/java/com/threerings/media/ImageLoadingSpeed.java
similarity index 99%
rename from src/test/java/com/threerings/media/ImageLoadingSpeed.java
rename to core/src/test/java/com/threerings/media/ImageLoadingSpeed.java
index 7016f300..f6932e3d 100644
--- a/src/test/java/com/threerings/media/ImageLoadingSpeed.java
+++ b/core/src/test/java/com/threerings/media/ImageLoadingSpeed.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/test/java/com/threerings/media/TestIconManager.java b/core/src/test/java/com/threerings/media/TestIconManager.java
similarity index 99%
rename from src/test/java/com/threerings/media/TestIconManager.java
rename to core/src/test/java/com/threerings/media/TestIconManager.java
index d931ded0..d99dfe19 100644
--- a/src/test/java/com/threerings/media/TestIconManager.java
+++ b/core/src/test/java/com/threerings/media/TestIconManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/test/java/com/threerings/media/sound/SoundTestApp.java
rename to core/src/test/java/com/threerings/media/sound/SoundTestApp.java
index b465e5ab..f641f8e8 100644
--- a/src/test/java/com/threerings/media/sound/SoundTestApp.java
+++ b/core/src/test/java/com/threerings/media/sound/SoundTestApp.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/test/java/com/threerings/media/util/PathViz.java
rename to core/src/test/java/com/threerings/media/util/PathViz.java
index d46d8b28..6b77ff2d 100644
--- a/src/test/java/com/threerings/media/util/PathViz.java
+++ b/core/src/test/java/com/threerings/media/util/PathViz.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/test/java/com/threerings/media/util/TraceViz.java
rename to core/src/test/java/com/threerings/media/util/TraceViz.java
index 5b2c750e..b550bced 100644
--- a/src/test/java/com/threerings/media/util/TraceViz.java
+++ b/core/src/test/java/com/threerings/media/util/TraceViz.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/test/java/com/threerings/miso/client/ScrollingFrame.java
rename to core/src/test/java/com/threerings/miso/client/ScrollingFrame.java
index ae298196..05850d7a 100644
--- a/src/test/java/com/threerings/miso/client/ScrollingFrame.java
+++ b/core/src/test/java/com/threerings/miso/client/ScrollingFrame.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/test/java/com/threerings/miso/client/ScrollingScene.java
rename to core/src/test/java/com/threerings/miso/client/ScrollingScene.java
index 03bf9a48..a99b116b 100644
--- a/src/test/java/com/threerings/miso/client/ScrollingScene.java
+++ b/core/src/test/java/com/threerings/miso/client/ScrollingScene.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/test/java/com/threerings/miso/client/ScrollingTestApp.java
rename to core/src/test/java/com/threerings/miso/client/ScrollingTestApp.java
index c4e3c35e..ddad0bb7 100644
--- a/src/test/java/com/threerings/miso/client/ScrollingTestApp.java
+++ b/core/src/test/java/com/threerings/miso/client/ScrollingTestApp.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/test/java/com/threerings/openal/TestSoundManager.java b/core/src/test/java/com/threerings/openal/TestSoundManager.java
similarity index 99%
rename from src/test/java/com/threerings/openal/TestSoundManager.java
rename to core/src/test/java/com/threerings/openal/TestSoundManager.java
index b8c8cef1..298fe7fc 100644
--- a/src/test/java/com/threerings/openal/TestSoundManager.java
+++ b/core/src/test/java/com/threerings/openal/TestSoundManager.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/test/java/com/threerings/util/DirectionTest.java b/core/src/test/java/com/threerings/util/DirectionTest.java
similarity index 99%
rename from src/test/java/com/threerings/util/DirectionTest.java
rename to core/src/test/java/com/threerings/util/DirectionTest.java
index f8173edf..1b94fcbf 100644
--- a/src/test/java/com/threerings/util/DirectionTest.java
+++ b/core/src/test/java/com/threerings/util/DirectionTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/test/java/com/threerings/util/DirectionViz.java b/core/src/test/java/com/threerings/util/DirectionViz.java
similarity index 99%
rename from src/test/java/com/threerings/util/DirectionViz.java
rename to core/src/test/java/com/threerings/util/DirectionViz.java
index 5f501587..dc73be83 100644
--- a/src/test/java/com/threerings/util/DirectionViz.java
+++ b/core/src/test/java/com/threerings/util/DirectionViz.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/test/java/com/threerings/util/KeyTimerApp.java b/core/src/test/java/com/threerings/util/KeyTimerApp.java
similarity index 99%
rename from src/test/java/com/threerings/util/KeyTimerApp.java
rename to core/src/test/java/com/threerings/util/KeyTimerApp.java
index fcbb5664..bd3fa605 100644
--- a/src/test/java/com/threerings/util/KeyTimerApp.java
+++ b/core/src/test/java/com/threerings/util/KeyTimerApp.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/test/java/com/threerings/util/KeyboardManagerApp.java b/core/src/test/java/com/threerings/util/KeyboardManagerApp.java
similarity index 99%
rename from src/test/java/com/threerings/util/KeyboardManagerApp.java
rename to core/src/test/java/com/threerings/util/KeyboardManagerApp.java
index d0ecb1dd..72d6c645 100644
--- a/src/test/java/com/threerings/util/KeyboardManagerApp.java
+++ b/core/src/test/java/com/threerings/util/KeyboardManagerApp.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/test/java/com/threerings/util/UIDTestApp.java b/core/src/test/java/com/threerings/util/UIDTestApp.java
similarity index 99%
rename from src/test/java/com/threerings/util/UIDTestApp.java
rename to core/src/test/java/com/threerings/util/UIDTestApp.java
index 1e42363a..4e5e2f28 100644
--- a/src/test/java/com/threerings/util/UIDTestApp.java
+++ b/core/src/test/java/com/threerings/util/UIDTestApp.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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/lib/SOURCE_HEADER b/etc/SOURCE_HEADER
similarity index 98%
rename from lib/SOURCE_HEADER
rename to etc/SOURCE_HEADER
index 8ec0f0b5..5181c871 100644
--- a/lib/SOURCE_HEADER
+++ b/etc/SOURCE_HEADER
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 @@
-
-
- 4.0.0
- com.threerings
- nenyalib
- swc
- 1.4-SNAPSHOT
- nenya
- Facilities for making networked multiplayer games.
- http://code.google.com/p/nenya/
-
- http://code.google.com/p/nenya/issues/list
-
-
-
-
- flexlib-repo
- http://maven.ow2.org/maven2
-
-
- ooo-ext-maven-repo
- http://ooo-maven.googlecode.com/hg/repository
-
-
- ooo-maven-repo
- http://threerings.github.com/maven-repo
-
-
-
-
-
- com.threerings
- aspirin
- 1.9
- swc
-
-
- flexlib
- flexlib-bin
- 2.4
- swc
-
-
- as3isolib
- as3isolib-fp9
- r298
- swc
-
-
- com.threerings
- naryalib
- 1.11
- swc
-
-
-
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 @@
-
-
- 4.0.0
- com.threerings
- nenya-tools
- jar
- 1.4-SNAPSHOT
- nenya-tools
- Nenya with dependencies configured for its tools.
-
-
-
- com.samskivert
- samskivert
- 1.1
- compile
-
-
- com.google.guava
- guava
- 11.0.1
- compile
-
-
- commons-digester
- commons-digester
- 1.8
- compile
-
-
- com.megginson.sax
- xml-writer
- 0.2
- compile
-
-
-
diff --git a/pom.xml b/pom.xml
index 6dfb6748..96a78d91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,23 +1,24 @@
-
+
4.0.0
- com.threerings
- nenya
- jar
- 1.4-SNAPSHOT
- nenya
- Facilities for making networked multiplayer games.
- http://github.com/threerings/nenya/
-
- http://github.com/threerings/nenya/issues
-
-
org.sonatype.oss
oss-parent
7
+ com.threerings
+ nenya-parent
+ pom
+ 1.5-SNAPSHOT
+
+ Nenya Parent
+ Facilities for making Java games.
+ http://github.com/threerings/nenya/
+
+ http://github.com/threerings/nenya/issues
+
+
GNU Lesser General Public License (LGPL), Version 2.1
@@ -36,108 +37,20 @@
scm:git:git://github.com/threerings/nenya.git
- scm:svn:svn+ssh://src.earth.threerings.net/nenya/trunk
+ scm:git:git@github.com:threerings/nenya.git
http://github.com/threerings/nenya/
-
-
- lwjgl-repo
- http://lwjgl-maven.googlecode.com/svn/trunk/repository
-
-
- ooo-repo
- http://threerings.github.com/maven-repo
-
-
- ooo-ext-repo
- http://ooo-maven.googlecode.com/hg/repository
-
-
+
+ UTF-8
+ 1.11
+
-
-
-
- com.samskivert
- samskivert
- 1.5
-
-
- com.google.guava
- guava
- 11.0.1
-
-
-
-
- com.threerings
- narya
- 1.11
- true
-
-
- org.lwjgl
- lwjgl
- 2.6
- true
-
-
- org.lwjgl
- lwjgl_util
- 2.6
- true
-
-
- net.javazoom
- jlayer
- 1.0
- true
-
-
- com.jcraft
- jorbis
- 0.0.15
- true
-
-
- com.jcraft
- jogg
- 0.0.7
- true
-
-
- javassist
- javassist
- 3.8.0.GA
- true
-
-
- commons-digester
- commons-digester
- 1.8
- true
-
-
- com.megginson.sax
- xml-writer
- 0.2
- true
-
-
-
-
- org.apache.ant
- ant
- 1.7.1
- provided
-
-
- junit
- junit
- 4.8.1
- test
-
-
+
+ core
+ tools
+ aslib
+
@@ -153,13 +66,6 @@
true
-Xlint" "-Xlint:-serial" "-Xlint:-path
-
-
- **/OggPlayer.java
- **/ModPlayer.java
- **/MidiPlayer.java
- **/Mp3Player.java
-
@@ -180,45 +86,11 @@
http://samskivert.github.com/samskivert/apidocs/
http://docs.guava-libraries.googlecode.com/git/javadoc/
+ http://threerings.github.com/narya/apidocs/
http://evgeny-goldin.org/ant/api/
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.6
-
-
- com/threerings/**/*Test.java
-
-
-
-
- com/threerings/**/BundledComponentRepositoryTest.java
- com/threerings/**/BundledTileSetRepositoryTest.java
-
-
- target/test-classes/rsrc
- true
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 2.3.1
-
-
- org.apache.maven.plugins
- maven-install-plugin
- 2.3.1
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
- 2.5
-
diff --git a/tools/pom.xml b/tools/pom.xml
new file mode 100644
index 00000000..0ad87554
--- /dev/null
+++ b/tools/pom.xml
@@ -0,0 +1,76 @@
+
+
+ 4.0.0
+
+ com.threerings
+ nenya-parent
+ 1.5-SNAPSHOT
+
+
+ nenya-tools
+ jar
+ Nenya Tools
+
+
+
+
+ com.threerings
+ nenya
+ ${project.version}
+
+
+ com.threerings
+ narya
+ ${narya.version}
+
+
+ commons-digester
+ commons-digester
+ 1.8
+
+
+ com.megginson.sax
+ xml-writer
+ 0.2
+
+
+
+
+ org.apache.ant
+ ant
+ 1.7.1
+ provided
+
+
+ junit
+ junit
+ 4.10
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.6
+
+
+ com/threerings/**/*Test.java
+
+
+
+
+ com/threerings/**/BundledComponentRepositoryTest.java
+ com/threerings/**/BundledTileSetRepositoryTest.java
+
+
+ target/test-classes/rsrc
+ true
+
+
+
+
+
+
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 99%
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
index 568be2d6..041b757f 100644
--- a/src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
+++ b/tools/src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index b3fce343..ed1e269f 100644
--- a/src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerUtil.java
+++ b/tools/src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 0405b4e4..b36a5cba 100644
--- a/src/main/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java
+++ b/tools/src/main/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 85527af1..20e172dd 100644
--- a/src/main/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java
+++ b/tools/src/main/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 961b5d22..5aea097d 100644
--- a/src/main/java/com/threerings/cast/bundle/tools/DumpBundle.java
+++ b/tools/src/main/java/com/threerings/cast/bundle/tools/DumpBundle.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 4f694ac7..c7efc81d 100644
--- a/src/main/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java
+++ b/tools/src/main/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 1b76a0b9..8a52d2d8 100644
--- a/src/main/java/com/threerings/cast/tools/xml/ActionRuleSet.java
+++ b/tools/src/main/java/com/threerings/cast/tools/xml/ActionRuleSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index da1902e1..3a085194 100644
--- a/src/main/java/com/threerings/cast/tools/xml/ClassRuleSet.java
+++ b/tools/src/main/java/com/threerings/cast/tools/xml/ClassRuleSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 09c065d7..f3f1b5dd 100644
--- a/src/main/java/com/threerings/media/image/tools/DumpColorPository.java
+++ b/tools/src/main/java/com/threerings/media/image/tools/DumpColorPository.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 7c780326..f982dae1 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index cb381544..1a0bfe94 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index aa8937a2..8f771f1e 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index e923cefe..bb71b848 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index a00234ed..89dd1f73 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 341bee44..78214a8a 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 280cbeb3..005c41b7 100644
--- a/src/main/java/com/threerings/media/tile/tools/DumpTileSetMap.java
+++ b/tools/src/main/java/com/threerings/media/tile/tools/DumpTileSetMap.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 7cb59191..0794a874 100644
--- a/src/main/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
+++ b/tools/src/main/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index b0c48e9f..d2a79473 100644
--- a/src/main/java/com/threerings/media/tile/tools/RenameTileSet.java
+++ b/tools/src/main/java/com/threerings/media/tile/tools/RenameTileSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 3a652c29..52dd5aaf 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 707fc0f9..89497268 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index a1676b27..454f879c 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 29a12465..3c18b2f2 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index c75508b2..8d8ff6c0 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tools/RecolorImage.java
rename to tools/src/main/java/com/threerings/media/tools/RecolorImage.java
index 7ad9e027..5c44e6cf 100644
--- a/src/main/java/com/threerings/media/tools/RecolorImage.java
+++ b/tools/src/main/java/com/threerings/media/tools/RecolorImage.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/media/tools/ResourceIndexerTask.java
rename to tools/src/main/java/com/threerings/media/tools/ResourceIndexerTask.java
index d77bb9e6..9b9114b7 100644
--- a/src/main/java/com/threerings/media/tools/ResourceIndexerTask.java
+++ b/tools/src/main/java/com/threerings/media/tools/ResourceIndexerTask.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index a012cd6e..cea9e0e0 100644
--- a/src/main/java/com/threerings/miso/tile/tools/CompileFringeConfigurationTask.java
+++ b/tools/src/main/java/com/threerings/miso/tile/tools/CompileFringeConfigurationTask.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index d025683d..0b5b4a5c 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index dc2d9eab..c3356f01 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index fd9b865e..1073e681 100644
--- a/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java
+++ b/tools/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index bb97ea79..c0b848c1 100644
--- a/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java
+++ b/tools/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 24a511e5..adf5f347 100644
--- a/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java
+++ b/tools/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 3321e68e..848c2546 100644
--- a/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java
+++ b/tools/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index 7ae1c20c..816b4624 100644
--- a/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java
+++ b/tools/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index f245fec9..2eae89f9 100644
--- a/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java
+++ b/tools/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
diff --git a/src/main/java/com/threerings/tools/CompiledConfigTask.java b/tools/src/main/java/com/threerings/tools/CompiledConfigTask.java
similarity index 99%
rename from src/main/java/com/threerings/tools/CompiledConfigTask.java
rename to tools/src/main/java/com/threerings/tools/CompiledConfigTask.java
index dec6d601..1d9b3796 100644
--- a/src/main/java/com/threerings/tools/CompiledConfigTask.java
+++ b/tools/src/main/java/com/threerings/tools/CompiledConfigTask.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/tools/xml/CompiledConfigParser.java
rename to tools/src/main/java/com/threerings/tools/xml/CompiledConfigParser.java
index 57b60340..69238cd0 100644
--- a/src/main/java/com/threerings/tools/xml/CompiledConfigParser.java
+++ b/tools/src/main/java/com/threerings/tools/xml/CompiledConfigParser.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/tools/xml/NestableRuleSet.java
rename to tools/src/main/java/com/threerings/tools/xml/NestableRuleSet.java
index 15aa55d6..1b58a3de 100644
--- a/src/main/java/com/threerings/tools/xml/NestableRuleSet.java
+++ b/tools/src/main/java/com/threerings/tools/xml/NestableRuleSet.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/main/java/com/threerings/tools/xml/NestableWriter.java
rename to tools/src/main/java/com/threerings/tools/xml/NestableWriter.java
index b98e2495..c5b99946 100644
--- a/src/main/java/com/threerings/tools/xml/NestableWriter.java
+++ b/tools/src/main/java/com/threerings/tools/xml/NestableWriter.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/test/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
rename to tools/src/test/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
index bbc7b680..0bf1be82 100644
--- a/src/test/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
+++ b/tools/src/test/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index a028985e..3c1b843c 100644
--- a/src/test/java/com/threerings/cast/bundle/tools/ComponentBundlerUtilTest.java
+++ b/tools/src/test/java/com/threerings/cast/bundle/tools/ComponentBundlerUtilTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index babf865b..d90fd64d 100644
--- a/src/test/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java
+++ b/tools/src/test/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index e08e6488..36c40013 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
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
index b99daf62..33a98601 100644
--- 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
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/test/java/com/threerings/miso/viewer/ViewerApp.java
rename to tools/src/test/java/com/threerings/miso/viewer/ViewerApp.java
index 1d192e33..cc3a475b 100644
--- a/src/test/java/com/threerings/miso/viewer/ViewerApp.java
+++ b/tools/src/test/java/com/threerings/miso/viewer/ViewerApp.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/test/java/com/threerings/miso/viewer/ViewerFrame.java
rename to tools/src/test/java/com/threerings/miso/viewer/ViewerFrame.java
index 45444f73..90a77536 100644
--- a/src/test/java/com/threerings/miso/viewer/ViewerFrame.java
+++ b/tools/src/test/java/com/threerings/miso/viewer/ViewerFrame.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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 99%
rename from src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
rename to tools/src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
index 5a7fcdc0..db6963f1 100644
--- a/src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
+++ b/tools/src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// Nenya library - tools for developing networked games
// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/nenya/
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