diff --git a/imageio/imageio-batik/pom.xml b/imageio/imageio-batik/pom.xml
index a0609b5a..b9b77c0e 100644
--- a/imageio/imageio-batik/pom.xml
+++ b/imageio/imageio-batik/pom.xml
@@ -3,9 +3,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.twelvemonkeys.imageio</groupId>
-    <artifactId>twelvemonkeys-imageio-batik</artifactId>
-    <version>2.3-SNAPSHOT</version>
+    <parent>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <artifactId>imageio</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
+    <artifactId>imageio-batik</artifactId>
     <name>TwelveMonkeys ImageIO Batik Plugin</name>
     <description>
         <![CDATA[
@@ -14,21 +17,15 @@
         for more information.]]>
     </description>
 
-    <parent>
-        <artifactId>twelvemonkeys-imageio</artifactId>
-        <groupId>com.twelvemonkeys</groupId>
-        <version>2.3-SNAPSHOT</version>
-    </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
             <classifier>tests</classifier>
         </dependency>
 
@@ -65,4 +62,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/imageio/imageio-core/pom.xml b/imageio/imageio-core/pom.xml
index 89735963..7cf24ee5 100644
--- a/imageio/imageio-core/pom.xml
+++ b/imageio/imageio-core/pom.xml
@@ -3,14 +3,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.twelvemonkeys.imageio</groupId>
-    <artifactId>twelvemonkeys-imageio-core</artifactId>
-    <version>2.3-SNAPSHOT</version>
-    <name>TwelveMonkeys ImageIO Core</name>
-
     <parent>
-        <artifactId>twelvemonkeys-imageio</artifactId>
-        <groupId>com.twelvemonkeys</groupId>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <artifactId>imageio</artifactId>
         <version>2.3-SNAPSHOT</version>
     </parent>
-</project>
\ No newline at end of file
+    <artifactId>imageio-core</artifactId>
+    <name>TwelveMonkeys ImageIO Core</name>
+
+</project>
diff --git a/imageio/imageio-ico/pom.xml b/imageio/imageio-ico/pom.xml
index 757a3dbe..9ef97678 100644
--- a/imageio/imageio-ico/pom.xml
+++ b/imageio/imageio-ico/pom.xml
@@ -3,27 +3,25 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.twelvemonkeys.imageio</groupId>
-    <artifactId>twelvemonkeys-imageio-ico</artifactId>
-    <version>2.3-SNAPSHOT</version>
+    <parent>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <artifactId>imageio</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
+    <artifactId>imageio-ico</artifactId>
     <name>TwelveMonkeys ImageIO ICO plugin</name>
     <description>ImageIO plugin for Windows Icon (ICO) and Cursor (CUR) format.</description>
 
-    <parent>
-        <artifactId>twelvemonkeys-imageio</artifactId>
-        <groupId>com.twelvemonkeys</groupId>
-        <version>2.3-SNAPSHOT</version>
-    </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
             <classifier>tests</classifier>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/imageio/imageio-iff/pom.xml b/imageio/imageio-iff/pom.xml
index c38f371c..4368393c 100644
--- a/imageio/imageio-iff/pom.xml
+++ b/imageio/imageio-iff/pom.xml
@@ -3,30 +3,27 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.twelvemonkeys.imageio</groupId>
+    <parent>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <artifactId>imageio</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
     <artifactId>twelvemonkeys-imageio-iff</artifactId>
-    <version>2.3-SNAPSHOT</version>
     <name>TwelveMonkeys ImageIO IFF plugin</name>
     <description>
         ImageIO plugin for Amiga/Electronic Arts Interchange Filed Format (IFF)
         type ILBM and PBM format.
     </description>
 
-    <parent>
-        <artifactId>twelvemonkeys-imageio</artifactId>
-        <groupId>com.twelvemonkeys</groupId>
-        <version>2.3-SNAPSHOT</version>
-    </parent>
-
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
             <classifier>tests</classifier>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/imageio/imageio-jmagick/pom.xml b/imageio/imageio-jmagick/pom.xml
