diff --git a/image_readers/.gitignore b/lib-image-readers/.gitignore
similarity index 100%
rename from image_readers/.gitignore
rename to lib-image-readers/.gitignore
diff --git a/image_readers/build.gradle b/lib-image-readers/build.gradle
similarity index 100%
rename from image_readers/build.gradle
rename to lib-image-readers/build.gradle
diff --git a/image_readers/gradle/wrapper/gradle-wrapper.jar b/lib-image-readers/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from image_readers/gradle/wrapper/gradle-wrapper.jar
rename to lib-image-readers/gradle/wrapper/gradle-wrapper.jar
diff --git a/image_readers/gradle/wrapper/gradle-wrapper.properties b/lib-image-readers/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from image_readers/gradle/wrapper/gradle-wrapper.properties
rename to lib-image-readers/gradle/wrapper/gradle-wrapper.properties
diff --git a/image_readers/gradlew b/lib-image-readers/gradlew
similarity index 100%
rename from image_readers/gradlew
rename to lib-image-readers/gradlew
diff --git a/image_readers/gradlew.bat b/lib-image-readers/gradlew.bat
similarity index 100%
rename from image_readers/gradlew.bat
rename to lib-image-readers/gradlew.bat
diff --git a/image_readers/resource/dependency-structure.ddf b/lib-image-readers/resource/dependency-structure.ddf
similarity index 100%
rename from image_readers/resource/dependency-structure.ddf
rename to lib-image-readers/resource/dependency-structure.ddf
diff --git a/image_readers/resource/manifest/bioformats/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary b/lib-image-readers/resource/manifest/bioformats/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary
similarity index 100%
rename from image_readers/resource/manifest/bioformats/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary
rename to lib-image-readers/resource/manifest/bioformats/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary
diff --git a/image_readers/resource/manifest/ij/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary b/lib-image-readers/resource/manifest/ij/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary
similarity index 100%
rename from image_readers/resource/manifest/ij/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary
rename to lib-image-readers/resource/manifest/ij/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary
diff --git a/image_readers/resource/manifest/imageio/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary b/lib-image-readers/resource/manifest/imageio/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary
similarity index 100%
rename from image_readers/resource/manifest/imageio/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary
rename to lib-image-readers/resource/manifest/imageio/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary
diff --git a/image_readers/resource/manifest/jai/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary b/lib-image-readers/resource/manifest/jai/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary
similarity index 100%
rename from image_readers/resource/manifest/jai/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary
rename to lib-image-readers/resource/manifest/jai/META-INF/services/ch.systemsx.cisd.imagereaders.IImageReaderLibrary
diff --git a/image_readers/settings.gradle b/lib-image-readers/settings.gradle
similarity index 100%
rename from image_readers/settings.gradle
rename to lib-image-readers/settings.gradle
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/AbstractImageReader.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/AbstractImageReader.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/AbstractImageReader.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/AbstractImageReader.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/AbstractMetaDataAwareImageReader.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/AbstractMetaDataAwareImageReader.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/AbstractMetaDataAwareImageReader.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/AbstractMetaDataAwareImageReader.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/IImageReader.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/IImageReader.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/IImageReader.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/IImageReader.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/IImageReaderLibrary.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/IImageReaderLibrary.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/IImageReaderLibrary.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/IImageReaderLibrary.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/IReadParams.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/IReadParams.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/IReadParams.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/IReadParams.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageConvertionUtils.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/ImageConvertionUtils.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageConvertionUtils.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/ImageConvertionUtils.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageID.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/ImageID.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageID.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/ImageID.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderConstants.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderConstants.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderConstants.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderConstants.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderFactory.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderFactory.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderFactory.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderFactory.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/ReadParams.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/ReadParams.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/ReadParams.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/ReadParams.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageProcessor.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageProcessor.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageProcessor.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageProcessor.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageUtils.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageUtils.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageUtils.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageUtils.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsRandomAccessAdapter.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsRandomAccessAdapter.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsRandomAccessAdapter.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsRandomAccessAdapter.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsReaderLibrary.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsReaderLibrary.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsReaderLibrary.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsReaderLibrary.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/DefaultBioformatsImageReader.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/DefaultBioformatsImageReader.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/DefaultBioformatsImageReader.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/DefaultBioformatsImageReader.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/FlexHelper.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/FlexHelper.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/FlexHelper.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/bioformats/FlexHelper.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/ij/ImageJReaderLibrary.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/ij/ImageJReaderLibrary.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/ij/ImageJReaderLibrary.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/ij/ImageJReaderLibrary.java
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/imageio/ImageIOReaderLibrary.java b/lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/imageio/ImageIOReaderLibrary.java
similarity index 100%
rename from image_readers/source/java/ch/systemsx/cisd/imagereaders/imageio/ImageIOReaderLibrary.java
rename to lib-image-readers/source/java/ch/systemsx/cisd/imagereaders/imageio/ImageIOReaderLibrary.java
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/DependencyCheckingTest.java b/lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/DependencyCheckingTest.java
similarity index 100%
rename from image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/DependencyCheckingTest.java
rename to lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/DependencyCheckingTest.java
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageIDTest.java b/lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageIDTest.java
similarity index 100%
rename from image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageIDTest.java
rename to lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageIDTest.java
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderFactoryTest.java b/lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderFactoryTest.java
similarity index 100%
rename from image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderFactoryTest.java
rename to lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderFactoryTest.java
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderTestCase.java b/lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderTestCase.java
similarity index 100%
rename from image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderTestCase.java
rename to lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderTestCase.java
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReadersTestHelper.java b/lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReadersTestHelper.java
similarity index 100%
rename from image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReadersTestHelper.java
rename to lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReadersTestHelper.java
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageExtractor.java b/lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageExtractor.java
similarity index 100%
rename from image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageExtractor.java
rename to lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageExtractor.java
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageViewer.java b/lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageViewer.java
similarity index 100%
rename from image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageViewer.java
rename to lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsImageViewer.java
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsInfo.java b/lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsInfo.java
similarity index 100%
rename from image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsInfo.java
rename to lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsInfo.java
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsMetaDataReadingTest.java b/lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsMetaDataReadingTest.java
similarity index 100%
rename from image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsMetaDataReadingTest.java
rename to lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsMetaDataReadingTest.java
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsReaderLibraryTest.java b/lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsReaderLibraryTest.java
similarity index 100%
rename from image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsReaderLibraryTest.java
rename to lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsReaderLibraryTest.java
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/FlexHelperTest.java b/lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/FlexHelperTest.java
similarity index 100%
rename from image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/FlexHelperTest.java
rename to lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/FlexHelperTest.java
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ij/ImageJReaderLibraryTest.java b/lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ij/ImageJReaderLibraryTest.java
similarity index 100%
rename from image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ij/ImageJReaderLibraryTest.java
rename to lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ij/ImageJReaderLibraryTest.java
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/imageio/ImageIOReaderLibraryTest.java b/lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/imageio/ImageIOReaderLibraryTest.java
similarity index 100%
rename from image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/imageio/ImageIOReaderLibraryTest.java
rename to lib-image-readers/sourceTest/java/ch/systemsx/cisd/imagereaders/imageio/ImageIOReaderLibraryTest.java
diff --git a/image_readers/sourceTest/java/tests.xml b/lib-image-readers/sourceTest/java/tests.xml
similarity index 100%
rename from image_readers/sourceTest/java/tests.xml
rename to lib-image-readers/sourceTest/java/tests.xml
diff --git a/image_readers/sourceTest/resources/images/bioformats/invalid/not-an-image.txt b/lib-image-readers/sourceTest/resources/images/bioformats/invalid/not-an-image.txt
similarity index 100%
rename from image_readers/sourceTest/resources/images/bioformats/invalid/not-an-image.txt
rename to lib-image-readers/sourceTest/resources/images/bioformats/invalid/not-an-image.txt
diff --git a/image_readers/sourceTest/resources/images/bioformats/valid/annapolis.jpg b/lib-image-readers/sourceTest/resources/images/bioformats/valid/annapolis.jpg
similarity index 100%
rename from image_readers/sourceTest/resources/images/bioformats/valid/annapolis.jpg
rename to lib-image-readers/sourceTest/resources/images/bioformats/valid/annapolis.jpg
diff --git a/image_readers/sourceTest/resources/images/bioformats/valid/demo.tif b/lib-image-readers/sourceTest/resources/images/bioformats/valid/demo.tif
similarity index 100%
rename from image_readers/sourceTest/resources/images/bioformats/valid/demo.tif
rename to lib-image-readers/sourceTest/resources/images/bioformats/valid/demo.tif
diff --git a/image_readers/sourceTest/resources/images/bioformats/valid/multi-page.tif b/lib-image-readers/sourceTest/resources/images/bioformats/valid/multi-page.tif
similarity index 100%
rename from image_readers/sourceTest/resources/images/bioformats/valid/multi-page.tif
rename to lib-image-readers/sourceTest/resources/images/bioformats/valid/multi-page.tif
diff --git a/image_readers/sourceTest/resources/images/bioformats/valid/pond.bmp b/lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.bmp
similarity index 100%
rename from image_readers/sourceTest/resources/images/bioformats/valid/pond.bmp
rename to lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.bmp
diff --git a/image_readers/sourceTest/resources/images/bioformats/valid/pond.gif b/lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.gif
similarity index 100%
rename from image_readers/sourceTest/resources/images/bioformats/valid/pond.gif
rename to lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.gif
diff --git a/image_readers/sourceTest/resources/images/bioformats/valid/pond.jpg b/lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.jpg
similarity index 100%
rename from image_readers/sourceTest/resources/images/bioformats/valid/pond.jpg
rename to lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.jpg
diff --git a/image_readers/sourceTest/resources/images/bioformats/valid/pond.pgm b/lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.pgm
similarity index 100%
rename from image_readers/sourceTest/resources/images/bioformats/valid/pond.pgm
rename to lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.pgm
diff --git a/image_readers/sourceTest/resources/images/bioformats/valid/pond.png b/lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.png
similarity index 100%
rename from image_readers/sourceTest/resources/images/bioformats/valid/pond.png
rename to lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.png
diff --git a/image_readers/sourceTest/resources/images/bioformats/valid/pond.ppm b/lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.ppm
similarity index 100%
rename from image_readers/sourceTest/resources/images/bioformats/valid/pond.ppm
rename to lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.ppm
diff --git a/image_readers/sourceTest/resources/images/bioformats/valid/pond.tif b/lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.tif
similarity index 100%
rename from image_readers/sourceTest/resources/images/bioformats/valid/pond.tif
rename to lib-image-readers/sourceTest/resources/images/bioformats/valid/pond.tif
diff --git a/image_readers/sourceTest/resources/images/flex-helper/001001000.flex b/lib-image-readers/sourceTest/resources/images/flex-helper/001001000.flex
similarity index 100%
rename from image_readers/sourceTest/resources/images/flex-helper/001001000.flex
rename to lib-image-readers/sourceTest/resources/images/flex-helper/001001000.flex
diff --git a/image_readers/sourceTest/resources/images/flex-helper/032045000.flex b/lib-image-readers/sourceTest/resources/images/flex-helper/032045000.flex
similarity index 100%
rename from image_readers/sourceTest/resources/images/flex-helper/032045000.flex
rename to lib-image-readers/sourceTest/resources/images/flex-helper/032045000.flex
diff --git a/image_readers/sourceTest/resources/images/ij/invalid/not-an-image.txt b/lib-image-readers/sourceTest/resources/images/ij/invalid/not-an-image.txt
similarity index 100%
rename from image_readers/sourceTest/resources/images/ij/invalid/not-an-image.txt
rename to lib-image-readers/sourceTest/resources/images/ij/invalid/not-an-image.txt
diff --git a/image_readers/sourceTest/resources/images/ij/invalid/pond.gif b/lib-image-readers/sourceTest/resources/images/ij/invalid/pond.gif
similarity index 100%
rename from image_readers/sourceTest/resources/images/ij/invalid/pond.gif
rename to lib-image-readers/sourceTest/resources/images/ij/invalid/pond.gif
diff --git a/image_readers/sourceTest/resources/images/ij/valid/demo.tif b/lib-image-readers/sourceTest/resources/images/ij/valid/demo.tif
similarity index 100%
rename from image_readers/sourceTest/resources/images/ij/valid/demo.tif
rename to lib-image-readers/sourceTest/resources/images/ij/valid/demo.tif
diff --git a/image_readers/sourceTest/resources/images/ij/valid/multi-page.tif b/lib-image-readers/sourceTest/resources/images/ij/valid/multi-page.tif
similarity index 100%
rename from image_readers/sourceTest/resources/images/ij/valid/multi-page.tif
rename to lib-image-readers/sourceTest/resources/images/ij/valid/multi-page.tif
diff --git a/image_readers/sourceTest/resources/images/imageio/invalid/not-an-image.txt b/lib-image-readers/sourceTest/resources/images/imageio/invalid/not-an-image.txt
similarity index 100%
rename from image_readers/sourceTest/resources/images/imageio/invalid/not-an-image.txt
rename to lib-image-readers/sourceTest/resources/images/imageio/invalid/not-an-image.txt
diff --git a/image_readers/sourceTest/resources/images/imageio/valid/annapolis.jpeg b/lib-image-readers/sourceTest/resources/images/imageio/valid/annapolis.jpeg
similarity index 100%
rename from image_readers/sourceTest/resources/images/imageio/valid/annapolis.jpeg
rename to lib-image-readers/sourceTest/resources/images/imageio/valid/annapolis.jpeg
diff --git a/image_readers/sourceTest/resources/images/imageio/valid/pond.bmp b/lib-image-readers/sourceTest/resources/images/imageio/valid/pond.bmp
similarity index 100%
rename from image_readers/sourceTest/resources/images/imageio/valid/pond.bmp
rename to lib-image-readers/sourceTest/resources/images/imageio/valid/pond.bmp
diff --git a/image_readers/sourceTest/resources/images/imageio/valid/pond.gif b/lib-image-readers/sourceTest/resources/images/imageio/valid/pond.gif
similarity index 100%
rename from image_readers/sourceTest/resources/images/imageio/valid/pond.gif
rename to lib-image-readers/sourceTest/resources/images/imageio/valid/pond.gif
diff --git a/image_readers/sourceTest/resources/images/imageio/valid/pond.jpg b/lib-image-readers/sourceTest/resources/images/imageio/valid/pond.jpg
similarity index 100%
rename from image_readers/sourceTest/resources/images/imageio/valid/pond.jpg
rename to lib-image-readers/sourceTest/resources/images/imageio/valid/pond.jpg
diff --git a/image_readers/sourceTest/resources/images/imageio/valid/pond.png b/lib-image-readers/sourceTest/resources/images/imageio/valid/pond.png
similarity index 100%
rename from image_readers/sourceTest/resources/images/imageio/valid/pond.png
rename to lib-image-readers/sourceTest/resources/images/imageio/valid/pond.png