diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/AbstractCachedSeekableStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/AbstractCachedSeekableStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/AbstractCachedSeekableStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/AbstractCachedSeekableStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/CompoundReader.java b/common/common-io/src/main/java/com/twelvemonkeys/io/CompoundReader.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/CompoundReader.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/CompoundReader.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/EmptyReader.java b/common/common-io/src/main/java/com/twelvemonkeys/io/EmptyReader.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/EmptyReader.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/EmptyReader.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FastByteArrayOutputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FastByteArrayOutputStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FastByteArrayOutputStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/FastByteArrayOutputStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileCacheSeekableStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FileCacheSeekableStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileCacheSeekableStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/FileCacheSeekableStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileSeekableStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FileSeekableStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileSeekableStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/FileSeekableStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileSystem.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FileSystem.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileSystem.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/FileSystem.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileUtil.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FileUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileUtil.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/FileUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FilenameMaskFilter.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FilenameMaskFilter.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FilenameMaskFilter.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/FilenameMaskFilter.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FilenameSuffixFilter.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FilenameSuffixFilter.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FilenameSuffixFilter.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/FilenameSuffixFilter.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/LittleEndianDataInputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/LittleEndianDataInputStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/LittleEndianDataInputStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/LittleEndianDataInputStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/LittleEndianDataOutputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/LittleEndianDataOutputStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/LittleEndianDataOutputStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/LittleEndianDataOutputStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/LittleEndianRandomAccessFile.java b/common/common-io/src/main/java/com/twelvemonkeys/io/LittleEndianRandomAccessFile.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/LittleEndianRandomAccessFile.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/LittleEndianRandomAccessFile.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/MemoryCacheSeekableStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/MemoryCacheSeekableStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/MemoryCacheSeekableStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/MemoryCacheSeekableStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/NullInputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/NullInputStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/NullInputStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/NullInputStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/NullOutputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/NullOutputStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/NullOutputStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/NullOutputStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/RandomAccessStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/RandomAccessStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/RandomAccessStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/RandomAccessStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Seekable.java b/common/common-io/src/main/java/com/twelvemonkeys/io/Seekable.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Seekable.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/Seekable.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SeekableInputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/SeekableInputStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SeekableInputStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/SeekableInputStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SeekableOutputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/SeekableOutputStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SeekableOutputStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/SeekableOutputStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/StringArrayReader.java b/common/common-io/src/main/java/com/twelvemonkeys/io/StringArrayReader.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/StringArrayReader.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/StringArrayReader.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SubStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/SubStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SubStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/SubStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/UnixFileSystem.java b/common/common-io/src/main/java/com/twelvemonkeys/io/UnixFileSystem.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/UnixFileSystem.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/UnixFileSystem.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32File.java b/common/common-io/src/main/java/com/twelvemonkeys/io/Win32File.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32File.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/Win32File.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32FileSystem.java b/common/common-io/src/main/java/com/twelvemonkeys/io/Win32FileSystem.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32FileSystem.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/Win32FileSystem.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32Lnk.java b/common/common-io/src/main/java/com/twelvemonkeys/io/Win32Lnk.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32Lnk.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/Win32Lnk.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/WriterOutputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/WriterOutputStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/WriterOutputStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/WriterOutputStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/AbstractRLEDecoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/AbstractRLEDecoder.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/AbstractRLEDecoder.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/AbstractRLEDecoder.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Base64.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/Base64.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64Decoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Base64Decoder.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64Decoder.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/Base64Decoder.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64Encoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Base64Encoder.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64Encoder.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/Base64Encoder.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Decoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Decoder.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Decoder.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/Decoder.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Encoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Encoder.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Encoder.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/Encoder.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBits16Decoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/PackBits16Decoder.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBits16Decoder.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/PackBits16Decoder.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsEncoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/PackBitsEncoder.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsEncoder.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/PackBitsEncoder.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/RLE4Decoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/RLE4Decoder.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/RLE4Decoder.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/RLE4Decoder.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/RLE8Decoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/RLE8Decoder.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/RLE8Decoder.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/RLE8Decoder.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/package-info.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/package-info.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/package-info.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/package-info.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/CompoundDocument.java b/common/common-io/src/main/java/com/twelvemonkeys/io/ole2/CompoundDocument.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/CompoundDocument.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/ole2/CompoundDocument.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/CorruptDocumentException.java b/common/common-io/src/main/java/com/twelvemonkeys/io/ole2/CorruptDocumentException.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/CorruptDocumentException.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/ole2/CorruptDocumentException.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/Entry.java b/common/common-io/src/main/java/com/twelvemonkeys/io/ole2/Entry.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/Entry.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/ole2/Entry.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/SIdChain.java b/common/common-io/src/main/java/com/twelvemonkeys/io/ole2/SIdChain.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/SIdChain.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/ole2/SIdChain.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/package-info.java b/common/common-io/src/main/java/com/twelvemonkeys/io/ole2/package-info.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/package-info.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/ole2/package-info.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/package_info.java b/common/common-io/src/main/java/com/twelvemonkeys/io/package_info.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/package_info.java
rename to common/common-io/src/main/java/com/twelvemonkeys/io/package_info.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/AuthenticatorFilter.java b/common/common-io/src/main/java/com/twelvemonkeys/net/AuthenticatorFilter.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/AuthenticatorFilter.java
rename to common/common-io/src/main/java/com/twelvemonkeys/net/AuthenticatorFilter.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/HttpURLConnection.java b/common/common-io/src/main/java/com/twelvemonkeys/net/HttpURLConnection.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/HttpURLConnection.java
rename to common/common-io/src/main/java/com/twelvemonkeys/net/HttpURLConnection.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/MIMEUtil.java b/common/common-io/src/main/java/com/twelvemonkeys/net/MIMEUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/MIMEUtil.java
rename to common/common-io/src/main/java/com/twelvemonkeys/net/MIMEUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/NetUtil.java b/common/common-io/src/main/java/com/twelvemonkeys/net/NetUtil.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/NetUtil.java
rename to common/common-io/src/main/java/com/twelvemonkeys/net/NetUtil.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/PasswordAuthenticator.java b/common/common-io/src/main/java/com/twelvemonkeys/net/PasswordAuthenticator.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/PasswordAuthenticator.java
rename to common/common-io/src/main/java/com/twelvemonkeys/net/PasswordAuthenticator.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/SimpleAuthenticator.java b/common/common-io/src/main/java/com/twelvemonkeys/net/SimpleAuthenticator.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/SimpleAuthenticator.java
rename to common/common-io/src/main/java/com/twelvemonkeys/net/SimpleAuthenticator.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/package_info.java b/common/common-io/src/main/java/com/twelvemonkeys/net/package_info.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/package_info.java
rename to common/common-io/src/main/java/com/twelvemonkeys/net/package_info.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/xml/DOMSerializer.java b/common/common-io/src/main/java/com/twelvemonkeys/xml/DOMSerializer.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/xml/DOMSerializer.java
rename to common/common-io/src/main/java/com/twelvemonkeys/xml/DOMSerializer.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/xml/XMLSerializer.java b/common/common-io/src/main/java/com/twelvemonkeys/xml/XMLSerializer.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/xml/XMLSerializer.java
rename to common/common-io/src/main/java/com/twelvemonkeys/xml/XMLSerializer.java
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/xml/package_info.java b/common/common-io/src/main/java/com/twelvemonkeys/xml/package_info.java
similarity index 100%
rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/xml/package_info.java
rename to common/common-io/src/main/java/com/twelvemonkeys/xml/package_info.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/CompoundReaderTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/CompoundReaderTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/CompoundReaderTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/CompoundReaderTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/FastByteArrayOutputStreamTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/FastByteArrayOutputStreamTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/FastByteArrayOutputStreamTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/FastByteArrayOutputStreamTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/FileCacheSeekableStreamTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/FileCacheSeekableStreamTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/FileCacheSeekableStreamTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/FileCacheSeekableStreamTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/FileSeekableStreamTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/FileSeekableStreamTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/FileSeekableStreamTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/FileSeekableStreamTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/InputStreamAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/InputStreamAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/InputStreamAbstractTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/InputStreamAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/MemoryCacheSeekableStreamTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/MemoryCacheSeekableStreamTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/MemoryCacheSeekableStreamTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/MemoryCacheSeekableStreamTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/OutputStreamAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/OutputStreamAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/OutputStreamAbstractTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/OutputStreamAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/ReaderAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/ReaderAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/ReaderAbstractTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/ReaderAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/SeekableAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/SeekableAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/SeekableAbstractTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/SeekableAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/SeekableInputStreamAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/SeekableInputStreamAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/SeekableInputStreamAbstractTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/SeekableInputStreamAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/SeekableInterfaceTest.java b/common/common-io/src/test/java/com/twelvemonkeys/io/SeekableInterfaceTest.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/SeekableInterfaceTest.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/SeekableInterfaceTest.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/StringArrayReaderTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/StringArrayReaderTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/StringArrayReaderTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/StringArrayReaderTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/Base64DecoderTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/Base64DecoderTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/Base64DecoderTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/enc/Base64DecoderTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/Base64EncoderTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/Base64EncoderTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/Base64EncoderTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/enc/Base64EncoderTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/DecoderAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/DecoderAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/DecoderAbstractTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/enc/DecoderAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/EncoderAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/EncoderAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/EncoderAbstractTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/enc/EncoderAbstractTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/PackBitsDecoderTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/PackBitsDecoderTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/PackBitsDecoderTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/enc/PackBitsDecoderTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/PackBitsEncoderTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/PackBitsEncoderTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/PackBitsEncoderTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/enc/PackBitsEncoderTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/ole2/CompoundDocumentTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/ole2/CompoundDocumentTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/ole2/CompoundDocumentTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/io/ole2/CompoundDocumentTestCase.java
diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/net/NetUtilTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/net/NetUtilTestCase.java
similarity index 100%
rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/net/NetUtilTestCase.java
rename to common/common-io/src/test/java/com/twelvemonkeys/net/NetUtilTestCase.java
diff --git a/twelvemonkeys-core/src/test/resources/Thumbs-camera.db b/common/common-io/src/test/resources/Thumbs-camera.db
similarity index 100%
rename from twelvemonkeys-core/src/test/resources/Thumbs-camera.db
rename to common/common-io/src/test/resources/Thumbs-camera.db