index ac203146..23701bfb 100644
--- a/imageio/imageio-jmagick/pom.xml
+++ b/imageio/imageio-jmagick/pom.xml
@@ -3,9 +3,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.twelvemonkeys.imageio</groupId>
+    <parent>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <artifactId>imageio</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
     <artifactId>twelvemonkeys-imageio-jmagick</artifactId>
-    <version>2.2</version>
     <name>TwelveMonkeys ImageIO JMagick Plugin</name>
     <description>
         <![CDATA[
@@ -14,20 +17,14 @@
         for more information.]]>
     </description>
 
-    <parent>
-        <artifactId>twelvemonkeys-imageio</artifactId>
-        <groupId>com.twelvemonkeys</groupId>
-        <version>2.2</version>
-    </parent>
-
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
             <classifier>tests</classifier>
         </dependency>
         <dependency>
@@ -38,4 +35,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/imageio/imageio-pdf/pom.xml b/imageio/imageio-pdf/pom.xml
index a5d73622..1d9d13e8 100644
--- a/imageio/imageio-pdf/pom.xml
+++ b/imageio/imageio-pdf/pom.xml
@@ -3,29 +3,27 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.twelvemonkeys.imageio</groupId>
-    <artifactId>twelvemonkeys-imageio-pdf</artifactId>
-    <version>2.2</version>
+    <parent>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <artifactId>imageio</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
+    <artifactId>imageio-pdf</artifactId>
     <name>TwelveMonkeys ImageIO PDF plugin</name>
     <description>
         ImageIO plugin for Adobe Portable Document Format (PDF).
     </description>
 
-    <parent>
-        <artifactId>twelvemonkeys-imageio</artifactId>
-        <groupId>com.twelvemonkeys</groupId>
-        <version>2.2</version>
-    </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
             <classifier>tests</classifier>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/imageio/imageio-pict/pom.xml b/imageio/imageio-pict/pom.xml
index 285f3752..d26bb43f 100644
--- a/imageio/imageio-pict/pom.xml
+++ b/imageio/imageio-pict/pom.xml
@@ -3,27 +3,26 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.twelvemonkeys.imageio</groupId>
-    <artifactId>twelvemonkeys-imageio-pict</artifactId>
-    <version>2.3-SNAPSHOT</version>
+    <parent>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <artifactId>imageio</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
+    <artifactId>imageio-pict</artifactId>
     <name>TwelveMonkeys ImageIO PICT plugin</name>
     <description>ImageIO plugin for Apple Mac Paint Picture (PICT) format.</description>
 
-    <parent>
-        <artifactId>twelvemonkeys-imageio</artifactId>
-        <groupId>com.twelvemonkeys</groupId>
-        <version>2.3-SNAPSHOT</version>
-    </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
             <classifier>tests</classifier>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+
+</project>
diff --git a/imageio/imageio-psd/pom.xml b/imageio/imageio-psd/pom.xml
index 455d245c..ab233aca 100644
--- a/imageio/imageio-psd/pom.xml
+++ b/imageio/imageio-psd/pom.xml
@@ -3,29 +3,27 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.twelvemonkeys.imageio</groupId>
-    <artifactId>twelvemonkeys-imageio-psd</artifactId>
-    <version>2.3-SNAPSHOT</version>
+    <parent>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <artifactId>imageio</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
+    <artifactId>imageio-psd</artifactId>
     <name>TwelveMonkeys ImageIO PSD plugin</name>
     <description>
         ImageIO plugin for Adobe Photoshop Document (PSD).
     </description>
 
-    <parent>
-        <artifactId>twelvemonkeys-imageio</artifactId>
-        <groupId>com.twelvemonkeys</groupId>
-        <version>2.3-SNAPSHOT</version>
-    </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
             <classifier>tests</classifier>
         </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
