diff --git a/mustang/pom.xml b/mustang/pom.xml
index 148647df..e52386eb 100644
--- a/mustang/pom.xml
+++ b/mustang/pom.xml
@@ -1,55 +1,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	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>
+	<parent>
+		<groupId>com.github.rayman2200</groupId>
+		<artifactId>mustang-sample-project</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
 
 	<groupId>org.mustangproject.ZUGFeRD</groupId>
 	<artifactId>mustang</artifactId>
 	<version>1.1.1alpha</version>
-
-	<repositories>
-		<repository>
-			<id>apache-snapshot</id>
-			<url>http://repository.apache.org/content/groups/snapshots</url>
-		</repository>
-	</repositories>
-
 	<packaging>jar</packaging>
 
 	<name>mustang</name>
 	<url>http://maven.apache.org</url>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.2</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.pdfbox</groupId>
-			<artifactId>pdfbox</artifactId>
-			<version>1.8.6</version>
-			<scope>compile</scope>
-		</dependency>
-
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
 </project>
diff --git a/pdfa3-sample/pom.xml b/pdfa3-sample/pom.xml
new file mode 100644
index 00000000..2d5ae1ef
--- /dev/null
+++ b/pdfa3-sample/pom.xml
@@ -0,0 +1,10 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	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>
+	<parent>
+		<groupId>com.github.rayman2200</groupId>
+		<artifactId>mustang-sample-project</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>pdfa3-samples</artifactId>
+</project>
\ No newline at end of file
diff --git a/src/main/java/pdfbox/PDFA3File.java b/pdfa3-sample/src/main/java/pdfbox/PDFA3File.java
similarity index 98%
rename from src/main/java/pdfbox/PDFA3File.java
rename to pdfa3-sample/src/main/java/pdfbox/PDFA3File.java
index f9ea855d..e3387fab 100644
--- a/src/main/java/pdfbox/PDFA3File.java
+++ b/pdfa3-sample/src/main/java/pdfbox/PDFA3File.java
@@ -31,9 +31,9 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
 import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDMetadata;
 import org.apache.pdfbox.pdmodel.documentinterchange.logicalstructure.PDMarkInfo;
+import org.apache.pdfbox.pdmodel.edit.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont;
 import org.apache.pdfbox.pdmodel.graphics.color.PDOutputIntent;
@@ -161,7 +161,7 @@ public class PDFA3File
                                 * visually, unicode and structurally preservable
                                 */
     pdfaid.setAbout("");
-    metadata.importXMPMetadata(xmp.asByteArray());
+    metadata.importXMPMetadata(xmp);
     return cat;
   }
 
diff --git a/src/main/java/pdfbox/PDFA3FileAttachment.java b/pdfa3-sample/src/main/java/pdfbox/PDFA3FileAttachment.java
similarity index 98%
rename from src/main/java/pdfbox/PDFA3FileAttachment.java
rename to pdfa3-sample/src/main/java/pdfbox/PDFA3FileAttachment.java
index c2780deb..8b609d40 100644
--- a/src/main/java/pdfbox/PDFA3FileAttachment.java
+++ b/pdfa3-sample/src/main/java/pdfbox/PDFA3FileAttachment.java
@@ -37,11 +37,11 @@ import org.apache.pdfbox.pdmodel.PDDocumentInformation;
 import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
 import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
 import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDMetadata;
 import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
 import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
 import org.apache.pdfbox.pdmodel.documentinterchange.logicalstructure.PDMarkInfo;
+import org.apache.pdfbox.pdmodel.edit.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont;
 import org.apache.pdfbox.pdmodel.graphics.color.PDOutputIntent;
@@ -239,7 +239,7 @@ public class PDFA3FileAttachment
                                 * visually, unicode and structurally preservable
                                 */
     pdfaid.setAbout("");
-    metadata.importXMPMetadata(xmp.asByteArray());
+    metadata.importXMPMetadata(xmp);
     return cat;
   }
 
diff --git a/src/main/java/pdfbox/PDFAFile.java b/pdfa3-sample/src/main/java/pdfbox/PDFAFile.java
similarity index 98%
rename from src/main/java/pdfbox/PDFAFile.java
rename to pdfa3-sample/src/main/java/pdfbox/PDFAFile.java
index 16f72dc8..56579029 100644
--- a/src/main/java/pdfbox/PDFAFile.java
+++ b/pdfa3-sample/src/main/java/pdfbox/PDFAFile.java
@@ -23,8 +23,8 @@ import org.apache.jempbox.xmp.pdfa.XMPSchemaPDFAId;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
 import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.common.PDMetadata;
+import org.apache.pdfbox.pdmodel.edit.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont;
 import org.apache.pdfbox.pdmodel.graphics.color.PDOutputIntent;
diff --git a/src/main/resources/Ubuntu-R.ttf b/pdfa3-sample/src/main/resources/Ubuntu-R.ttf
similarity index 100%
rename from src/main/resources/Ubuntu-R.ttf
rename to pdfa3-sample/src/main/resources/Ubuntu-R.ttf
diff --git a/src/main/resources/sRGB Color Space Profile.icm b/pdfa3-sample/src/main/resources/sRGB Color Space Profile.icm
similarity index 100%
rename from src/main/resources/sRGB Color Space Profile.icm
rename to pdfa3-sample/src/main/resources/sRGB Color Space Profile.icm
diff --git a/src/test/java/pdfa3/TestPDFA3.java b/pdfa3-sample/src/test/java/pdfa3/TestPDFA3.java
similarity index 100%
rename from src/test/java/pdfa3/TestPDFA3.java
rename to pdfa3-sample/src/test/java/pdfa3/TestPDFA3.java
diff --git a/pom.xml b/pom.xml
index 260b81a0..7ef66d62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,33 +2,29 @@
 	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>com.github.rayman2200</groupId>
-	<artifactId>pdfa3</artifactId>
+	<artifactId>mustang-sample-project</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
-	<repositories>
-		<repository>
-			<id>apache-snapshot</id>
-			<url>http://repository.apache.org/content/groups/snapshots</url>
-		</repository>
-	</repositories>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<modules>
+		<module>mustang</module>
+		<module>pdfa3-sample</module>
+	</modules>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.pdfbox</groupId>
 			<artifactId>pdfbox</artifactId>
-			<version>2.0.0-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.pdfbox</groupId>
-			<artifactId>jempbox</artifactId>
-			<version>2.0.0-SNAPSHOT</version>
-			<scope>compile</scope>
+			<version>1.8.8</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.8</version>
+			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -38,7 +34,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>3.2</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -46,4 +42,5 @@
 			</plugin>
 		</plugins>
 	</build>
+
 </project>
\ No newline at end of file