diff --git a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/DomParser.java b/src/main/java/ch/eitchnet/xmlpers/api/DomParser.java
similarity index 95%
rename from src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/DomParser.java
rename to src/main/java/ch/eitchnet/xmlpers/api/DomParser.java
index d5850ef4b..1c78ff5d3 100644
--- a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/DomParser.java
+++ b/src/main/java/ch/eitchnet/xmlpers/api/DomParser.java
@@ -19,7 +19,7 @@
  *  along with XXX.  If not, see 
  *  <http://www.gnu.org/licenses/>.
  */
-package ch.eitchnet.xmlpers.test.impl.rewrite;
+package ch.eitchnet.xmlpers.api;
 
 import org.w3c.dom.Document;
 
diff --git a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ParserFactory.java b/src/main/java/ch/eitchnet/xmlpers/api/ParserFactory.java
similarity index 94%
rename from src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ParserFactory.java
rename to src/main/java/ch/eitchnet/xmlpers/api/ParserFactory.java
index 1a7bcc396..5a4d8a2ec 100644
--- a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ParserFactory.java
+++ b/src/main/java/ch/eitchnet/xmlpers/api/ParserFactory.java
@@ -19,7 +19,8 @@
  *  along with XXX.  If not, see 
  *  <http://www.gnu.org/licenses/>.
  */
-package ch.eitchnet.xmlpers.test.impl.rewrite;
+package ch.eitchnet.xmlpers.api;
+
 
 public interface ParserFactory<T> {
 
diff --git a/src/main/java/ch/eitchnet/xmlpers/api/PersistenceContext.java b/src/main/java/ch/eitchnet/xmlpers/api/PersistenceContext.java
index bf132775f..17e49e9bb 100644
--- a/src/main/java/ch/eitchnet/xmlpers/api/PersistenceContext.java
+++ b/src/main/java/ch/eitchnet/xmlpers/api/PersistenceContext.java
@@ -21,7 +21,6 @@
  */
 package ch.eitchnet.xmlpers.api;
 
-import ch.eitchnet.xmlpers.test.impl.rewrite.ParserFactory;
 
 public class PersistenceContext<T> {
 
diff --git a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/SaxParser.java b/src/main/java/ch/eitchnet/xmlpers/api/SaxParser.java
similarity index 95%
rename from src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/SaxParser.java
rename to src/main/java/ch/eitchnet/xmlpers/api/SaxParser.java
index 31b311717..9fc8d1dd9 100644
--- a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/SaxParser.java
+++ b/src/main/java/ch/eitchnet/xmlpers/api/SaxParser.java
@@ -19,7 +19,7 @@
  *  along with XXX.  If not, see 
  *  <http://www.gnu.org/licenses/>.
  */
-package ch.eitchnet.xmlpers.test.impl.rewrite;
+package ch.eitchnet.xmlpers.api;
 
 import javax.xml.stream.XMLStreamException;
 
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 759b55cec..f23a3361d 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
@@ -53,8 +53,10 @@ import org.xml.sax.helpers.DefaultHandler;
 
 import ch.eitchnet.utils.exceptions.XmlException;
 import ch.eitchnet.utils.helper.XmlHelper;
+import ch.eitchnet.xmlpers.api.DomParser;
 import ch.eitchnet.xmlpers.api.DomUtil;
 import ch.eitchnet.xmlpers.api.PersistenceContext;
+import ch.eitchnet.xmlpers.api.SaxParser;
 import ch.eitchnet.xmlpers.api.XmlPersistenceException;
 import ch.eitchnet.xmlpers.impl.XmlPersistenceStreamWriter;
 
diff --git a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ResourceDomParser.java b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ResourceDomParser.java
index ea5ea516d..869664596 100644
--- a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ResourceDomParser.java
+++ b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ResourceDomParser.java
@@ -28,6 +28,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import ch.eitchnet.xmlpers.api.DomParser;
 import ch.eitchnet.xmlpers.api.DomUtil;
 import ch.eitchnet.xmlpers.test.model.Parameter;
 import ch.eitchnet.xmlpers.test.model.Resource;
diff --git a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ResourceParserFactory.java b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ResourceParserFactory.java
index 041dcabc3..0e062b1ae 100644
--- a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ResourceParserFactory.java
+++ b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ResourceParserFactory.java
@@ -21,6 +21,9 @@
  */
 package ch.eitchnet.xmlpers.test.impl.rewrite;
 
+import ch.eitchnet.xmlpers.api.DomParser;
+import ch.eitchnet.xmlpers.api.ParserFactory;
+import ch.eitchnet.xmlpers.api.SaxParser;
 import ch.eitchnet.xmlpers.test.model.Resource;
 
 public class ResourceParserFactory implements ParserFactory<Resource> {
diff --git a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ResourceSaxParser.java b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ResourceSaxParser.java
index 8a1fa6335..bf69b3e20 100644
--- a/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ResourceSaxParser.java
+++ b/src/test/java/ch/eitchnet/xmlpers/test/impl/rewrite/ResourceSaxParser.java
@@ -27,6 +27,7 @@ import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
+import ch.eitchnet.xmlpers.api.SaxParser;
 import ch.eitchnet.xmlpers.impl.XmlPersistenceStreamWriter;
 import ch.eitchnet.xmlpers.test.model.Parameter;
 import ch.eitchnet.xmlpers.test.model.Resource;