diff --git a/pom.xml b/pom.xml
index 88ff2428..aeae531c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -7,14 +7,13 @@
     <artifactId>twelvemonkeys-parent</artifactId>
     <version>2.3-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Twelvemonkeys</name>
-
-    <modules>
-        <module>common</module>
-        <module>twelvemonkeys-core</module>
-        <!--<module>twelvemonkeys-servlet</module>
-        <module>twelvemonkeys-imageio</module>
-        <module>twelvemonkeys-sandbox</module>-->
+    <name>Twelvemonkeys</name>
+
+    <modules>
+        <module>common</module>
+        <module>twelvemonkeys-servlet</module>
+        <module>twelvemonkeys-imageio</module>
+        <module>twelvemonkeys-sandbox</module>
     </modules>
 
     <developers>
@@ -42,27 +41,27 @@
 
     <build>
         <pluginManagement>
-            <plugins>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Implementation-Title>${project.name}</Implementation-Title>
-                            <Implementation-Vendor>TwelveMonkeys</Implementation-Vendor>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                            <Implementation-URL>http://github.com/haraldk/TwelveMonkeys</Implementation-URL>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                  <encoding>UTF-8</encoding>
-                </configuration>
+            <plugins>
+              <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Implementation-Title>${project.name}</Implementation-Title>
+                            <Implementation-Vendor>TwelveMonkeys</Implementation-Vendor>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Implementation-URL>http://github.com/haraldk/TwelveMonkeys</Implementation-URL>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                  <encoding>UTF-8</encoding>
+                </configuration>
             </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/ConvolveTester.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/ConvolveTester.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/ConvolveTester.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/ConvolveTester.java
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/EasyImage.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/EasyImage.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/EasyImage.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/EasyImage.java
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/ExtendedImageConsumer.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/ExtendedImageConsumer.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/ExtendedImageConsumer.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/ExtendedImageConsumer.java
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/SubsampleTester.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/SubsampleTester.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/SubsampleTester.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/SubsampleTester.java
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/DeflateEncoder.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/DeflateEncoder.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/DeflateEncoder.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/DeflateEncoder.java
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/InflateDecoder.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/InflateDecoder.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/InflateDecoder.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/InflateDecoder.java
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/LZWDecoder.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/LZWDecoder.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/LZWDecoder.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/LZWDecoder.java
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/LZWEncoder.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/LZWEncoder.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/LZWEncoder.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/LZWEncoder.java
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/lang/MostUnfortunateException.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/lang/MostUnfortunateException.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/lang/MostUnfortunateException.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/lang/MostUnfortunateException.java
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/lang/NativeLoader.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/lang/NativeLoader.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/lang/NativeLoader.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/lang/NativeLoader.java
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/lang/NativeResourceSPI.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/lang/NativeResourceSPI.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/lang/NativeResourceSPI.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/lang/NativeResourceSPI.java
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/util/DebugUtil.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/util/DebugUtil.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/util/DebugUtil.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/util/DebugUtil.java
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/util/regex/REWildcardStringParser.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/util/regex/REWildcardStringParser.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/util/regex/REWildcardStringParser.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/util/regex/REWildcardStringParser.java
diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/xml/XMLReader.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/xml/XMLReader.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/xml/XMLReader.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/xml/XMLReader.java
diff --git a/twelvemonkeys-sandbox/src/test/java/com/twelvemonkeys/io/enc/DeflateEncoderTestCase.java b/sandbox/common/src/test/java/com/twelvemonkeys/io/enc/DeflateEncoderTestCase.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/test/java/com/twelvemonkeys/io/enc/DeflateEncoderTestCase.java
rename to sandbox/common/src/test/java/com/twelvemonkeys/io/enc/DeflateEncoderTestCase.java
diff --git a/twelvemonkeys-sandbox/src/test/java/com/twelvemonkeys/io/enc/InflateDecoderTestCase.java b/sandbox/common/src/test/java/com/twelvemonkeys/io/enc/InflateDecoderTestCase.java
similarity index 100%
rename from twelvemonkeys-sandbox/src/test/java/com/twelvemonkeys/io/enc/InflateDecoderTestCase.java
rename to sandbox/common/src/test/java/com/twelvemonkeys/io/enc/InflateDecoderTestCase.java