diff --git a/ch.psi.imagej.cbf/.classpath b/.classpath
similarity index 100%
rename from ch.psi.imagej.cbf/.classpath
rename to .classpath
diff --git a/ch.psi.imagej.cbf/.gitignore b/.gitignore
similarity index 100%
rename from ch.psi.imagej.cbf/.gitignore
rename to .gitignore
diff --git a/ch.psi.imagej.cbf/.project b/.project
similarity index 100%
rename from ch.psi.imagej.cbf/.project
rename to .project
diff --git a/ch.psi.imagej.cbf/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from ch.psi.imagej.cbf/.settings/org.eclipse.core.resources.prefs
rename to .settings/org.eclipse.core.resources.prefs
diff --git a/ch.psi.imagej.cbf/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from ch.psi.imagej.cbf/.settings/org.eclipse.jdt.core.prefs
rename to .settings/org.eclipse.jdt.core.prefs
diff --git a/ch.psi.imagej.cbf/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from ch.psi.imagej.cbf/.settings/org.eclipse.m2e.core.prefs
rename to .settings/org.eclipse.m2e.core.prefs
diff --git a/ch.psi.imagej.cbf/Readme.md b/Readme.md
similarity index 100%
rename from ch.psi.imagej.cbf/Readme.md
rename to Readme.md
diff --git a/ch.psi.imagej.cbf/doc/developer.txt b/doc/developer.txt
similarity index 100%
rename from ch.psi.imagej.cbf/doc/developer.txt
rename to doc/developer.txt
diff --git a/ch.psi.imagej.cbf/pom.xml b/pom.xml
similarity index 100%
rename from ch.psi.imagej.cbf/pom.xml
rename to pom.xml
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/Base64.java b/src/main/java/imcacat/jcbf/Base64.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/Base64.java
rename to src/main/java/imcacat/jcbf/Base64.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/ByteArrayCbfData.java b/src/main/java/imcacat/jcbf/ByteArrayCbfData.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/ByteArrayCbfData.java
rename to src/main/java/imcacat/jcbf/ByteArrayCbfData.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfCompression.java b/src/main/java/imcacat/jcbf/CbfCompression.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfCompression.java
rename to src/main/java/imcacat/jcbf/CbfCompression.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfData.java b/src/main/java/imcacat/jcbf/CbfData.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfData.java
rename to src/main/java/imcacat/jcbf/CbfData.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfElementType.java b/src/main/java/imcacat/jcbf/CbfElementType.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfElementType.java
rename to src/main/java/imcacat/jcbf/CbfElementType.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfImageReadParam.java b/src/main/java/imcacat/jcbf/CbfImageReadParam.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfImageReadParam.java
rename to src/main/java/imcacat/jcbf/CbfImageReadParam.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfImageReader.java b/src/main/java/imcacat/jcbf/CbfImageReader.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfImageReader.java
rename to src/main/java/imcacat/jcbf/CbfImageReader.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfImageReaderSpi.java b/src/main/java/imcacat/jcbf/CbfImageReaderSpi.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfImageReaderSpi.java
rename to src/main/java/imcacat/jcbf/CbfImageReaderSpi.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfImageWriteParam.java b/src/main/java/imcacat/jcbf/CbfImageWriteParam.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfImageWriteParam.java
rename to src/main/java/imcacat/jcbf/CbfImageWriteParam.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfImageWriter.java b/src/main/java/imcacat/jcbf/CbfImageWriter.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfImageWriter.java
rename to src/main/java/imcacat/jcbf/CbfImageWriter.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfImageWriterSpi.java b/src/main/java/imcacat/jcbf/CbfImageWriterSpi.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfImageWriterSpi.java
rename to src/main/java/imcacat/jcbf/CbfImageWriterSpi.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfMetadata.java b/src/main/java/imcacat/jcbf/CbfMetadata.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfMetadata.java
rename to src/main/java/imcacat/jcbf/CbfMetadata.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfMetadataFormat.java b/src/main/java/imcacat/jcbf/CbfMetadataFormat.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/CbfMetadataFormat.java
rename to src/main/java/imcacat/jcbf/CbfMetadataFormat.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/ImageInputStreamCbfData.java b/src/main/java/imcacat/jcbf/ImageInputStreamCbfData.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/ImageInputStreamCbfData.java
rename to src/main/java/imcacat/jcbf/ImageInputStreamCbfData.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/ImageJCbfReader.java b/src/main/java/imcacat/jcbf/ImageJCbfReader.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/ImageJCbfReader.java
rename to src/main/java/imcacat/jcbf/ImageJCbfReader.java
diff --git a/ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/Version.java b/src/main/java/imcacat/jcbf/Version.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/java/imcacat/jcbf/Version.java
rename to src/main/java/imcacat/jcbf/Version.java
diff --git a/ch.psi.imagej.cbf/src/main/resources/.gitignore b/src/main/resources/.gitignore
similarity index 100%
rename from ch.psi.imagej.cbf/src/main/resources/.gitignore
rename to src/main/resources/.gitignore
diff --git a/ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/Base64Test.java b/src/test/java/imcacat/jcbf/Base64Test.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/Base64Test.java
rename to src/test/java/imcacat/jcbf/Base64Test.java
diff --git a/ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfCompressionTest.java b/src/test/java/imcacat/jcbf/CbfCompressionTest.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfCompressionTest.java
rename to src/test/java/imcacat/jcbf/CbfCompressionTest.java
diff --git a/ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfElementTypeTest.java b/src/test/java/imcacat/jcbf/CbfElementTypeTest.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfElementTypeTest.java
rename to src/test/java/imcacat/jcbf/CbfElementTypeTest.java
diff --git a/ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfImageReaderSpiTest.java b/src/test/java/imcacat/jcbf/CbfImageReaderSpiTest.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfImageReaderSpiTest.java
rename to src/test/java/imcacat/jcbf/CbfImageReaderSpiTest.java
diff --git a/ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfImageReaderTest.java b/src/test/java/imcacat/jcbf/CbfImageReaderTest.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfImageReaderTest.java
rename to src/test/java/imcacat/jcbf/CbfImageReaderTest.java
diff --git a/ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfImageWriterSpiTest.java b/src/test/java/imcacat/jcbf/CbfImageWriterSpiTest.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfImageWriterSpiTest.java
rename to src/test/java/imcacat/jcbf/CbfImageWriterSpiTest.java
diff --git a/ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfImageWriterTest.java b/src/test/java/imcacat/jcbf/CbfImageWriterTest.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfImageWriterTest.java
rename to src/test/java/imcacat/jcbf/CbfImageWriterTest.java
diff --git a/ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfMetadataTest.java b/src/test/java/imcacat/jcbf/CbfMetadataTest.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/CbfMetadataTest.java
rename to src/test/java/imcacat/jcbf/CbfMetadataTest.java
diff --git a/ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/TestUtils.java b/src/test/java/imcacat/jcbf/TestUtils.java
similarity index 100%
rename from ch.psi.imagej.cbf/src/test/java/imcacat/jcbf/TestUtils.java
rename to src/test/java/imcacat/jcbf/TestUtils.java
diff --git a/ch.psi.imagej.cbf/src/test/resources/.gitignore b/src/test/resources/.gitignore
similarity index 100%
rename from ch.psi.imagej.cbf/src/test/resources/.gitignore
rename to src/test/resources/.gitignore