diff --git a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/PersistenceContext.java b/src/main/java/ch/eitchnet/xmlpers/api/PersistenceContext.java
similarity index 94%
rename from src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/PersistenceContext.java
rename to src/main/java/ch/eitchnet/xmlpers/api/PersistenceContext.java
index 1b0d1ad42..bf132775f 100644
--- a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/PersistenceContext.java
+++ b/src/main/java/ch/eitchnet/xmlpers/api/PersistenceContext.java
@@ -19,9 +19,9 @@
  *  along with XXX.  If not, see 
  *  <http://www.gnu.org/licenses/>.
  */
-package ch.eitchnet.xmlpers.test.impl.rewrite;
+package ch.eitchnet.xmlpers.api;
 
-import ch.eitchnet.xmlpers.api.XmlIoMode;
+import ch.eitchnet.xmlpers.test.impl.rewrite.ParserFactory;
 
 public class PersistenceContext<T> {
 
diff --git a/src/main/java/ch/eitchnet/xmlpers/impl/XmlPersistencePathBuilder.java b/src/main/java/ch/eitchnet/xmlpers/impl/XmlPersistencePathBuilder.java
index 3e0c84535..43b0f9aff 100644
--- a/src/main/java/ch/eitchnet/xmlpers/impl/XmlPersistencePathBuilder.java
+++ b/src/main/java/ch/eitchnet/xmlpers/impl/XmlPersistencePathBuilder.java
@@ -29,9 +29,9 @@ import org.slf4j.LoggerFactory;
 
 import ch.eitchnet.utils.helper.PropertiesHelper;
 import ch.eitchnet.utils.helper.StringHelper;
+import ch.eitchnet.xmlpers.api.PersistenceContext;
 import ch.eitchnet.xmlpers.api.XmlPersistenceConstants;
 import ch.eitchnet.xmlpers.api.XmlPersistenceException;
-import ch.eitchnet.xmlpers.test.impl.rewrite.PersistenceContext;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/FileDao.java b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/FileDao.java
index b0fadcc77..8774d2549 100644
--- a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/FileDao.java
+++ b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/FileDao.java
@@ -23,6 +23,7 @@ package ch.eitchnet.xmlpers.test.impl.rewrite;
 
 import java.io.File;
 
+import ch.eitchnet.xmlpers.api.PersistenceContext;
 import ch.eitchnet.xmlpers.impl.XmlPersistencePathBuilder;
 
 public class FileDao {
diff --git a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/FileDaoTest.java b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/FileDaoTest.java
index e8f51a178..11ac0036d 100644
--- a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/FileDaoTest.java
+++ b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/FileDaoTest.java
@@ -35,6 +35,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import ch.eitchnet.utils.helper.FileHelper;
+import ch.eitchnet.xmlpers.api.PersistenceContext;
 import ch.eitchnet.xmlpers.api.XmlIoMode;
 import ch.eitchnet.xmlpers.api.XmlPersistenceConstants;
 import ch.eitchnet.xmlpers.impl.XmlPersistencePathBuilder;
diff --git a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/FileIo.java b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/FileIo.java
index 06caa3a9b..759b55cec 100644
--- a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/FileIo.java
+++ b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/FileIo.java
@@ -54,6 +54,7 @@ import org.xml.sax.helpers.DefaultHandler;
 import ch.eitchnet.utils.exceptions.XmlException;
 import ch.eitchnet.utils.helper.XmlHelper;
 import ch.eitchnet.xmlpers.api.DomUtil;
+import ch.eitchnet.xmlpers.api.PersistenceContext;
 import ch.eitchnet.xmlpers.api.XmlPersistenceException;
 import ch.eitchnet.xmlpers.impl.XmlPersistenceStreamWriter;
 
diff --git a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ObjectDao.java b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ObjectDao.java
index c5bc9684d..cb5a9581b 100644
--- a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ObjectDao.java
+++ b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ObjectDao.java
@@ -24,6 +24,8 @@ package ch.eitchnet.xmlpers.test.impl.rewrite;
 import java.util.List;
 import java.util.Set;
 
+import ch.eitchnet.xmlpers.api.PersistenceContext;
+
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
  *