diff --git a/common/common-image/pom.xml b/common/common-image/pom.xml
index b09bcff8..0b32d00a 100644
--- a/common/common-image/pom.xml
+++ b/common/common-image/pom.xml
@@ -16,13 +16,20 @@
     </description>
 
 
-    <dependencies>
+    <dependencies>
+	<dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>common-lang</artifactId>
+        </dependency>
+	<dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>common-io</artifactId>
+        </dependency>
         <dependency>
             <groupId>jmagick</groupId>
-            <artifactId>jmagick</artifactId>
-            <version>6.2.4</version>
-            <scope>provided</scope>
-            <optional>true</optional>
+            <artifactId>jmagick</artifactId>
+	    <version>6.2.4</version>
+	    <optional>true</optional>
         </dependency>
     </dependencies>
 </project>
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/AbstractImageSource.java b/common/common-image/src/main/java/com/twelvemonkeys/image/AbstractImageSource.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/AbstractImageSource.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/AbstractImageSource.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/AreaAverageOp.java b/common/common-image/src/main/java/com/twelvemonkeys/image/AreaAverageOp.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/AreaAverageOp.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/AreaAverageOp.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BrightnessContrastFilter.java b/common/common-image/src/main/java/com/twelvemonkeys/image/BrightnessContrastFilter.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BrightnessContrastFilter.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/BrightnessContrastFilter.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BufferedImageFactory.java b/common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageFactory.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BufferedImageFactory.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageFactory.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java b/common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ConvolveWithEdgeOp.java b/common/common-image/src/main/java/com/twelvemonkeys/image/ConvolveWithEdgeOp.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ConvolveWithEdgeOp.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/ConvolveWithEdgeOp.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/CopyDither.java b/common/common-image/src/main/java/com/twelvemonkeys/image/CopyDither.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/CopyDither.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/CopyDither.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/DiffusionDither.java b/common/common-image/src/main/java/com/twelvemonkeys/image/DiffusionDither.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/DiffusionDither.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/DiffusionDither.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GraphicsUtil.java b/common/common-image/src/main/java/com/twelvemonkeys/image/GraphicsUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GraphicsUtil.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/GraphicsUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GrayColorModel.java b/common/common-image/src/main/java/com/twelvemonkeys/image/GrayColorModel.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GrayColorModel.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/GrayColorModel.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GrayFilter.java b/common/common-image/src/main/java/com/twelvemonkeys/image/GrayFilter.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GrayFilter.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/GrayFilter.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ImageConversionException.java b/common/common-image/src/main/java/com/twelvemonkeys/image/ImageConversionException.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ImageConversionException.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/ImageConversionException.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ImageFilterException.java b/common/common-image/src/main/java/com/twelvemonkeys/image/ImageFilterException.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ImageFilterException.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/ImageFilterException.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ImageUtil.java b/common/common-image/src/main/java/com/twelvemonkeys/image/ImageUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ImageUtil.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/ImageUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/IndexImage.java b/common/common-image/src/main/java/com/twelvemonkeys/image/IndexImage.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/IndexImage.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/IndexImage.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/InverseColorMap.java b/common/common-image/src/main/java/com/twelvemonkeys/image/InverseColorMap.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/InverseColorMap.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/InverseColorMap.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/InverseColorMapIndexColorModel.java b/common/common-image/src/main/java/com/twelvemonkeys/image/InverseColorMapIndexColorModel.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/InverseColorMapIndexColorModel.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/InverseColorMapIndexColorModel.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/Magick.java b/common/common-image/src/main/java/com/twelvemonkeys/image/Magick.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/Magick.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/Magick.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MagickAccelerator.java b/common/common-image/src/main/java/com/twelvemonkeys/image/MagickAccelerator.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MagickAccelerator.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/MagickAccelerator.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MagickUtil.java b/common/common-image/src/main/java/com/twelvemonkeys/image/MagickUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MagickUtil.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/MagickUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MonochromeColorModel.java b/common/common-image/src/main/java/com/twelvemonkeys/image/MonochromeColorModel.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MonochromeColorModel.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/MonochromeColorModel.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/PixelizeOp.java b/common/common-image/src/main/java/com/twelvemonkeys/image/PixelizeOp.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/PixelizeOp.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/PixelizeOp.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ResampleOp.java b/common/common-image/src/main/java/com/twelvemonkeys/image/ResampleOp.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ResampleOp.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/ResampleOp.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/SubsamplingFilter.java b/common/common-image/src/main/java/com/twelvemonkeys/image/SubsamplingFilter.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/SubsamplingFilter.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/SubsamplingFilter.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/inv_cmap.c b/common/common-image/src/main/java/com/twelvemonkeys/image/inv_cmap.c
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/inv_cmap.c
rename to common/common-image/src/main/java/com/twelvemonkeys/image/inv_cmap.c
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/package-info.java b/common/common-image/src/main/java/com/twelvemonkeys/image/package-info.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/package-info.java
rename to common/common-image/src/main/java/com/twelvemonkeys/image/package-info.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/image/ImageUtilTestCase.java b/common/common-image/src/test/java/com/twelvemonkeys/image/ImageUtilTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/image/ImageUtilTestCase.java
rename to common/common-image/src/test/java/com/twelvemonkeys/image/ImageUtilTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/image/ResampleOpTestCase.java b/common/common-image/src/test/java/com/twelvemonkeys/image/ResampleOpTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/image/ResampleOpTestCase.java
rename to common/common-image/src/test/java/com/twelvemonkeys/image/ResampleOpTestCase.java
diff --git a/twelvemonkeys-core/src/test/resources/sunflower.jpg b/common/common-image/src/test/resources/sunflower.jpg
similarity index 100%
rename from twelvemonkeys-core/src/test/resources/sunflower.jpg
rename to common/common-image/src/test/resources/sunflower.jpg
diff --git a/common/common-io/pom.xml b/common/common-io/pom.xml
index 7cb6b231..820b156f 100644
--- a/common/common-io/pom.xml
+++ b/common/common-io/pom.xml
@@ -19,12 +19,10 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>common-lang</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>common-lang</artifactId>
-      <version>${project.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/common/pom.xml b/common/pom.xml
index d34aa0ff..a01a1b03 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -22,20 +22,33 @@
      <module>common-image</module>
     </modules>
 
-
+
+<dependencyManagement>
     <dependencies>
-        <dependency>
-            <groupId>jmagick</groupId>
-            <artifactId>jmagick</artifactId>
-            <version>6.2.4</version>
-            <scope>provided</scope>
-            <optional>true</optional>
+	<dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>common-lang</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+	<dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>common-lang</artifactId>
+            <version>${project.version}</version>
+	    <classifier>tests</classifier>
+	    <scope>test</scope>
         </dependency>
-
+	<dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>common-io</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</dependencyManagement>
+    <dependencies>
         <dependency>
             <groupId>junit</groupId>
-            <artifactId>junit-dep</artifactId>
-            <version>4.5</version>
+            <artifactId>junit</artifactId>
+            <version>4.7</version>
             <scope>test</scope>
         </dependency>
 
@@ -45,5 +58,6 @@
             <version>1.0.1</version>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 </project>
diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/XMLProperties.java b/sandbox/common/src/main/java/com/twelvemonkeys/util/XMLProperties.java
similarity index 100%
rename from common/common-lang/src/main/java/com/twelvemonkeys/util/XMLProperties.java
rename to sandbox/common/src/main/java/com/twelvemonkeys/util/XMLProperties.java
diff --git a/twelvemonkeys-core/pom.xml b/twelvemonkeys-core/pom.xml
deleted file mode 100644
index 9ec80281..00000000
--- a/twelvemonkeys-core/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<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>
-    <artifactId>twelvemonkeys-core</artifactId>
-    <groupId>com.twelvemonkeys</groupId>
-    <version>2.3-SNAPSHOT</version>
-    <name>TwelveMonkeys Core</name>
-    <description>
-        The TwelveMonkeys Core library. Contains common utility classes.
-    </description>
-
-    <parent>
-        <groupId>com.twelvemonkeys</groupId>
-        <artifactId>twelvemonkeys-parent</artifactId>
-        <version>2.0</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>jmagick</groupId>
-            <artifactId>jmagick</artifactId>
-            <version>6.2.4</version>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.3.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>jmock</groupId>
-            <artifactId>jmock-cglib</artifactId>
-            <version>1.0.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                  <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <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>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/twelvemonkeys-core/src/main/resources/com/twelvemonkeys/net/MIMEUtil.properties b/twelvemonkeys-core/src/main/resources/com/twelvemonkeys/net/MIMEUtil.properties
deleted file mode 100755
index 9598cc47..00000000
--- a/twelvemonkeys-core/src/main/resources/com/twelvemonkeys/net/MIMEUtil.properties
+++ /dev/null
@@ -1,111 +0,0 @@
-##############################################################################
-#
-# MIME type mappings for MIMEUtil.
-# $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/resources/com/twelvemonkeys/net/MIMEUtil.properties#2 $
-#
-##############################################################################
-#
-# Format:
-# <default ext>[','<alt ext>','<alt ext>..]=<default mime>[';'<alt mime>';'<alt mime>..]
-#
-# If possible, the "default ext" and "default mime" must be the official file
-# extension and MIME type respectively.
-#
-# See http://www.iana.org/assignments/media-types/ for the complete list.
-#
-# TODO: Change to this format: http://java.sun.com/javase/6/docs/api/javax/activation/MimetypesFileTypeMap.html
-
-# Application types
-doc,dot=application/msword
-bin,exe,arc,lha,lhx,lzx,zoo=application/octet-stream
-arj=application/arj
-pdf=application/pdf
-ai,eps,ps=application/postscript
-ppt=application/vnd.ms-powerpoint;application/x-powerpoint;application/powerpoint
-csh=application/x-csh
-gtar=application/x-gtar
-gz,gzip,z=application/x-gzip;application/x-compressed
-class=application/x-java-vm
-ser=application/x-java-serialized-object
-jar=application/x-java-archive
-tex=application/x-tex;application/x-latex
-texinfo,texi=application/x-texinfo
-t,tr,roff=application/x-troff
-sh=application/x-sh
-tar=application/x-tar
-zip=application/zip
-hqx=application/binhex
-swf=application/x-shockwave-flash
-xls=application/vnd.ms-excel
-prc,pdb,pqa,oprc=application/vnd.palm
-ogg=application/ogg
-
-# Audio types
-au,snd=audio/basic
-wav=audio/x-wav;audio/wav
-aiff,aif,aifc=audio/x-aiff
-midi,mid=audio/x-midi
-gsm,gsd=audio/x-gsm
-mp3=audio/x-mpeg-3;audio/mpeg3
-ram,ra=audio/x-pn-realaudio;audio/x-realaudio
-
-# Image types
-bmp=image/bmp;image/x-bmp;image/x-win-bmp
-cgm=image/cgm
-ras=image/cmu-raster;image/x-cmu-raster
-gif=image/gif
-ico=image/ico;image/x-icon
-ief=image/ief
-iff,ilbm=image/x-iff;image/iff
-jpeg,jpg,jpe,jfif=image/jpeg;image/x-jpeg
-jpm=image/jpm
-png=image/png;image/x-png
-# NOTE: image/svg-xml is an old reccomendation, should not be used
-svg,svgz=image/svg+xml;image/svg-xml;image/x-svg
-tga=image/targa;image/x-targa
-tif,tiff=image/tiff;image/x-tiff
-ras,rast=image/x-cmu-raster;image/cmu-raster
-pict,pct,pic=image/x-pict;image/pict
-pcd=image/x-pcd;image/pcd
-pcx=image/x-pcx
-#pdb=image/x-palm-db;image/palm-db
-pnm=image/x-portable-anymap
-pbm=image/x-portable-bitmap
-pgm=image/x-portable-graymap
-ppm=image/x-portable-pixmap
-psd=image/x-psd;image/psd
-wbmp=image/vnd.wap.wbmp;image/x-wbmp
-wmf,emf=image/x-wmf;image/wmf;windows/metafile
-xbm=image/x-xbitmap;image/x-xbm;image/xbm
-xpm=image/x-xpixmap
-xwd=image/x-windowdump
-
-# Message types
-# No known file extensions
-
-# Model types
-vrml;wrl;wrz=model/vrml;x-world/x-vrml
-
-# Multipart types
-# No known file extensions
-
-# Text types
-txt=text/plain
-html,htm=text/html
-xml=text/xml;application/xml
-css=text/css
-js=text/javascript
-rtf,rtx=text/richtext;application/rtf;application/x-rtf
-xhtml,xht=application/xhtml+xml
-sgml,sgm=text/sgml;text/x-sgml
-wml=vnd.wap.wml
-wmls=vnd.wap.wmlscript
-ics=text/calendar
-
-# Video types
-mpg,mpeg,mpe=video/mpeg
-qt,mov=video/quicktime
-avi=video/x-msvideo;video/msvideo;video/avi
-movie=video/x-sgi-movie
-scm=video/x-scm
-rv=video/vnd.rn-realvideo
diff --git a/twelvemonkeys-core/todo.txt b/twelvemonkeys-core/todo.txt
deleted file mode 100644
index 42ea4984..00000000
--- a/twelvemonkeys-core/todo.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-- Remove util.BASE64, make clients use io.Base64.
-
-- Rename core to common?
-- Split up into three sub modules?
-  - common-core
-    - lang
-    - util
-  - common-io
-    - io
-    - io.enc
-    - io.ole2 (or move to separate module?)
-    - net (or move to separate module?)
-    - xml (or move to separate module?)
-  - common-image
-    - image
-  - common-sandbox
-    - all unreleased/experimental stuff
-
-- Test cases for the OLE2Compound stuff
-- Test cases for encoder/decoders
-- Test cases in general