diff --git a/pom.xml b/pom.xml
index 0097125..702588d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.psi</groupId>
-	<artifactId>imagej.h5</artifactId>
+	<artifactId>imagej.hdf5</artifactId>
 	<version>0.0.1</version>
 
 	<dependencies>
diff --git a/src/main/java/HDF5_Batch_.java b/src/main/java/ch/psi/imagej/hdf5/HDF5_Batch_.java
similarity index 98%
rename from src/main/java/HDF5_Batch_.java
rename to src/main/java/ch/psi/imagej/hdf5/HDF5_Batch_.java
index 83492ef..513744c 100644
--- a/src/main/java/HDF5_Batch_.java
+++ b/src/main/java/ch/psi/imagej/hdf5/HDF5_Batch_.java
@@ -1,3 +1,4 @@
+package ch.psi.imagej.hdf5;
 /* =========================================================================
  * 
  *  Copyright 2011 Matthias Schlachter
diff --git a/src/main/java/HDF5_Config.java b/src/main/java/ch/psi/imagej/hdf5/HDF5_Config.java
similarity index 99%
rename from src/main/java/HDF5_Config.java
rename to src/main/java/ch/psi/imagej/hdf5/HDF5_Config.java
index 28a4715..611818f 100644
--- a/src/main/java/HDF5_Config.java
+++ b/src/main/java/ch/psi/imagej/hdf5/HDF5_Config.java
@@ -1,3 +1,4 @@
+package ch.psi.imagej.hdf5;
 /* =========================================================================
  * 
  *  Copyright 2011 Matthias Schlachter
diff --git a/src/main/java/HDF5_GroupedVarnames.java b/src/main/java/ch/psi/imagej/hdf5/HDF5_GroupedVarnames.java
similarity index 99%
rename from src/main/java/HDF5_GroupedVarnames.java
rename to src/main/java/ch/psi/imagej/hdf5/HDF5_GroupedVarnames.java
index 01fc4f4..220a269 100644
--- a/src/main/java/HDF5_GroupedVarnames.java
+++ b/src/main/java/ch/psi/imagej/hdf5/HDF5_GroupedVarnames.java
@@ -1,3 +1,4 @@
+package ch.psi.imagej.hdf5;
 /* =========================================================================
  * 
  *  Copyright 2011 Matthias Schlachter
diff --git a/src/main/java/HDF5_Reader_.java b/src/main/java/ch/psi/imagej/hdf5/HDF5_Reader_.java
similarity index 99%
rename from src/main/java/HDF5_Reader_.java
rename to src/main/java/ch/psi/imagej/hdf5/HDF5_Reader_.java
index e32ffd1..013c4f1 100644
--- a/src/main/java/HDF5_Reader_.java
+++ b/src/main/java/ch/psi/imagej/hdf5/HDF5_Reader_.java
@@ -1,3 +1,4 @@
+package ch.psi.imagej.hdf5;
 /* =========================================================================
  * 
  *  Copyright 2011 Matthias Schlachter
diff --git a/src/main/java/HDF5_Writer_.java b/src/main/java/ch/psi/imagej/hdf5/HDF5_Writer_.java
similarity index 99%
rename from src/main/java/HDF5_Writer_.java
rename to src/main/java/ch/psi/imagej/hdf5/HDF5_Writer_.java
index 943df5a..e839829 100644
--- a/src/main/java/HDF5_Writer_.java
+++ b/src/main/java/ch/psi/imagej/hdf5/HDF5_Writer_.java
@@ -1,3 +1,4 @@
+package ch.psi.imagej.hdf5;
 /* =========================================================================
  * 
  *  Copyright 2011 Matthias Schlachter
diff --git a/src/main/java/TimeFrame.java b/src/main/java/ch/psi/imagej/hdf5/TimeFrame.java
similarity index 99%
rename from src/main/java/TimeFrame.java
rename to src/main/java/ch/psi/imagej/hdf5/TimeFrame.java
index 5aeb922..26f5821 100644
--- a/src/main/java/TimeFrame.java
+++ b/src/main/java/ch/psi/imagej/hdf5/TimeFrame.java
@@ -1,3 +1,4 @@
+package ch.psi.imagej.hdf5;
 /* =========================================================================
  * 
  *  Copyright 2011 Matthias Schlachter
diff --git a/src/main/resources/plugins.config b/src/main/resources/plugins.config
index 9468acb..8da272a 100644
--- a/src/main/resources/plugins.config
+++ b/src/main/resources/plugins.config
@@ -1,5 +1,5 @@
-File>Import, "HDF5...", HDF5_Reader_
-File>Save As, "HDF5", HDF5_Writer_
-Plugins>HDF5, "Load HDF5 File", HDF5_Reader_
-Plugins>HDF5, "Save HDF5 File", HDF5_Writer_
-Plugins>HDF5, "HDF5 Preferences", HDF5_Config
+File>Import, "HDF5...", ch.psi.imageJ.hdf5.HDF5_Reader_
+File>Save As, "HDF5", ch.psi.imageJ.hdf5.HDF5_Writer_
+Plugins>HDF5, "Load HDF5 File", ch.psi.imageJ.hdf5.HDF5_Reader_
+Plugins>HDF5, "Save HDF5 File", ch.psi.imageJ.hdf5.HDF5_Writer_
+Plugins>HDF5, "HDF5 Preferences", ch.psi.imageJ.hdf5.HDF5_Config