+    </dependencies>
+</project>
diff --git a/imageio/imageio-reference/pom.xml b/imageio/imageio-reference/pom.xml
index b65ecfdd..fa383890 100644
--- a/imageio/imageio-reference/pom.xml
+++ b/imageio/imageio-reference/pom.xml
@@ -3,29 +3,27 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.twelvemonkeys.imageio</groupId>
-    <artifactId>twelvemonkeys-imageio-reference</artifactId>
-    <version>2.2</version>
+    <parent>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <artifactId>imageio</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
+    <artifactId>imageio-reference</artifactId>
     <name>TwelveMonkeys ImageIO reference test cases</name>
     <description>
         Test cases for the JDK provided ImageReader implementations for reference.
     </description>
 
-    <parent>
-        <artifactId>twelvemonkeys-imageio</artifactId>
-        <groupId>com.twelvemonkeys</groupId>
-        <version>2.2</version>
-    </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
             <classifier>tests</classifier>
-        </dependency>
+        </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/imageio/imageio-thumbsdb/pom.xml b/imageio/imageio-thumbsdb/pom.xml
index 6cf22a71..01c3e2ce 100644
--- a/imageio/imageio-thumbsdb/pom.xml
+++ b/imageio/imageio-thumbsdb/pom.xml
@@ -3,29 +3,28 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.twelvemonkeys.imageio</groupId>
-    <artifactId>twelvemonkeys-imageio-thumbsdb</artifactId>
-    <version>2.3-SNAPSHOT</version>
+    <parent>
+        <groupId>com.twelvemonkeys.imageio</groupId>
+        <artifactId>imageio</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
+    <artifactId>imageio-thumbsdb</artifactId>
     <name>TwelveMonkeys ImageIO Thumbs.db plugin</name>
     <description>
         ImageIO plugin for Windows Thumbs DB (Thumbs.db) format.
     </description>
 
-    <parent>
-        <artifactId>twelvemonkeys-imageio</artifactId>
-        <groupId>com.twelvemonkeys</groupId>
-        <version>2.3-SNAPSHOT</version>
-    </parent>
+
 
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
-            <artifactId>twelvemonkeys-imageio-core</artifactId>
+            <artifactId>imageio-core</artifactId>
             <classifier>tests</classifier>
         </dependency>
     </dependencies> 
-</project>
\ No newline at end of file
+</project>
diff --git a/imageio/pom.xml b/imageio/pom.xml
index 3fcd3467..195c1315 100644
--- a/imageio/pom.xml
+++ b/imageio/pom.xml
@@ -2,18 +2,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>com.twelvemonkeys</groupId>
+        <artifactId>twelvemonkeys-parent</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.twelvemonkeys</groupId>
-    <artifactId>twelvemonkeys-imageio</artifactId>
+    <groupId>com.twelvemonkeys.imageio</groupId>
+    <artifactId>imageio</artifactId>
     <version>2.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>TwelveMonkeys ImageIO</name>
 
-    <parent>
-        <groupId>com.twelvemonkeys</groupId>
-        <artifactId>twelvemonkeys-parent</artifactId>
-        <version>2.0</version>
-    </parent>
 
     <contributors>
         <contributor>
@@ -28,21 +28,21 @@
 
     <modules>
         <!-- Support -->
-        <module>core</module>
+        <module>imageio-core</module>
 
         <!-- Stand-alone readers/writers -->
-        <module>ico</module>
-        <module>iff</module>
-        <module>pdf</module> 
-        <module>pict</module>
-        <module>psd</module>
-        <module>thumbsdb</module>
+        <module>imageio-ico</module>
+        <module>imageio-iff</module>
+        <module>imageio-pdf</module> 
+        <module>imageio-pict</module>
+        <module>imageio-psd</module>
+        <module>imageio-thumbsdb</module>
 
         <!-- Wrappers for 3rd party libs  -->
