diff --git a/twelvemonkeys-imageio/batik/license.txt b/imageio/imageio-batik/license.txt
similarity index 100%
rename from twelvemonkeys-imageio/batik/license.txt
rename to imageio/imageio-batik/license.txt
diff --git a/twelvemonkeys-imageio/batik/pom.xml b/imageio/imageio-batik/pom.xml
similarity index 100%
rename from twelvemonkeys-imageio/batik/pom.xml
rename to imageio/imageio-batik/pom.xml
diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java
rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java
diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderSpi.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderSpi.java
rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGReadParam.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGReadParam.java
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGReadParam.java
rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGReadParam.java
diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderSpi.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderSpi.java
rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java
rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java
diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriterSpi.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriterSpi.java
rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMF.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMF.java
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMF.java
rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMF.java
diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReader.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReader.java
rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReader.java
diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderSpi.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderSpi.java
rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
rename to imageio/imageio-batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
diff --git a/twelvemonkeys-imageio/batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi b/imageio/imageio-batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi
rename to imageio/imageio-batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi
diff --git a/twelvemonkeys-imageio/batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTestCase.java b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTestCase.java
rename to imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTestCase.java
diff --git a/twelvemonkeys-imageio/batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTestCase.java b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTestCase.java
rename to imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTestCase.java
diff --git a/twelvemonkeys-imageio/batik/src/test/resources/svg/batikLogo.svg b/imageio/imageio-batik/src/test/resources/svg/batikLogo.svg
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/test/resources/svg/batikLogo.svg
rename to imageio/imageio-batik/src/test/resources/svg/batikLogo.svg
diff --git a/twelvemonkeys-imageio/batik/src/test/resources/wmf/test.wmf b/imageio/imageio-batik/src/test/resources/wmf/test.wmf
similarity index 100%
rename from twelvemonkeys-imageio/batik/src/test/resources/wmf/test.wmf
rename to imageio/imageio-batik/src/test/resources/wmf/test.wmf
diff --git a/twelvemonkeys-imageio/core/license.txt b/imageio/imageio-core/license.txt
similarity index 100%
rename from twelvemonkeys-imageio/core/license.txt
rename to imageio/imageio-core/license.txt
diff --git a/twelvemonkeys-imageio/core/pom.xml b/imageio/imageio-core/pom.xml
similarity index 100%
rename from twelvemonkeys-imageio/core/pom.xml
rename to imageio/imageio-core/pom.xml
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/ImageReaderBase.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/ImageReaderBase.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/ImageReaderBase.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/ImageReaderBase.java
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/ImageWriterBase.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/ImageWriterBase.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/ImageWriterBase.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/ImageWriterBase.java
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/spi/ProviderInfo.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/spi/ProviderInfo.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/spi/ProviderInfo.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/spi/ProviderInfo.java
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStream.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStream.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStream.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStream.java
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStream.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStream.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStream.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStream.java
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamSpi.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamSpi.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamSpi.java
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/URLImageInputStreamSpi.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/URLImageInputStreamSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/URLImageInputStreamSpi.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/URLImageInputStreamSpi.java
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapter.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapter.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapter.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapter.java
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IIOOutputStreamAdapter.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IIOOutputStreamAdapter.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IIOOutputStreamAdapter.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IIOOutputStreamAdapter.java
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IIOUtil.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IIOUtil.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IIOUtil.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IIOUtil.java
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifier.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifier.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifier.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifier.java
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/ProgressListenerBase.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/ProgressListenerBase.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/ProgressListenerBase.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/ProgressListenerBase.java
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/ReaderFileSuffixFilter.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/ReaderFileSuffixFilter.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/ReaderFileSuffixFilter.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/ReaderFileSuffixFilter.java
diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/WriterFileSuffixFilter.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/WriterFileSuffixFilter.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/WriterFileSuffixFilter.java
rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/WriterFileSuffixFilter.java
diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/spi/ProviderInfoTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/spi/ProviderInfoTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/spi/ProviderInfoTestCase.java
rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/spi/ProviderInfoTestCase.java
diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStreamTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStreamTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStreamTestCase.java
rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStreamTestCase.java
diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamTestCase.java
rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamTestCase.java
diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapterTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapterTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapterTestCase.java
rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapterTestCase.java
diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java
rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java
diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTestCase.java
rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTestCase.java
diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifierTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifierTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifierTestCase.java
rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifierTestCase.java
diff --git a/twelvemonkeys-imageio/core/src/test/resources/Thumbs-camera.db b/imageio/imageio-core/src/test/resources/Thumbs-camera.db
similarity index 100%
rename from twelvemonkeys-imageio/core/src/test/resources/Thumbs-camera.db
rename to imageio/imageio-core/src/test/resources/Thumbs-camera.db
diff --git a/twelvemonkeys-imageio/core/todo.txt b/imageio/imageio-core/todo.txt
similarity index 100%
rename from twelvemonkeys-imageio/core/todo.txt
rename to imageio/imageio-core/todo.txt
diff --git a/twelvemonkeys-imageio/ico/license.txt b/imageio/imageio-ico/license.txt
similarity index 100%
rename from twelvemonkeys-imageio/ico/license.txt
rename to imageio/imageio-ico/license.txt
diff --git a/twelvemonkeys-imageio/ico/pom.xml b/imageio/imageio-ico/pom.xml
similarity index 100%
rename from twelvemonkeys-imageio/ico/pom.xml
rename to imageio/imageio-ico/pom.xml
diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapDescriptor.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapDescriptor.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapDescriptor.java
rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapDescriptor.java
diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapIndexed.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapIndexed.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapIndexed.java
rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapIndexed.java
diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapMask.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapMask.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapMask.java
rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapMask.java
diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapRGB.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapRGB.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapRGB.java
rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapRGB.java
diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapUnsupported.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapUnsupported.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapUnsupported.java
rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapUnsupported.java
diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReader.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReader.java
rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReader.java
diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderSpi.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderSpi.java
rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIB.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIB.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIB.java
rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIB.java
diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIBHeader.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIBHeader.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIBHeader.java
rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIBHeader.java
diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/Directory.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/Directory.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/Directory.java
rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/Directory.java
diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DirectoryEntry.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DirectoryEntry.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DirectoryEntry.java
rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DirectoryEntry.java
diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReader.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReader.java
rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReader.java
diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderSpi.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderSpi.java
rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/ico/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-ico/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
rename to imageio/imageio-ico/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
diff --git a/twelvemonkeys-imageio/ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderTestCase.java b/imageio/imageio-ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderTestCase.java
rename to imageio/imageio-ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderTestCase.java
diff --git a/twelvemonkeys-imageio/ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderTestCase.java b/imageio/imageio-ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderTestCase.java
rename to imageio/imageio-ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderTestCase.java
diff --git a/twelvemonkeys-imageio/ico/src/test/resources/cur/hand.cur b/imageio/imageio-ico/src/test/resources/cur/hand.cur
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/test/resources/cur/hand.cur
rename to imageio/imageio-ico/src/test/resources/cur/hand.cur
diff --git a/twelvemonkeys-imageio/ico/src/test/resources/cur/zoom.cur b/imageio/imageio-ico/src/test/resources/cur/zoom.cur
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/test/resources/cur/zoom.cur
rename to imageio/imageio-ico/src/test/resources/cur/zoom.cur
diff --git a/twelvemonkeys-imageio/ico/src/test/resources/ico/JavaCup.ico b/imageio/imageio-ico/src/test/resources/ico/JavaCup.ico
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/test/resources/ico/JavaCup.ico
rename to imageio/imageio-ico/src/test/resources/ico/JavaCup.ico
diff --git a/twelvemonkeys-imageio/ico/src/test/resources/ico/colors.ico b/imageio/imageio-ico/src/test/resources/ico/colors.ico
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/test/resources/ico/colors.ico
rename to imageio/imageio-ico/src/test/resources/ico/colors.ico
diff --git a/twelvemonkeys-imageio/ico/src/test/resources/ico/down.ico b/imageio/imageio-ico/src/test/resources/ico/down.ico
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/test/resources/ico/down.ico
rename to imageio/imageio-ico/src/test/resources/ico/down.ico
diff --git a/twelvemonkeys-imageio/ico/src/test/resources/ico/favicon.ico b/imageio/imageio-ico/src/test/resources/ico/favicon.ico
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/test/resources/ico/favicon.ico
rename to imageio/imageio-ico/src/test/resources/ico/favicon.ico
diff --git a/twelvemonkeys-imageio/ico/src/test/resources/ico/joypad.ico b/imageio/imageio-ico/src/test/resources/ico/joypad.ico
similarity index 100%
rename from twelvemonkeys-imageio/ico/src/test/resources/ico/joypad.ico
rename to imageio/imageio-ico/src/test/resources/ico/joypad.ico
diff --git a/twelvemonkeys-imageio/ico/todo.txt b/imageio/imageio-ico/todo.txt
similarity index 100%
rename from twelvemonkeys-imageio/ico/todo.txt
rename to imageio/imageio-ico/todo.txt
diff --git a/twelvemonkeys-imageio/iff/license.txt b/imageio/imageio-iff/license.txt
similarity index 100%
rename from twelvemonkeys-imageio/iff/license.txt
rename to imageio/imageio-iff/license.txt
diff --git a/twelvemonkeys-imageio/iff/pom.xml b/imageio/imageio-iff/pom.xml
similarity index 100%
rename from twelvemonkeys-imageio/iff/pom.xml
rename to imageio/imageio-iff/pom.xml
diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BMHDChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BMHDChunk.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BMHDChunk.java
rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BMHDChunk.java
diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BODYChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BODYChunk.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BODYChunk.java
rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BODYChunk.java
diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CAMGChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CAMGChunk.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CAMGChunk.java
rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CAMGChunk.java
diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CMAPChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CMAPChunk.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CMAPChunk.java
rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CMAPChunk.java
diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GRABChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GRABChunk.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GRABChunk.java
rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GRABChunk.java
diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GenericChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GenericChunk.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GenericChunk.java
rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GenericChunk.java
diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFF.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFF.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFF.java
rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFF.java
diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFChunk.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFChunk.java
rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFChunk.java
diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReader.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReader.java
rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReader.java
diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderSpi.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderSpi.java
rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriter.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriter.java
rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriter.java
diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriterSpi.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriterSpi.java
rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFUtil.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFUtil.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFUtil.java
rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFUtil.java
diff --git a/twelvemonkeys-imageio/iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
rename to imageio/imageio-iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
diff --git a/twelvemonkeys-imageio/iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi b/imageio/imageio-iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi
rename to imageio/imageio-iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi
diff --git a/twelvemonkeys-imageio/iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTestCase.java b/imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTestCase.java
rename to imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTestCase.java
diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/A4000T_HAM6.IFF b/imageio/imageio-iff/src/test/resources/iff/A4000T_HAM6.IFF
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/test/resources/iff/A4000T_HAM6.IFF
rename to imageio/imageio-iff/src/test/resources/iff/A4000T_HAM6.IFF
diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/A4000T_HAM8.IFF b/imageio/imageio-iff/src/test/resources/iff/A4000T_HAM8.IFF
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/test/resources/iff/A4000T_HAM8.IFF
rename to imageio/imageio-iff/src/test/resources/iff/A4000T_HAM8.IFF
diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/Abyss.iff b/imageio/imageio-iff/src/test/resources/iff/Abyss.iff
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/test/resources/iff/Abyss.iff
rename to imageio/imageio-iff/src/test/resources/iff/Abyss.iff
diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/AmigaAmiga.iff b/imageio/imageio-iff/src/test/resources/iff/AmigaAmiga.iff
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/test/resources/iff/AmigaAmiga.iff
rename to imageio/imageio-iff/src/test/resources/iff/AmigaAmiga.iff
diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/AmigaBig.iff b/imageio/imageio-iff/src/test/resources/iff/AmigaBig.iff
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/test/resources/iff/AmigaBig.iff
rename to imageio/imageio-iff/src/test/resources/iff/AmigaBig.iff
diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/survivor.iff b/imageio/imageio-iff/src/test/resources/iff/survivor.iff
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/test/resources/iff/survivor.iff
rename to imageio/imageio-iff/src/test/resources/iff/survivor.iff
diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/test.iff b/imageio/imageio-iff/src/test/resources/iff/test.iff
similarity index 100%
rename from twelvemonkeys-imageio/iff/src/test/resources/iff/test.iff
rename to imageio/imageio-iff/src/test/resources/iff/test.iff
diff --git a/twelvemonkeys-imageio/iff/todo.txt b/imageio/imageio-iff/todo.txt
similarity index 100%
rename from twelvemonkeys-imageio/iff/todo.txt
rename to imageio/imageio-iff/todo.txt
diff --git a/twelvemonkeys-imageio/jmagick/license.txt b/imageio/imageio-jmagick/license.txt
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/license.txt
rename to imageio/imageio-jmagick/license.txt
diff --git a/twelvemonkeys-imageio/jmagick/pom.xml b/imageio/imageio-jmagick/pom.xml
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/pom.xml
rename to imageio/imageio-jmagick/pom.xml
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriter.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriter.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriterSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriter.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriter.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriterSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriter.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriter.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriterSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagick.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagick.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagick.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagick.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderSpiSupport.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderSpiSupport.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderSpiSupport.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderSpiSupport.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageWriterSpiSupport.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageWriterSpiSupport.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageWriterSpiSupport.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageWriterSpiSupport.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickWriter.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickWriter.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriter.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriter.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriterSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriter.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriter.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriterSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriter.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriter.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriterSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriter.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriter.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriterSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriter.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriter.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriterSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriter.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriter.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriterSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriter.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriter.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriterSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriter.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriter.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriterSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReader.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReader.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReaderSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriter.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriter.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriterSpi.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/package_info.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/package_info.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/package_info.java
rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/package_info.java
diff --git a/twelvemonkeys-imageio/jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
rename to imageio/imageio-jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
diff --git a/twelvemonkeys-imageio/jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi b/imageio/imageio-jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi
rename to imageio/imageio-jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi
diff --git a/twelvemonkeys-imageio/jmagick/src/main/resources/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.properties b/imageio/imageio-jmagick/src/main/resources/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.properties
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/main/resources/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.properties
rename to imageio/imageio-jmagick/src/main/resources/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.properties
diff --git a/twelvemonkeys-imageio/jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderTestCase.java b/imageio/imageio-jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderTestCase.java
rename to imageio/imageio-jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderTestCase.java
diff --git a/twelvemonkeys-imageio/jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderAbstractTestCase.java b/imageio/imageio-jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderAbstractTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderAbstractTestCase.java
rename to imageio/imageio-jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderAbstractTestCase.java
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/Blue Lace 16.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/Blue Lace 16.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/Blue Lace 16.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/Blue Lace 16.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16_bitmask444.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16_bitmask444.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16_bitmask444.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16_bitmask444.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16_bitmask555.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16_bitmask555.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16_bitmask555.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16_bitmask555.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16_bitmask565.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16_bitmask565.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16_bitmask565.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16_bitmask565.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_24.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_24.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_24.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_24.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_32.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_32.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_32.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_32.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_32_bitmask888.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_32_bitmask888.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_32_bitmask888.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_32_bitmask888.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_32_bitmask888_reversed.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_32_bitmask888_reversed.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_32_bitmask888_reversed.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_32_bitmask888_reversed.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_4-IM.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_4-IM.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_4-IM.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_4-IM.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_4.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_4.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_4.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_4.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_4.rle b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_4.rle
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_4.rle
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_4.rle
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_8-IM.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_8-IM.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_8-IM.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_8-IM.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_8.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_8.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_8.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_8.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_8.rle b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_8.rle
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_8.rle
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_8.rle
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_gray.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_gray.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_gray.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_gray.bmp
diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_mono.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_mono.bmp
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_mono.bmp
rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_mono.bmp
diff --git a/twelvemonkeys-imageio/jmagick/todo.txt b/imageio/imageio-jmagick/todo.txt
similarity index 100%
rename from twelvemonkeys-imageio/jmagick/todo.txt
rename to imageio/imageio-jmagick/todo.txt
diff --git a/twelvemonkeys-imageio/pdf/license.txt b/imageio/imageio-pdf/license.txt
similarity index 100%
rename from twelvemonkeys-imageio/pdf/license.txt
rename to imageio/imageio-pdf/license.txt
diff --git a/twelvemonkeys-imageio/pdf/pom.xml b/imageio/imageio-pdf/pom.xml
similarity index 100%
rename from twelvemonkeys-imageio/pdf/pom.xml
rename to imageio/imageio-pdf/pom.xml
diff --git a/twelvemonkeys-imageio/pdf/todo.txt b/imageio/imageio-pdf/todo.txt
similarity index 100%
rename from twelvemonkeys-imageio/pdf/todo.txt
rename to imageio/imageio-pdf/todo.txt
diff --git a/twelvemonkeys-imageio/pict/license.txt b/imageio/imageio-pict/license.txt
similarity index 100%
rename from twelvemonkeys-imageio/pict/license.txt
rename to imageio/imageio-pict/license.txt
diff --git a/twelvemonkeys-imageio/pict/pom.xml b/imageio/imageio-pict/pom.xml
similarity index 100%
rename from twelvemonkeys-imageio/pict/pom.xml
rename to imageio/imageio-pict/pom.xml
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/BitMapPattern.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/BitMapPattern.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/BitMapPattern.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/BitMapPattern.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICT.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICT.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICT.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICT.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriter.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriter.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriter.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriter.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriterSpi.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriterSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriterSpi.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriterSpi.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTUtil.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTUtil.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTUtil.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTUtil.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/Pattern.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/Pattern.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/Pattern.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/Pattern.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PenState.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PenState.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PenState.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PenState.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PixMapPattern.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PixMapPattern.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PixMapPattern.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PixMapPattern.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QDTest.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QDTest.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QDTest.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QDTest.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTBMPDecompressor.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTBMPDecompressor.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTBMPDecompressor.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTBMPDecompressor.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTDecompressor.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTDecompressor.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTDecompressor.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTDecompressor.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTGenericDecompressor.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTGenericDecompressor.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTGenericDecompressor.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTGenericDecompressor.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTRAWDecompressor.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTRAWDecompressor.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTRAWDecompressor.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTRAWDecompressor.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDraw.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDraw.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDraw.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDraw.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDrawContext.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDrawContext.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDrawContext.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDrawContext.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickTime.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickTime.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickTime.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickTime.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/RGBColor.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/RGBColor.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/RGBColor.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/RGBColor.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTClippingApp.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTClippingApp.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTClippingApp.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTClippingApp.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTEagerDetect.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTEagerDetect.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTEagerDetect.java
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTEagerDetect.java
diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/plpictdec.cpp b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/plpictdec.cpp
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/plpictdec.cpp
rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/plpictdec.cpp
diff --git a/twelvemonkeys-imageio/pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
rename to imageio/imageio-pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
diff --git a/twelvemonkeys-imageio/pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi b/imageio/imageio-pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi
rename to imageio/imageio-pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi
diff --git a/twelvemonkeys-imageio/pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTestCase.java b/imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTestCase.java
rename to imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTestCase.java
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/jpeg/R-7439-1151526181.jpeg b/imageio/imageio-pict/src/test/resources/jpeg/R-7439-1151526181.jpeg
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/jpeg/R-7439-1151526181.jpeg
rename to imageio/imageio-pict/src/test/resources/jpeg/R-7439-1151526181.jpeg
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/1.pict b/imageio/imageio-pict/src/test/resources/pict/1.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/1.pict
rename to imageio/imageio-pict/src/test/resources/pict/1.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/16bit.pict b/imageio/imageio-pict/src/test/resources/pict/16bit.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/16bit.pict
rename to imageio/imageio-pict/src/test/resources/pict/16bit.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/2.pict b/imageio/imageio-pict/src/test/resources/pict/2.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/2.pict
rename to imageio/imageio-pict/src/test/resources/pict/2.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/32bit.pict b/imageio/imageio-pict/src/test/resources/pict/32bit.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/32bit.pict
rename to imageio/imageio-pict/src/test/resources/pict/32bit.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/4.pict b/imageio/imageio-pict/src/test/resources/pict/4.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/4.pict
rename to imageio/imageio-pict/src/test/resources/pict/4.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/5.pict b/imageio/imageio-pict/src/test/resources/pict/5.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/5.pict
rename to imageio/imageio-pict/src/test/resources/pict/5.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/6.pict b/imageio/imageio-pict/src/test/resources/pict/6.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/6.pict
rename to imageio/imageio-pict/src/test/resources/pict/6.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/7.pict b/imageio/imageio-pict/src/test/resources/pict/7.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/7.pict
rename to imageio/imageio-pict/src/test/resources/pict/7.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/8.pict b/imageio/imageio-pict/src/test/resources/pict/8.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/8.pict
rename to imageio/imageio-pict/src/test/resources/pict/8.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/9.pict b/imageio/imageio-pict/src/test/resources/pict/9.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/9.pict
rename to imageio/imageio-pict/src/test/resources/pict/9.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/BLK.PCT b/imageio/imageio-pict/src/test/resources/pict/BLK.PCT
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/BLK.PCT
rename to imageio/imageio-pict/src/test/resources/pict/BLK.PCT
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/BLU.PCT b/imageio/imageio-pict/src/test/resources/pict/BLU.PCT
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/BLU.PCT
rename to imageio/imageio-pict/src/test/resources/pict/BLU.PCT
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/EDUC0052.pict b/imageio/imageio-pict/src/test/resources/pict/EDUC0052.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/EDUC0052.pict
rename to imageio/imageio-pict/src/test/resources/pict/EDUC0052.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/FLAG_B24.PCT b/imageio/imageio-pict/src/test/resources/pict/FLAG_B24.PCT
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/FLAG_B24.PCT
rename to imageio/imageio-pict/src/test/resources/pict/FLAG_B24.PCT
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/GRN.PCT b/imageio/imageio-pict/src/test/resources/pict/GRN.PCT
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/GRN.PCT
rename to imageio/imageio-pict/src/test/resources/pict/GRN.PCT
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/MARBLES.PCT b/imageio/imageio-pict/src/test/resources/pict/MARBLES.PCT
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/MARBLES.PCT
rename to imageio/imageio-pict/src/test/resources/pict/MARBLES.PCT
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/RED.PCT b/imageio/imageio-pict/src/test/resources/pict/RED.PCT
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/RED.PCT
rename to imageio/imageio-pict/src/test/resources/pict/RED.PCT
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/TRU256.PCT b/imageio/imageio-pict/src/test/resources/pict/TRU256.PCT
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/TRU256.PCT
rename to imageio/imageio-pict/src/test/resources/pict/TRU256.PCT
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/VENUS.PCT b/imageio/imageio-pict/src/test/resources/pict/VENUS.PCT
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/VENUS.PCT
rename to imageio/imageio-pict/src/test/resources/pict/VENUS.PCT
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/WHT.PCT b/imageio/imageio-pict/src/test/resources/pict/WHT.PCT
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/WHT.PCT
rename to imageio/imageio-pict/src/test/resources/pict/WHT.PCT
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/YEL.PCT b/imageio/imageio-pict/src/test/resources/pict/YEL.PCT
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/YEL.PCT
rename to imageio/imageio-pict/src/test/resources/pict/YEL.PCT
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/carte.pict b/imageio/imageio-pict/src/test/resources/pict/carte.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/carte.pict
rename to imageio/imageio-pict/src/test/resources/pict/carte.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/demo.pict b/imageio/imageio-pict/src/test/resources/pict/demo.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/demo.pict
rename to imageio/imageio-pict/src/test/resources/pict/demo.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/foo.pict b/imageio/imageio-pict/src/test/resources/pict/foo.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/foo.pict
rename to imageio/imageio-pict/src/test/resources/pict/foo.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/food.pct b/imageio/imageio-pict/src/test/resources/pict/food.pct
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/food.pct
rename to imageio/imageio-pict/src/test/resources/pict/food.pct
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/mire16.pict b/imageio/imageio-pict/src/test/resources/pict/mire16.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/mire16.pict
rename to imageio/imageio-pict/src/test/resources/pict/mire16.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/mire32.pict b/imageio/imageio-pict/src/test/resources/pict/mire32.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/mire32.pict
rename to imageio/imageio-pict/src/test/resources/pict/mire32.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/oom.pict b/imageio/imageio-pict/src/test/resources/pict/oom.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/oom.pict
rename to imageio/imageio-pict/src/test/resources/pict/oom.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/qt_bmp.pict b/imageio/imageio-pict/src/test/resources/pict/qt_bmp.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/qt_bmp.pict
rename to imageio/imageio-pict/src/test/resources/pict/qt_bmp.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/qt_jpeg.pict b/imageio/imageio-pict/src/test/resources/pict/qt_jpeg.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/qt_jpeg.pict
rename to imageio/imageio-pict/src/test/resources/pict/qt_jpeg.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/qt_mire.pict b/imageio/imageio-pict/src/test/resources/pict/qt_mire.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/qt_mire.pict
rename to imageio/imageio-pict/src/test/resources/pict/qt_mire.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/qt_png.pict b/imageio/imageio-pict/src/test/resources/pict/qt_png.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/qt_png.pict
rename to imageio/imageio-pict/src/test/resources/pict/qt_png.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/qt_tiff.pict b/imageio/imageio-pict/src/test/resources/pict/qt_tiff.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/qt_tiff.pict
rename to imageio/imageio-pict/src/test/resources/pict/qt_tiff.pict
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/test.pct b/imageio/imageio-pict/src/test/resources/pict/test.pct
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/test.pct
rename to imageio/imageio-pict/src/test/resources/pict/test.pct
diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/u2.pict b/imageio/imageio-pict/src/test/resources/pict/u2.pict
similarity index 100%
rename from twelvemonkeys-imageio/pict/src/test/resources/pict/u2.pict
rename to imageio/imageio-pict/src/test/resources/pict/u2.pict
diff --git a/twelvemonkeys-imageio/psd/license.txt b/imageio/imageio-psd/license.txt
similarity index 100%
rename from twelvemonkeys-imageio/psd/license.txt
rename to imageio/imageio-psd/license.txt
diff --git a/twelvemonkeys-imageio/psd/pom.xml b/imageio/imageio-psd/pom.xml
similarity index 100%
rename from twelvemonkeys-imageio/psd/pom.xml
rename to imageio/imageio-psd/pom.xml
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/CMYKColorSpace.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/CMYKColorSpace.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/CMYKColorSpace.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/CMYKColorSpace.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/ICCProfile.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/ICCProfile.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/ICCProfile.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/ICCProfile.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSD.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSD.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSD.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSD.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDAlphaChannelInfo.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDAlphaChannelInfo.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDAlphaChannelInfo.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDAlphaChannelInfo.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelInfo.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelInfo.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelInfo.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelInfo.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelSourceDestinationRange.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelSourceDestinationRange.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelSourceDestinationRange.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelSourceDestinationRange.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDColorData.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDColorData.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDColorData.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDColorData.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDDisplayInfo.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDDisplayInfo.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDDisplayInfo.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDDisplayInfo.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDEXIF1Data.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDEXIF1Data.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDEXIF1Data.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDEXIF1Data.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDGlobalLayerMask.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDGlobalLayerMask.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDGlobalLayerMask.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDGlobalLayerMask.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDHeader.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDHeader.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDHeader.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDHeader.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderSpi.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderSpi.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageResource.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageResource.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageResource.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageResource.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerBlendMode.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerBlendMode.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerBlendMode.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerBlendMode.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerInfo.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerInfo.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerInfo.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerInfo.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerMaskData.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerMaskData.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerMaskData.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerMaskData.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadata.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadata.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadata.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadata.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadataFormat.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadataFormat.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadataFormat.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadataFormat.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlags.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlags.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlags.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlags.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlagsInformation.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlagsInformation.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlagsInformation.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlagsInformation.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDResolutionInfo.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDResolutionInfo.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDResolutionInfo.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDResolutionInfo.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDThumbnail.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDThumbnail.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDThumbnail.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDThumbnail.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDUtil.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDUtil.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDUtil.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDUtil.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDVersionInfo.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDVersionInfo.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDVersionInfo.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDVersionInfo.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDXMPData.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDXMPData.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDXMPData.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDXMPData.java
diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/YCbCrColorSpace.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/YCbCrColorSpace.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/YCbCrColorSpace.java
rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/YCbCrColorSpace.java
diff --git a/twelvemonkeys-imageio/psd/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-psd/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
rename to imageio/imageio-psd/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
diff --git a/twelvemonkeys-imageio/psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java b/imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java
rename to imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/AlphaChannelSample_720x480.psd b/imageio/imageio-psd/src/test/resources/psd/AlphaChannelSample_720x480.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/AlphaChannelSample_720x480.psd
rename to imageio/imageio-psd/src/test/resources/psd/AlphaChannelSample_720x480.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/MARBLES.PSD b/imageio/imageio-psd/src/test/resources/psd/MARBLES.PSD
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/MARBLES.PSD
rename to imageio/imageio-psd/src/test/resources/psd/MARBLES.PSD
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/buttons.psd b/imageio/imageio-psd/src/test/resources/psd/buttons.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/buttons.psd
rename to imageio/imageio-psd/src/test/resources/psd/buttons.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/circles.psd b/imageio/imageio-psd/src/test/resources/psd/circles.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/circles.psd
rename to imageio/imageio-psd/src/test/resources/psd/circles.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/cmyk_16bits.psd b/imageio/imageio-psd/src/test/resources/psd/cmyk_16bits.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/cmyk_16bits.psd
rename to imageio/imageio-psd/src/test/resources/psd/cmyk_16bits.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/cmyk_8bits.psd b/imageio/imageio-psd/src/test/resources/psd/cmyk_8bits.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/cmyk_8bits.psd
rename to imageio/imageio-psd/src/test/resources/psd/cmyk_8bits.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/coral_fish.psd b/imageio/imageio-psd/src/test/resources/psd/coral_fish.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/coral_fish.psd
rename to imageio/imageio-psd/src/test/resources/psd/coral_fish.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/escenic-liquid-logo.psd b/imageio/imageio-psd/src/test/resources/psd/escenic-liquid-logo.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/escenic-liquid-logo.psd
rename to imageio/imageio-psd/src/test/resources/psd/escenic-liquid-logo.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/jugware-icon.psd b/imageio/imageio-psd/src/test/resources/psd/jugware-icon.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/jugware-icon.psd
rename to imageio/imageio-psd/src/test/resources/psd/jugware-icon.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/photoshopping.psd b/imageio/imageio-psd/src/test/resources/psd/photoshopping.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/photoshopping.psd
rename to imageio/imageio-psd/src/test/resources/psd/photoshopping.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/test_bitmap.psd b/imageio/imageio-psd/src/test/resources/psd/test_bitmap.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/test_bitmap.psd
rename to imageio/imageio-psd/src/test/resources/psd/test_bitmap.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/test_gray.psd b/imageio/imageio-psd/src/test/resources/psd/test_gray.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/test_gray.psd
rename to imageio/imageio-psd/src/test/resources/psd/test_gray.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/test_gray16.psd b/imageio/imageio-psd/src/test/resources/psd/test_gray16.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/test_gray16.psd
rename to imageio/imageio-psd/src/test/resources/psd/test_gray16.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/test_indexed.psd b/imageio/imageio-psd/src/test/resources/psd/test_indexed.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/test_indexed.psd
rename to imageio/imageio-psd/src/test/resources/psd/test_indexed.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/test_original.psb b/imageio/imageio-psd/src/test/resources/psd/test_original.psb
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/test_original.psb
rename to imageio/imageio-psd/src/test/resources/psd/test_original.psb
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/test_original.psd b/imageio/imageio-psd/src/test/resources/psd/test_original.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/test_original.psd
rename to imageio/imageio-psd/src/test/resources/psd/test_original.psd
diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/transp.psd b/imageio/imageio-psd/src/test/resources/psd/transp.psd
similarity index 100%
rename from twelvemonkeys-imageio/psd/src/test/resources/psd/transp.psd
rename to imageio/imageio-psd/src/test/resources/psd/transp.psd
diff --git a/twelvemonkeys-imageio/psd/todo.txt b/imageio/imageio-psd/todo.txt
similarity index 100%
rename from twelvemonkeys-imageio/psd/todo.txt
rename to imageio/imageio-psd/todo.txt
diff --git a/twelvemonkeys-imageio/reference/license.txt b/imageio/imageio-reference/license.txt
similarity index 100%
rename from twelvemonkeys-imageio/reference/license.txt
rename to imageio/imageio-reference/license.txt
diff --git a/twelvemonkeys-imageio/reference/pom.xml b/imageio/imageio-reference/pom.xml
similarity index 100%
rename from twelvemonkeys-imageio/reference/pom.xml
rename to imageio/imageio-reference/pom.xml
diff --git a/twelvemonkeys-imageio/reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTestCase.java b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTestCase.java
rename to imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTestCase.java
diff --git a/twelvemonkeys-imageio/reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTestCase.java b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTestCase.java
rename to imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTestCase.java
diff --git a/twelvemonkeys-imageio/reference/src/test/resources/jpeg/R-7439-1151526181.jpeg b/imageio/imageio-reference/src/test/resources/jpeg/R-7439-1151526181.jpeg
similarity index 100%
rename from twelvemonkeys-imageio/reference/src/test/resources/jpeg/R-7439-1151526181.jpeg
rename to imageio/imageio-reference/src/test/resources/jpeg/R-7439-1151526181.jpeg
diff --git a/twelvemonkeys-imageio/reference/src/test/resources/png/12monkeys-splash.png b/imageio/imageio-reference/src/test/resources/png/12monkeys-splash.png
similarity index 100%
rename from twelvemonkeys-imageio/reference/src/test/resources/png/12monkeys-splash.png
rename to imageio/imageio-reference/src/test/resources/png/12monkeys-splash.png
diff --git a/twelvemonkeys-imageio/thumbsdb/license.txt b/imageio/imageio-thumbsdb/license.txt
similarity index 100%
rename from twelvemonkeys-imageio/thumbsdb/license.txt
rename to imageio/imageio-thumbsdb/license.txt
diff --git a/twelvemonkeys-imageio/thumbsdb/pom.xml b/imageio/imageio-thumbsdb/pom.xml
similarity index 100%
rename from twelvemonkeys-imageio/thumbsdb/pom.xml
rename to imageio/imageio-thumbsdb/pom.xml
diff --git a/twelvemonkeys-imageio/thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/Catalog.java b/imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/Catalog.java
similarity index 100%
rename from twelvemonkeys-imageio/thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/Catalog.java
rename to imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/Catalog.java
diff --git a/twelvemonkeys-imageio/thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReader.java b/imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReader.java
similarity index 100%
rename from twelvemonkeys-imageio/thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReader.java
rename to imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReader.java
diff --git a/twelvemonkeys-imageio/thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderSpi.java b/imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderSpi.java
similarity index 100%
rename from twelvemonkeys-imageio/thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderSpi.java
rename to imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderSpi.java
diff --git a/twelvemonkeys-imageio/thumbsdb/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-thumbsdb/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
similarity index 100%
rename from twelvemonkeys-imageio/thumbsdb/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
rename to imageio/imageio-thumbsdb/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi
diff --git a/twelvemonkeys-imageio/thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTestCase.java b/imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTestCase.java
similarity index 100%
rename from twelvemonkeys-imageio/thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTestCase.java
rename to imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTestCase.java
diff --git a/twelvemonkeys-imageio/thumbsdb/src/test/resources/thumbsdb/Thumbs-camera.db b/imageio/imageio-thumbsdb/src/test/resources/thumbsdb/Thumbs-camera.db
similarity index 100%
rename from twelvemonkeys-imageio/thumbsdb/src/test/resources/thumbsdb/Thumbs-camera.db
rename to imageio/imageio-thumbsdb/src/test/resources/thumbsdb/Thumbs-camera.db
diff --git a/twelvemonkeys-imageio/thumbsdb/src/test/resources/thumbsdb/Thumbs.db b/imageio/imageio-thumbsdb/src/test/resources/thumbsdb/Thumbs.db
similarity index 100%
rename from twelvemonkeys-imageio/thumbsdb/src/test/resources/thumbsdb/Thumbs.db
rename to imageio/imageio-thumbsdb/src/test/resources/thumbsdb/Thumbs.db
diff --git a/twelvemonkeys-imageio/thumbsdb/todo.txt b/imageio/imageio-thumbsdb/todo.txt
similarity index 100%
rename from twelvemonkeys-imageio/thumbsdb/todo.txt
rename to imageio/imageio-thumbsdb/todo.txt
diff --git a/twelvemonkeys-imageio/pom.xml b/imageio/pom.xml
similarity index 100%
rename from twelvemonkeys-imageio/pom.xml
rename to imageio/pom.xml
diff --git a/twelvemonkeys-imageio/todo.txt b/imageio/todo.txt
similarity index 100%
rename from twelvemonkeys-imageio/todo.txt
rename to imageio/todo.txt