-        <module>batik</module>
-        <module>jmagick</module>
+        <module>imageio-batik</module>
+        <module>imageio-jmagick</module>
 
-        <module>reference</module>        
+        <module>imageio-reference</module>        
     </modules>
 
     <properties>
@@ -52,23 +52,35 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.twelvemonkeys</groupId>
-            <artifactId>twelvemonkeys-core</artifactId>
-            <version>${core.version}</version>
-            <scope>compile</scope>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-io</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.twelvemonkeys</groupId>
-            <artifactId>twelvemonkeys-core</artifactId>
-            <version>${core.version}</version>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-image</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-lang</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-io</artifactId>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
 
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.3.1</version>
+            <version>4.7</version>
             <scope>test</scope>
         </dependency>
 
@@ -83,56 +95,18 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>com.twelvemonkeys.imageio</groupId>
-                <artifactId>twelvemonkeys-imageio-core</artifactId>
-                <version>${imageio.core.version}</version>
-                <scope>compile</scope>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>imageio-core</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.twelvemonkeys.imageio</groupId>
-                <artifactId>twelvemonkeys-imageio-core</artifactId>
-                <version>${imageio.core.version}</version>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>imageio-core</artifactId>
+                <version>${project.version}</version>
                 <classifier>tests</classifier>
                 <scope>test</scope>
             </dependency>
         </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <!-- TODO: Make default -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <!--<mainClass>com.mycompany.app.App</mainClass>-->
-<!--                            <packageName>com.twelvemonkeys.imageio.plugins.psd</packageName> -->
-                        </manifest>
-                        <manifestEntries>
-                            <Implementation-Title>${project.name}</Implementation-Title>
-                            <Implementation-Vendor>TwelveMonkeys</Implementation-Vendor>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                            <Implementation-URL>https://twelvemonkeys-imageio.dev.java.net/</Implementation-URL>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
+    </dependencyManagement>    
 </project>
diff --git a/pom.xml b/pom.xml
index aeae531c..33220c3f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -12,8 +12,8 @@
     <modules>
         <module>common</module>
         <module>twelvemonkeys-servlet</module>
-        <module>twelvemonkeys-imageio</module>
-        <module>twelvemonkeys-sandbox</module>
+        <module>imageio</module>
+        <!--<module>sandbox</module>-->
     </modules>
 
     <developers>
diff --git a/twelvemonkeys-servlet/pom.xml b/twelvemonkeys-servlet/pom.xml
index 46e302db..6cee65ae 100644
--- a/twelvemonkeys-servlet/pom.xml
+++ b/twelvemonkeys-servlet/pom.xml
@@ -2,34 +2,46 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.twelvemonkeys</groupId>
-    <artifactId>twelvemonkeys-servlet</artifactId>
-    <version>2.2</version>
-    <name>TwelveMonkeys Servlet</name>
-
     <parent>
         <groupId>com.twelvemonkeys</groupId>
         <artifactId>twelvemonkeys-parent</artifactId>
-        <version>2.0</version>
+        <version>2.3-SNAPSHOT</version>
     </parent>
 
-    <properties>
-        <core.version>2.2</core.version>
-    </properties>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.twelvemonkeys</groupId>
+    <artifactId>twelvemonkeys-servlet</artifactId>
+    <version>2.3-SNAPSHOT</version>
+    <name>TwelveMonkeys Servlet</name>
 
     <dependencies>
         <dependency>
-            <groupId>com.twelvemonkeys</groupId>
-            <artifactId>twelvemonkeys-core</artifactId>
-            <version>${core.version}</version>
-            <scope>compile</scope>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-lang</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-io</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-image</artifactId>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
-            <groupId>com.twelvemonkeys</groupId>
-            <artifactId>twelvemonkeys-core</artifactId>
-            <version>${core.version}</version>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-lang</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-io</artifactId>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>