diff --git a/docx4j/README.txt b/README.txt
similarity index 100%
rename from docx4j/README.txt
rename to README.txt
diff --git a/docx4j/RELEASE_HOWTO.txt b/RELEASE_HOWTO.txt
similarity index 100%
rename from docx4j/RELEASE_HOWTO.txt
rename to RELEASE_HOWTO.txt
diff --git a/docx4j/build.xml b/build.xml
similarity index 100%
rename from docx4j/build.xml
rename to build.xml
diff --git a/docx4j/docs/Creating SmartArt with docx4j.docx b/docs/Creating SmartArt with docx4j.docx
similarity index 100%
rename from docx4j/docs/Creating SmartArt with docx4j.docx
rename to docs/Creating SmartArt with docx4j.docx
diff --git a/docx4j/docs/Docx4j_GettingStarted.html b/docs/Docx4j_GettingStarted.html
similarity index 100%
rename from docx4j/docs/Docx4j_GettingStarted.html
rename to docs/Docx4j_GettingStarted.html
diff --git a/docx4j/docs/Docx4j_GettingStarted.pdf b/docs/Docx4j_GettingStarted.pdf
similarity index 100%
rename from docx4j/docs/Docx4j_GettingStarted.pdf
rename to docs/Docx4j_GettingStarted.pdf
diff --git a/docx4j/docs/Docx4j_GettingStarted.xml b/docs/Docx4j_GettingStarted.xml
similarity index 100%
rename from docx4j/docs/Docx4j_GettingStarted.xml
rename to docs/Docx4j_GettingStarted.xml
diff --git a/docx4j/docs/Docx4j_GettingStarted_Chinese_simplified.html b/docs/Docx4j_GettingStarted_Chinese_simplified.html
similarity index 100%
rename from docx4j/docs/Docx4j_GettingStarted_Chinese_simplified.html
rename to docs/Docx4j_GettingStarted_Chinese_simplified.html
diff --git a/docx4j/docs/Docx4j_GettingStarted_Chinese_traditional.html b/docs/Docx4j_GettingStarted_Chinese_traditional.html
similarity index 100%
rename from docx4j/docs/Docx4j_GettingStarted_Chinese_traditional.html
rename to docs/Docx4j_GettingStarted_Chinese_traditional.html
diff --git a/docx4j/docs/Docx4j_GettingStarted_Espagnol.html b/docs/Docx4j_GettingStarted_Espagnol.html
similarity index 100%
rename from docx4j/docs/Docx4j_GettingStarted_Espagnol.html
rename to docs/Docx4j_GettingStarted_Espagnol.html
diff --git a/docx4j/docs/Docx4j_GettingStarted_Francais.html b/docs/Docx4j_GettingStarted_Francais.html
similarity index 100%
rename from docx4j/docs/Docx4j_GettingStarted_Francais.html
rename to docs/Docx4j_GettingStarted_Francais.html
diff --git a/docx4j/docs/Docx4j_GettingStarted_German.html b/docs/Docx4j_GettingStarted_German.html
similarity index 100%
rename from docx4j/docs/Docx4j_GettingStarted_German.html
rename to docs/Docx4j_GettingStarted_German.html
diff --git a/docx4j/docs/Docx4j_GettingStarted_Hindi.html b/docs/Docx4j_GettingStarted_Hindi.html
similarity index 100%
rename from docx4j/docs/Docx4j_GettingStarted_Hindi.html
rename to docs/Docx4j_GettingStarted_Hindi.html
diff --git a/docx4j/docs/Docx4j_GettingStarted_Japanese.html b/docs/Docx4j_GettingStarted_Japanese.html
similarity index 100%
rename from docx4j/docs/Docx4j_GettingStarted_Japanese.html
rename to docs/Docx4j_GettingStarted_Japanese.html
diff --git a/docx4j/docs/Docx4j_GettingStarted_Russian.html b/docs/Docx4j_GettingStarted_Russian.html
similarity index 100%
rename from docx4j/docs/Docx4j_GettingStarted_Russian.html
rename to docs/Docx4j_GettingStarted_Russian.html
diff --git a/docx4j/docs/Docx4j_GettingStarted_foreign.html b/docs/Docx4j_GettingStarted_foreign.html
similarity index 100%
rename from docx4j/docs/Docx4j_GettingStarted_foreign.html
rename to docs/Docx4j_GettingStarted_foreign.html
diff --git a/docx4j/docs/HOWTO_translate.txt b/docs/HOWTO_translate.txt
similarity index 100%
rename from docx4j/docs/HOWTO_translate.txt
rename to docs/HOWTO_translate.txt
diff --git a/docx4j/docs/JAXP_TransformerFactory_XSLT_notes.txt b/docs/JAXP_TransformerFactory_XSLT_notes.txt
similarity index 100%
rename from docx4j/docs/JAXP_TransformerFactory_XSLT_notes.txt
rename to docs/JAXP_TransformerFactory_XSLT_notes.txt
diff --git a/docx4j/docs/OpenDoPE_XHTML.docx b/docs/OpenDoPE_XHTML.docx
similarity index 100%
rename from docx4j/docs/OpenDoPE_XHTML.docx
rename to docs/OpenDoPE_XHTML.docx
diff --git a/docx4j/etc/commons-vfs.patch b/etc/commons-vfs.patch
similarity index 100%
rename from docx4j/etc/commons-vfs.patch
rename to etc/commons-vfs.patch
diff --git a/docx4j/etc/fop-fonts.patch b/etc/fop-fonts.patch
similarity index 100%
rename from docx4j/etc/fop-fonts.patch
rename to etc/fop-fonts.patch
diff --git a/docx4j/legals/LICENSE b/legals/LICENSE
similarity index 100%
rename from docx4j/legals/LICENSE
rename to legals/LICENSE
diff --git a/docx4j/legals/NOTICE b/legals/NOTICE
similarity index 100%
rename from docx4j/legals/NOTICE
rename to legals/NOTICE
diff --git a/docx4j/lib/commons-lang-gump-20062009.jar b/lib/commons-lang-gump-20062009.jar
similarity index 100%
rename from docx4j/lib/commons-lang-gump-20062009.jar
rename to lib/commons-lang-gump-20062009.jar
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.jar b/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.jar
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.jar
rename to m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.jar
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.jar.md5 b/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.jar.md5
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.jar.md5
rename to m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.jar.md5
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.jar.sha1 b/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.jar.sha1
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.jar.sha1
rename to m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.jar.sha1
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.pom b/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.pom
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.pom
rename to m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.pom
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.pom.md5 b/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.pom.md5
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.pom.md5
rename to m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.pom.md5
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.pom.sha1 b/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.pom.sha1
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.pom.sha1
rename to m2/pdf-renderer/pdf-renderer/0.2007/pdf-renderer-0.2007.pom.sha1
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.jar b/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.jar
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.jar
rename to m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.jar
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.jar.md5 b/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.jar.md5
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.jar.md5
rename to m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.jar.md5
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.jar.sha1 b/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.jar.sha1
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.jar.sha1
rename to m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.jar.sha1
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.pom b/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.pom
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.pom
rename to m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.pom
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.pom.md5 b/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.pom.md5
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.pom.md5
rename to m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.pom.md5
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.pom.sha1 b/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.pom.sha1
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.pom.sha1
rename to m2/pdf-renderer/pdf-renderer/0.2009.0324/pdf-renderer-0.2009.0324.pom.sha1
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/maven-metadata.xml b/m2/pdf-renderer/pdf-renderer/maven-metadata.xml
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/maven-metadata.xml
rename to m2/pdf-renderer/pdf-renderer/maven-metadata.xml
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/maven-metadata.xml.md5 b/m2/pdf-renderer/pdf-renderer/maven-metadata.xml.md5
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/maven-metadata.xml.md5
rename to m2/pdf-renderer/pdf-renderer/maven-metadata.xml.md5
diff --git a/docx4j/m2/pdf-renderer/pdf-renderer/maven-metadata.xml.sha1 b/m2/pdf-renderer/pdf-renderer/maven-metadata.xml.sha1
similarity index 100%
rename from docx4j/m2/pdf-renderer/pdf-renderer/maven-metadata.xml.sha1
rename to m2/pdf-renderer/pdf-renderer/maven-metadata.xml.sha1
diff --git a/docx4j/m2/webdavclient4j/core/0.91/core-0.91.jar b/m2/webdavclient4j/core/0.91/core-0.91.jar
similarity index 100%
rename from docx4j/m2/webdavclient4j/core/0.91/core-0.91.jar
rename to m2/webdavclient4j/core/0.91/core-0.91.jar
diff --git a/docx4j/m2/webdavclient4j/core/0.91/core-0.91.jar.md5 b/m2/webdavclient4j/core/0.91/core-0.91.jar.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/core/0.91/core-0.91.jar.md5
rename to m2/webdavclient4j/core/0.91/core-0.91.jar.md5
diff --git a/docx4j/m2/webdavclient4j/core/0.91/core-0.91.jar.sha1 b/m2/webdavclient4j/core/0.91/core-0.91.jar.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/core/0.91/core-0.91.jar.sha1
rename to m2/webdavclient4j/core/0.91/core-0.91.jar.sha1
diff --git a/docx4j/m2/webdavclient4j/core/0.91/core-0.91.pom b/m2/webdavclient4j/core/0.91/core-0.91.pom
similarity index 100%
rename from docx4j/m2/webdavclient4j/core/0.91/core-0.91.pom
rename to m2/webdavclient4j/core/0.91/core-0.91.pom
diff --git a/docx4j/m2/webdavclient4j/core/0.91/core-0.91.pom.md5 b/m2/webdavclient4j/core/0.91/core-0.91.pom.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/core/0.91/core-0.91.pom.md5
rename to m2/webdavclient4j/core/0.91/core-0.91.pom.md5
diff --git a/docx4j/m2/webdavclient4j/core/0.91/core-0.91.pom.sha1 b/m2/webdavclient4j/core/0.91/core-0.91.pom.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/core/0.91/core-0.91.pom.sha1
rename to m2/webdavclient4j/core/0.91/core-0.91.pom.sha1
diff --git a/docx4j/m2/webdavclient4j/core/maven-metadata.xml b/m2/webdavclient4j/core/maven-metadata.xml
similarity index 100%
rename from docx4j/m2/webdavclient4j/core/maven-metadata.xml
rename to m2/webdavclient4j/core/maven-metadata.xml
diff --git a/docx4j/m2/webdavclient4j/core/maven-metadata.xml.md5 b/m2/webdavclient4j/core/maven-metadata.xml.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/core/maven-metadata.xml.md5
rename to m2/webdavclient4j/core/maven-metadata.xml.md5
diff --git a/docx4j/m2/webdavclient4j/core/maven-metadata.xml.sha1 b/m2/webdavclient4j/core/maven-metadata.xml.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/core/maven-metadata.xml.sha1
rename to m2/webdavclient4j/core/maven-metadata.xml.sha1
diff --git a/docx4j/m2/webdavclient4j/vfs/0.91/vfs-0.91.jar b/m2/webdavclient4j/vfs/0.91/vfs-0.91.jar
similarity index 100%
rename from docx4j/m2/webdavclient4j/vfs/0.91/vfs-0.91.jar
rename to m2/webdavclient4j/vfs/0.91/vfs-0.91.jar
diff --git a/docx4j/m2/webdavclient4j/vfs/0.91/vfs-0.91.jar.md5 b/m2/webdavclient4j/vfs/0.91/vfs-0.91.jar.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/vfs/0.91/vfs-0.91.jar.md5
rename to m2/webdavclient4j/vfs/0.91/vfs-0.91.jar.md5
diff --git a/docx4j/m2/webdavclient4j/vfs/0.91/vfs-0.91.jar.sha1 b/m2/webdavclient4j/vfs/0.91/vfs-0.91.jar.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/vfs/0.91/vfs-0.91.jar.sha1
rename to m2/webdavclient4j/vfs/0.91/vfs-0.91.jar.sha1
diff --git a/docx4j/m2/webdavclient4j/vfs/0.91/vfs-0.91.pom b/m2/webdavclient4j/vfs/0.91/vfs-0.91.pom
similarity index 100%
rename from docx4j/m2/webdavclient4j/vfs/0.91/vfs-0.91.pom
rename to m2/webdavclient4j/vfs/0.91/vfs-0.91.pom
diff --git a/docx4j/m2/webdavclient4j/vfs/0.91/vfs-0.91.pom.md5 b/m2/webdavclient4j/vfs/0.91/vfs-0.91.pom.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/vfs/0.91/vfs-0.91.pom.md5
rename to m2/webdavclient4j/vfs/0.91/vfs-0.91.pom.md5
diff --git a/docx4j/m2/webdavclient4j/vfs/0.91/vfs-0.91.pom.sha1 b/m2/webdavclient4j/vfs/0.91/vfs-0.91.pom.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/vfs/0.91/vfs-0.91.pom.sha1
rename to m2/webdavclient4j/vfs/0.91/vfs-0.91.pom.sha1
diff --git a/docx4j/m2/webdavclient4j/vfs/maven-metadata.xml b/m2/webdavclient4j/vfs/maven-metadata.xml
similarity index 100%
rename from docx4j/m2/webdavclient4j/vfs/maven-metadata.xml
rename to m2/webdavclient4j/vfs/maven-metadata.xml
diff --git a/docx4j/m2/webdavclient4j/vfs/maven-metadata.xml.md5 b/m2/webdavclient4j/vfs/maven-metadata.xml.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/vfs/maven-metadata.xml.md5
rename to m2/webdavclient4j/vfs/maven-metadata.xml.md5
diff --git a/docx4j/m2/webdavclient4j/vfs/maven-metadata.xml.sha1 b/m2/webdavclient4j/vfs/maven-metadata.xml.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/vfs/maven-metadata.xml.sha1
rename to m2/webdavclient4j/vfs/maven-metadata.xml.sha1
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.jar b/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.jar
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.jar
rename to m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.jar
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.jar.md5 b/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.jar.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.jar.md5
rename to m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.jar.md5
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.jar.sha1 b/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.jar.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.jar.sha1
rename to m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.jar.sha1
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.pom b/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.pom
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.pom
rename to m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.pom
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.pom.md5 b/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.pom.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.pom.md5
rename to m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.pom.md5
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.pom.sha1 b/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.pom.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.pom.sha1
rename to m2/webdavclient4j/webdavclient4j-core/0.92/webdavclient4j-core-0.92.pom.sha1
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-core/maven-metadata.xml b/m2/webdavclient4j/webdavclient4j-core/maven-metadata.xml
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-core/maven-metadata.xml
rename to m2/webdavclient4j/webdavclient4j-core/maven-metadata.xml
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-core/maven-metadata.xml.md5 b/m2/webdavclient4j/webdavclient4j-core/maven-metadata.xml.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-core/maven-metadata.xml.md5
rename to m2/webdavclient4j/webdavclient4j-core/maven-metadata.xml.md5
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-core/maven-metadata.xml.sha1 b/m2/webdavclient4j/webdavclient4j-core/maven-metadata.xml.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-core/maven-metadata.xml.sha1
rename to m2/webdavclient4j/webdavclient4j-core/maven-metadata.xml.sha1
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.jar b/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.jar
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.jar
rename to m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.jar
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.jar.md5 b/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.jar.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.jar.md5
rename to m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.jar.md5
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.jar.sha1 b/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.jar.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.jar.sha1
rename to m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.jar.sha1
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.pom b/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.pom
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.pom
rename to m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.pom
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.pom.md5 b/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.pom.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.pom.md5
rename to m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.pom.md5
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.pom.sha1 b/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.pom.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.pom.sha1
rename to m2/webdavclient4j/webdavclient4j-vfs/0.92.1/webdavclient4j-vfs-0.92.1.pom.sha1
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.jar b/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.jar
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.jar
rename to m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.jar
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.jar.md5 b/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.jar.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.jar.md5
rename to m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.jar.md5
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.jar.sha1 b/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.jar.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.jar.sha1
rename to m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.jar.sha1
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.pom b/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.pom
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.pom
rename to m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.pom
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.pom.md5 b/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.pom.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.pom.md5
rename to m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.pom.md5
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.pom.sha1 b/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.pom.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.pom.sha1
rename to m2/webdavclient4j/webdavclient4j-vfs/0.92/webdavclient4j-vfs-0.92.pom.sha1
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/maven-metadata.xml b/m2/webdavclient4j/webdavclient4j-vfs/maven-metadata.xml
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/maven-metadata.xml
rename to m2/webdavclient4j/webdavclient4j-vfs/maven-metadata.xml
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/maven-metadata.xml.md5 b/m2/webdavclient4j/webdavclient4j-vfs/maven-metadata.xml.md5
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/maven-metadata.xml.md5
rename to m2/webdavclient4j/webdavclient4j-vfs/maven-metadata.xml.md5
diff --git a/docx4j/m2/webdavclient4j/webdavclient4j-vfs/maven-metadata.xml.sha1 b/m2/webdavclient4j/webdavclient4j-vfs/maven-metadata.xml.sha1
similarity index 100%
rename from docx4j/m2/webdavclient4j/webdavclient4j-vfs/maven-metadata.xml.sha1
rename to m2/webdavclient4j/webdavclient4j-vfs/maven-metadata.xml.sha1
diff --git a/docx4j/pom.xml b/pom.xml
similarity index 100%
rename from docx4j/pom.xml
rename to pom.xml
diff --git a/docx4j/sample-docs/glox/Hier2Level.glox b/sample-docs/glox/Hier2Level.glox
similarity index 100%
rename from docx4j/sample-docs/glox/Hier2Level.glox
rename to sample-docs/glox/Hier2Level.glox
diff --git a/docx4j/sample-docs/glox/LICENSE.txt b/sample-docs/glox/LICENSE.txt
similarity index 100%
rename from docx4j/sample-docs/glox/LICENSE.txt
rename to sample-docs/glox/LICENSE.txt
diff --git a/docx4j/sample-docs/glox/VerticalProcessPair.glox b/sample-docs/glox/VerticalProcessPair.glox
similarity index 100%
rename from docx4j/sample-docs/glox/VerticalProcessPair.glox
rename to sample-docs/glox/VerticalProcessPair.glox
diff --git a/docx4j/sample-docs/pptx/pptx-basic.xml b/sample-docs/pptx/pptx-basic.xml
similarity index 100%
rename from docx4j/sample-docs/pptx/pptx-basic.xml
rename to sample-docs/pptx/pptx-basic.xml
diff --git a/docx4j/sample-docs/test-docs/endnotes.xml b/sample-docs/test-docs/endnotes.xml
similarity index 100%
rename from docx4j/sample-docs/test-docs/endnotes.xml
rename to sample-docs/test-docs/endnotes.xml
diff --git a/docx4j/sample-docs/test-docs/header-footer/header_first-and-odd-even.xml b/sample-docs/test-docs/header-footer/header_first-and-odd-even.xml
similarity index 100%
rename from docx4j/sample-docs/test-docs/header-footer/header_first-and-odd-even.xml
rename to sample-docs/test-docs/header-footer/header_first-and-odd-even.xml
diff --git a/docx4j/sample-docs/test-docs/header-footer/header_first.xml b/sample-docs/test-docs/header-footer/header_first.xml
similarity index 100%
rename from docx4j/sample-docs/test-docs/header-footer/header_first.xml
rename to sample-docs/test-docs/header-footer/header_first.xml
diff --git a/docx4j/sample-docs/test-docs/header-footer/header_odd.xml b/sample-docs/test-docs/header-footer/header_odd.xml
similarity index 100%
rename from docx4j/sample-docs/test-docs/header-footer/header_odd.xml
rename to sample-docs/test-docs/header-footer/header_odd.xml
diff --git a/docx4j/sample-docs/test-docs/header-footer/header_sections_linked.xml b/sample-docs/test-docs/header-footer/header_sections_linked.xml
similarity index 100%
rename from docx4j/sample-docs/test-docs/header-footer/header_sections_linked.xml
rename to sample-docs/test-docs/header-footer/header_sections_linked.xml
diff --git a/docx4j/sample-docs/test-docs/header-footer/header_sections_some-linked.xml b/sample-docs/test-docs/header-footer/header_sections_some-linked.xml
similarity index 100%
rename from docx4j/sample-docs/test-docs/header-footer/header_sections_some-linked.xml
rename to sample-docs/test-docs/header-footer/header_sections_some-linked.xml
diff --git a/docx4j/sample-docs/test-docs/header-footer/header_sections_unlinked.xml b/sample-docs/test-docs/header-footer/header_sections_unlinked.xml
similarity index 100%
rename from docx4j/sample-docs/test-docs/header-footer/header_sections_unlinked.xml
rename to sample-docs/test-docs/header-footer/header_sections_unlinked.xml
diff --git a/docx4j/sample-docs/test-docs/header-footer/header_simple.xml b/sample-docs/test-docs/header-footer/header_simple.xml
similarity index 100%
rename from docx4j/sample-docs/test-docs/header-footer/header_simple.xml
rename to sample-docs/test-docs/header-footer/header_simple.xml
diff --git a/docx4j/sample-docs/word/2003/word2003-vml.docx b/sample-docs/word/2003/word2003-vml.docx
similarity index 100%
rename from docx4j/sample-docs/word/2003/word2003-vml.docx
rename to sample-docs/word/2003/word2003-vml.docx
diff --git a/docx4j/sample-docs/word/2010/2010-glow-then-AlternateContent.docx b/sample-docs/word/2010/2010-glow-then-AlternateContent.docx
similarity index 100%
rename from docx4j/sample-docs/word/2010/2010-glow-then-AlternateContent.docx
rename to sample-docs/word/2010/2010-glow-then-AlternateContent.docx
diff --git a/docx4j/sample-docs/word/2010/2010-mcAlternateContent-MDP.docx b/sample-docs/word/2010/2010-mcAlternateContent-MDP.docx
similarity index 100%
rename from docx4j/sample-docs/word/2010/2010-mcAlternateContent-MDP.docx
rename to sample-docs/word/2010/2010-mcAlternateContent-MDP.docx
diff --git a/docx4j/sample-docs/word/2010/2010-mcAlternateContent-in-header.docx b/sample-docs/word/2010/2010-mcAlternateContent-in-header.docx
similarity index 100%
rename from docx4j/sample-docs/word/2010/2010-mcAlternateContent-in-header.docx
rename to sample-docs/word/2010/2010-mcAlternateContent-in-header.docx
diff --git a/docx4j/sample-docs/word/2010/2010-mcAlternateContent-in-header.xml b/sample-docs/word/2010/2010-mcAlternateContent-in-header.xml
similarity index 100%
rename from docx4j/sample-docs/word/2010/2010-mcAlternateContent-in-header.xml
rename to sample-docs/word/2010/2010-mcAlternateContent-in-header.xml
diff --git a/docx4j/sample-docs/word/2010/2010-mcAlternateContent.docx b/sample-docs/word/2010/2010-mcAlternateContent.docx
similarity index 100%
rename from docx4j/sample-docs/word/2010/2010-mcAlternateContent.docx
rename to sample-docs/word/2010/2010-mcAlternateContent.docx
diff --git a/docx4j/sample-docs/word/2010/2010-sample1.docx b/sample-docs/word/2010/2010-sample1.docx
similarity index 100%
rename from docx4j/sample-docs/word/2010/2010-sample1.docx
rename to sample-docs/word/2010/2010-sample1.docx
diff --git a/docx4j/sample-docs/word/FontEmbedded.docx b/sample-docs/word/FontEmbedded.docx
similarity index 100%
rename from docx4j/sample-docs/word/FontEmbedded.docx
rename to sample-docs/word/FontEmbedded.docx
diff --git a/docx4j/sample-docs/word/Images.docx b/sample-docs/word/Images.docx
similarity index 100%
rename from docx4j/sample-docs/word/Images.docx
rename to sample-docs/word/Images.docx
diff --git a/docx4j/sample-docs/word/Table.docx b/sample-docs/word/Table.docx
similarity index 100%
rename from docx4j/sample-docs/word/Table.docx
rename to sample-docs/word/Table.docx
diff --git a/docx4j/sample-docs/word/Word2007-fonts.docx b/sample-docs/word/Word2007-fonts.docx
similarity index 100%
rename from docx4j/sample-docs/word/Word2007-fonts.docx
rename to sample-docs/word/Word2007-fonts.docx
diff --git a/docx4j/sample-docs/word/chunk.docx b/sample-docs/word/chunk.docx
similarity index 100%
rename from docx4j/sample-docs/word/chunk.docx
rename to sample-docs/word/chunk.docx
diff --git a/docx4j/sample-docs/word/databinding/CountryRegions.xml b/sample-docs/word/databinding/CountryRegions.xml
similarity index 100%
rename from docx4j/sample-docs/word/databinding/CountryRegions.xml
rename to sample-docs/word/databinding/CountryRegions.xml
diff --git a/docx4j/sample-docs/word/databinding/NumberSearch.xml b/sample-docs/word/databinding/NumberSearch.xml
similarity index 100%
rename from docx4j/sample-docs/word/databinding/NumberSearch.xml
rename to sample-docs/word/databinding/NumberSearch.xml
diff --git a/docx4j/sample-docs/word/databinding/WordAddIn_walkthrough.docx b/sample-docs/word/databinding/WordAddIn_walkthrough.docx
similarity index 100%
rename from docx4j/sample-docs/word/databinding/WordAddIn_walkthrough.docx
rename to sample-docs/word/databinding/WordAddIn_walkthrough.docx
diff --git a/docx4j/sample-docs/word/databinding/WordAddIn_walkthrough.pdf b/sample-docs/word/databinding/WordAddIn_walkthrough.pdf
similarity index 100%
rename from docx4j/sample-docs/word/databinding/WordAddIn_walkthrough.pdf
rename to sample-docs/word/databinding/WordAddIn_walkthrough.pdf
diff --git a/docx4j/sample-docs/word/databinding/component-host.xml b/sample-docs/word/databinding/component-host.xml
similarity index 100%
rename from docx4j/sample-docs/word/databinding/component-host.xml
rename to sample-docs/word/databinding/component-host.xml
diff --git a/docx4j/sample-docs/word/databinding/component-subdoc.docx b/sample-docs/word/databinding/component-subdoc.docx
similarity index 100%
rename from docx4j/sample-docs/word/databinding/component-subdoc.docx
rename to sample-docs/word/databinding/component-subdoc.docx
diff --git a/docx4j/sample-docs/word/databinding/conventions.docx b/sample-docs/word/databinding/conventions.docx
similarity index 100%
rename from docx4j/sample-docs/word/databinding/conventions.docx
rename to sample-docs/word/databinding/conventions.docx
diff --git a/docx4j/sample-docs/word/databinding/conventions.html b/sample-docs/word/databinding/conventions.html
similarity index 100%
rename from docx4j/sample-docs/word/databinding/conventions.html
rename to sample-docs/word/databinding/conventions.html
diff --git a/docx4j/sample-docs/word/databinding/hyperlink-binding-test.docx b/sample-docs/word/databinding/hyperlink-binding-test.docx
similarity index 100%
rename from docx4j/sample-docs/word/databinding/hyperlink-binding-test.docx
rename to sample-docs/word/databinding/hyperlink-binding-test.docx
diff --git a/docx4j/sample-docs/word/databinding/invoice.docx b/sample-docs/word/databinding/invoice.docx
similarity index 100%
rename from docx4j/sample-docs/word/databinding/invoice.docx
rename to sample-docs/word/databinding/invoice.docx
diff --git a/docx4j/sample-docs/word/databinding/non-element-bind.docx b/sample-docs/word/databinding/non-element-bind.docx
similarity index 100%
rename from docx4j/sample-docs/word/databinding/non-element-bind.docx
rename to sample-docs/word/databinding/non-element-bind.docx
diff --git a/docx4j/sample-docs/word/databinding/picture-bind.docx b/sample-docs/word/databinding/picture-bind.docx
similarity index 100%
rename from docx4j/sample-docs/word/databinding/picture-bind.docx
rename to sample-docs/word/databinding/picture-bind.docx
diff --git a/docx4j/sample-docs/word/decracdiscrim1.docx b/sample-docs/word/decracdiscrim1.docx
similarity index 100%
rename from docx4j/sample-docs/word/decracdiscrim1.docx
rename to sample-docs/word/decracdiscrim1.docx
diff --git a/docx4j/sample-docs/word/docProps.docx b/sample-docs/word/docProps.docx
similarity index 100%
rename from docx4j/sample-docs/word/docProps.docx
rename to sample-docs/word/docProps.docx
diff --git a/docx4j/sample-docs/word/fonts-modesOfApplication.docx b/sample-docs/word/fonts-modesOfApplication.docx
similarity index 100%
rename from docx4j/sample-docs/word/fonts-modesOfApplication.docx
rename to sample-docs/word/fonts-modesOfApplication.docx
diff --git a/docx4j/sample-docs/word/hyperlinks-internal.docx b/sample-docs/word/hyperlinks-internal.docx
similarity index 100%
rename from docx4j/sample-docs/word/hyperlinks-internal.docx
rename to sample-docs/word/hyperlinks-internal.docx
diff --git a/docx4j/sample-docs/word/metafile-samples/EMF.docx b/sample-docs/word/metafile-samples/EMF.docx
similarity index 100%
rename from docx4j/sample-docs/word/metafile-samples/EMF.docx
rename to sample-docs/word/metafile-samples/EMF.docx
diff --git a/docx4j/sample-docs/word/metafile-samples/WMF.docx b/sample-docs/word/metafile-samples/WMF.docx
similarity index 100%
rename from docx4j/sample-docs/word/metafile-samples/WMF.docx
rename to sample-docs/word/metafile-samples/WMF.docx
diff --git a/docx4j/sample-docs/word/metafile-samples/freehand_emfprinter.emf b/sample-docs/word/metafile-samples/freehand_emfprinter.emf
similarity index 100%
rename from docx4j/sample-docs/word/metafile-samples/freehand_emfprinter.emf
rename to sample-docs/word/metafile-samples/freehand_emfprinter.emf
diff --git a/docx4j/sample-docs/word/metafile-samples/freehand_picture_saveas.emf b/sample-docs/word/metafile-samples/freehand_picture_saveas.emf
similarity index 100%
rename from docx4j/sample-docs/word/metafile-samples/freehand_picture_saveas.emf
rename to sample-docs/word/metafile-samples/freehand_picture_saveas.emf
diff --git a/docx4j/sample-docs/word/metafile-samples/freehand_picture_saveas.wmf b/sample-docs/word/metafile-samples/freehand_picture_saveas.wmf
similarity index 100%
rename from docx4j/sample-docs/word/metafile-samples/freehand_picture_saveas.wmf
rename to sample-docs/word/metafile-samples/freehand_picture_saveas.wmf
diff --git a/docx4j/sample-docs/word/metafile-samples/freehand_ppt_saveas.emf b/sample-docs/word/metafile-samples/freehand_ppt_saveas.emf
similarity index 100%
rename from docx4j/sample-docs/word/metafile-samples/freehand_ppt_saveas.emf
rename to sample-docs/word/metafile-samples/freehand_ppt_saveas.emf
diff --git a/docx4j/sample-docs/word/metafile-samples/freehand_ppt_saveas.wmf b/sample-docs/word/metafile-samples/freehand_ppt_saveas.wmf
similarity index 100%
rename from docx4j/sample-docs/word/metafile-samples/freehand_ppt_saveas.wmf
rename to sample-docs/word/metafile-samples/freehand_ppt_saveas.wmf
diff --git a/docx4j/sample-docs/word/metafile-samples/gradient.emf b/sample-docs/word/metafile-samples/gradient.emf
similarity index 100%
rename from docx4j/sample-docs/word/metafile-samples/gradient.emf
rename to sample-docs/word/metafile-samples/gradient.emf
diff --git a/docx4j/sample-docs/word/metafile-samples/pptx.emf b/sample-docs/word/metafile-samples/pptx.emf
similarity index 100%
rename from docx4j/sample-docs/word/metafile-samples/pptx.emf
rename to sample-docs/word/metafile-samples/pptx.emf
diff --git a/docx4j/sample-docs/word/metafile-samples/star_picture_save_as.emf b/sample-docs/word/metafile-samples/star_picture_save_as.emf
similarity index 100%
rename from docx4j/sample-docs/word/metafile-samples/star_picture_save_as.emf
rename to sample-docs/word/metafile-samples/star_picture_save_as.emf
diff --git a/docx4j/sample-docs/word/metafile-samples/star_picture_save_as.wmf b/sample-docs/word/metafile-samples/star_picture_save_as.wmf
similarity index 100%
rename from docx4j/sample-docs/word/metafile-samples/star_picture_save_as.wmf
rename to sample-docs/word/metafile-samples/star_picture_save_as.wmf
diff --git a/docx4j/sample-docs/word/numberingrestart.xml b/sample-docs/word/numberingrestart.xml
similarity index 100%
rename from docx4j/sample-docs/word/numberingrestart.xml
rename to sample-docs/word/numberingrestart.xml
diff --git a/docx4j/sample-docs/word/pkg.pkg b/sample-docs/word/pkg.pkg
similarity index 100%
rename from docx4j/sample-docs/word/pkg.pkg
rename to sample-docs/word/pkg.pkg
diff --git a/docx4j/sample-docs/word/sample-docx.docx b/sample-docs/word/sample-docx.docx
similarity index 100%
rename from docx4j/sample-docs/word/sample-docx.docx
rename to sample-docs/word/sample-docx.docx
diff --git a/docx4j/sample-docs/word/sample-docx.xml b/sample-docs/word/sample-docx.xml
similarity index 100%
rename from docx4j/sample-docs/word/sample-docx.xml
rename to sample-docs/word/sample-docx.xml
diff --git a/docx4j/sample-docs/word/table-features.xml b/sample-docs/word/table-features.xml
similarity index 100%
rename from docx4j/sample-docs/word/table-features.xml
rename to sample-docs/word/table-features.xml
diff --git a/docx4j/sample-docs/word/table-spans.xml b/sample-docs/word/table-spans.xml
similarity index 100%
rename from docx4j/sample-docs/word/table-spans.xml
rename to sample-docs/word/table-spans.xml
diff --git a/docx4j/sample-docs/word/unmarshallFromTemplateExample.docx b/sample-docs/word/unmarshallFromTemplateExample.docx
similarity index 100%
rename from docx4j/sample-docs/word/unmarshallFromTemplateExample.docx
rename to sample-docs/word/unmarshallFromTemplateExample.docx
diff --git a/docx4j/sample-docs/xlsx/comments.xlsx b/sample-docs/xlsx/comments.xlsx
similarity index 100%
rename from docx4j/sample-docs/xlsx/comments.xlsx
rename to sample-docs/xlsx/comments.xlsx
diff --git a/docx4j/sample-docs/xlsx/pivot.xlsm b/sample-docs/xlsx/pivot.xlsm
similarity index 100%
rename from docx4j/sample-docs/xlsx/pivot.xlsm
rename to sample-docs/xlsx/pivot.xlsm
diff --git a/docx4j/src/diffx/com/topologi/diffx/Constants.java b/src/diffx/com/topologi/diffx/Constants.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/Constants.java
rename to src/diffx/com/topologi/diffx/Constants.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/DiffXException.java b/src/diffx/com/topologi/diffx/DiffXException.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/DiffXException.java
rename to src/diffx/com/topologi/diffx/DiffXException.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/Docx4jDriver.java b/src/diffx/com/topologi/diffx/Docx4jDriver.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/Docx4jDriver.java
rename to src/diffx/com/topologi/diffx/Docx4jDriver.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/Main.java b/src/diffx/com/topologi/diffx/Main.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/Main.java
rename to src/diffx/com/topologi/diffx/Main.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXAlgorithm.java b/src/diffx/com/topologi/diffx/algorithm/DiffXAlgorithm.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXAlgorithm.java
rename to src/diffx/com/topologi/diffx/algorithm/DiffXAlgorithm.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXAlgorithmBase.java b/src/diffx/com/topologi/diffx/algorithm/DiffXAlgorithmBase.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXAlgorithmBase.java
rename to src/diffx/com/topologi/diffx/algorithm/DiffXAlgorithmBase.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXFactory.java b/src/diffx/com/topologi/diffx/algorithm/DiffXFactory.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXFactory.java
rename to src/diffx/com/topologi/diffx/algorithm/DiffXFactory.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXFitWesyma.java b/src/diffx/com/topologi/diffx/algorithm/DiffXFitWesyma.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXFitWesyma.java
rename to src/diffx/com/topologi/diffx/algorithm/DiffXFitWesyma.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXFitopsy.java b/src/diffx/com/topologi/diffx/algorithm/DiffXFitopsy.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXFitopsy.java
rename to src/diffx/com/topologi/diffx/algorithm/DiffXFitopsy.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXFitsy.java b/src/diffx/com/topologi/diffx/algorithm/DiffXFitsy.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXFitsy.java
rename to src/diffx/com/topologi/diffx/algorithm/DiffXFitsy.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXKumarRangan.java b/src/diffx/com/topologi/diffx/algorithm/DiffXKumarRangan.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/algorithm/DiffXKumarRangan.java
rename to src/diffx/com/topologi/diffx/algorithm/DiffXKumarRangan.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/algorithm/ElementState.java b/src/diffx/com/topologi/diffx/algorithm/ElementState.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/algorithm/ElementState.java
rename to src/diffx/com/topologi/diffx/algorithm/ElementState.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/algorithm/FactoryException.java b/src/diffx/com/topologi/diffx/algorithm/FactoryException.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/algorithm/FactoryException.java
rename to src/diffx/com/topologi/diffx/algorithm/FactoryException.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/algorithm/Matrix.java b/src/diffx/com/topologi/diffx/algorithm/Matrix.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/algorithm/Matrix.java
rename to src/diffx/com/topologi/diffx/algorithm/Matrix.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/algorithm/MatrixInt.java b/src/diffx/com/topologi/diffx/algorithm/MatrixInt.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/algorithm/MatrixInt.java
rename to src/diffx/com/topologi/diffx/algorithm/MatrixInt.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/algorithm/MatrixShort.java b/src/diffx/com/topologi/diffx/algorithm/MatrixShort.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/algorithm/MatrixShort.java
rename to src/diffx/com/topologi/diffx/algorithm/MatrixShort.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/algorithm/package.html b/src/diffx/com/topologi/diffx/algorithm/package.html
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/algorithm/package.html
rename to src/diffx/com/topologi/diffx/algorithm/package.html
diff --git a/docx4j/src/diffx/com/topologi/diffx/config/DiffXConfig.java b/src/diffx/com/topologi/diffx/config/DiffXConfig.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/config/DiffXConfig.java
rename to src/diffx/com/topologi/diffx/config/DiffXConfig.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/AttributeEvent.java b/src/diffx/com/topologi/diffx/event/AttributeEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/AttributeEvent.java
rename to src/diffx/com/topologi/diffx/event/AttributeEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/CloseElementEvent.java b/src/diffx/com/topologi/diffx/event/CloseElementEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/CloseElementEvent.java
rename to src/diffx/com/topologi/diffx/event/CloseElementEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/DiffXEvent.java b/src/diffx/com/topologi/diffx/event/DiffXEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/DiffXEvent.java
rename to src/diffx/com/topologi/diffx/event/DiffXEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/OpenElementEvent.java b/src/diffx/com/topologi/diffx/event/OpenElementEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/OpenElementEvent.java
rename to src/diffx/com/topologi/diffx/event/OpenElementEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/TextEvent.java b/src/diffx/com/topologi/diffx/event/TextEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/TextEvent.java
rename to src/diffx/com/topologi/diffx/event/TextEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/AttributeEventImpl.java b/src/diffx/com/topologi/diffx/event/impl/AttributeEventImpl.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/AttributeEventImpl.java
rename to src/diffx/com/topologi/diffx/event/impl/AttributeEventImpl.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/AttributeEventNSImpl.java b/src/diffx/com/topologi/diffx/event/impl/AttributeEventNSImpl.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/AttributeEventNSImpl.java
rename to src/diffx/com/topologi/diffx/event/impl/AttributeEventNSImpl.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/CharEvent.java b/src/diffx/com/topologi/diffx/event/impl/CharEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/CharEvent.java
rename to src/diffx/com/topologi/diffx/event/impl/CharEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/CharactersEvent.java b/src/diffx/com/topologi/diffx/event/impl/CharactersEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/CharactersEvent.java
rename to src/diffx/com/topologi/diffx/event/impl/CharactersEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/CharactersEventBase.java b/src/diffx/com/topologi/diffx/event/impl/CharactersEventBase.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/CharactersEventBase.java
rename to src/diffx/com/topologi/diffx/event/impl/CharactersEventBase.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/CloseElementEventImpl.java b/src/diffx/com/topologi/diffx/event/impl/CloseElementEventImpl.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/CloseElementEventImpl.java
rename to src/diffx/com/topologi/diffx/event/impl/CloseElementEventImpl.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/CloseElementEventNSImpl.java b/src/diffx/com/topologi/diffx/event/impl/CloseElementEventNSImpl.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/CloseElementEventNSImpl.java
rename to src/diffx/com/topologi/diffx/event/impl/CloseElementEventNSImpl.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/CommentEvent.java b/src/diffx/com/topologi/diffx/event/impl/CommentEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/CommentEvent.java
rename to src/diffx/com/topologi/diffx/event/impl/CommentEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/DiffXEventBase.java b/src/diffx/com/topologi/diffx/event/impl/DiffXEventBase.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/DiffXEventBase.java
rename to src/diffx/com/topologi/diffx/event/impl/DiffXEventBase.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/EventFactory.java b/src/diffx/com/topologi/diffx/event/impl/EventFactory.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/EventFactory.java
rename to src/diffx/com/topologi/diffx/event/impl/EventFactory.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/IgnorableSpaceEvent.java b/src/diffx/com/topologi/diffx/event/impl/IgnorableSpaceEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/IgnorableSpaceEvent.java
rename to src/diffx/com/topologi/diffx/event/impl/IgnorableSpaceEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/LineEvent.java b/src/diffx/com/topologi/diffx/event/impl/LineEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/LineEvent.java
rename to src/diffx/com/topologi/diffx/event/impl/LineEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/OpenElementEventImpl.java b/src/diffx/com/topologi/diffx/event/impl/OpenElementEventImpl.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/OpenElementEventImpl.java
rename to src/diffx/com/topologi/diffx/event/impl/OpenElementEventImpl.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/OpenElementEventNSImpl.java b/src/diffx/com/topologi/diffx/event/impl/OpenElementEventNSImpl.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/OpenElementEventNSImpl.java
rename to src/diffx/com/topologi/diffx/event/impl/OpenElementEventNSImpl.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/ProcessingInstructionEvent.java b/src/diffx/com/topologi/diffx/event/impl/ProcessingInstructionEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/ProcessingInstructionEvent.java
rename to src/diffx/com/topologi/diffx/event/impl/ProcessingInstructionEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/SpaceEvent.java b/src/diffx/com/topologi/diffx/event/impl/SpaceEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/SpaceEvent.java
rename to src/diffx/com/topologi/diffx/event/impl/SpaceEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/WordEvent.java b/src/diffx/com/topologi/diffx/event/impl/WordEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/WordEvent.java
rename to src/diffx/com/topologi/diffx/event/impl/WordEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/XMLBranchEvent.java b/src/diffx/com/topologi/diffx/event/impl/XMLBranchEvent.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/XMLBranchEvent.java
rename to src/diffx/com/topologi/diffx/event/impl/XMLBranchEvent.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/impl/package.html b/src/diffx/com/topologi/diffx/event/impl/package.html
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/impl/package.html
rename to src/diffx/com/topologi/diffx/event/impl/package.html
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/lang/CommonWordsEnglish.java b/src/diffx/com/topologi/diffx/event/lang/CommonWordsEnglish.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/lang/CommonWordsEnglish.java
rename to src/diffx/com/topologi/diffx/event/lang/CommonWordsEnglish.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/lang/Repertory.java b/src/diffx/com/topologi/diffx/event/lang/Repertory.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/lang/Repertory.java
rename to src/diffx/com/topologi/diffx/event/lang/Repertory.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/lang/package.html b/src/diffx/com/topologi/diffx/event/lang/package.html
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/lang/package.html
rename to src/diffx/com/topologi/diffx/event/lang/package.html
diff --git a/docx4j/src/diffx/com/topologi/diffx/event/package.html b/src/diffx/com/topologi/diffx/event/package.html
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/event/package.html
rename to src/diffx/com/topologi/diffx/event/package.html
diff --git a/docx4j/src/diffx/com/topologi/diffx/format/DiffXFormatter.java b/src/diffx/com/topologi/diffx/format/DiffXFormatter.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/format/DiffXFormatter.java
rename to src/diffx/com/topologi/diffx/format/DiffXFormatter.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/format/ShortStringFormatter.java b/src/diffx/com/topologi/diffx/format/ShortStringFormatter.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/format/ShortStringFormatter.java
rename to src/diffx/com/topologi/diffx/format/ShortStringFormatter.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/format/SmartXMLFormatter.java b/src/diffx/com/topologi/diffx/format/SmartXMLFormatter.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/format/SmartXMLFormatter.java
rename to src/diffx/com/topologi/diffx/format/SmartXMLFormatter.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/format/StrictXMLFormatter.java b/src/diffx/com/topologi/diffx/format/StrictXMLFormatter.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/format/StrictXMLFormatter.java
rename to src/diffx/com/topologi/diffx/format/StrictXMLFormatter.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/format/XMLDiffXFormatter.java b/src/diffx/com/topologi/diffx/format/XMLDiffXFormatter.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/format/XMLDiffXFormatter.java
rename to src/diffx/com/topologi/diffx/format/XMLDiffXFormatter.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/format/package.html b/src/diffx/com/topologi/diffx/format/package.html
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/format/package.html
rename to src/diffx/com/topologi/diffx/format/package.html
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/AttributeComparator.java b/src/diffx/com/topologi/diffx/load/AttributeComparator.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/AttributeComparator.java
rename to src/diffx/com/topologi/diffx/load/AttributeComparator.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/DOMRecorder.java b/src/diffx/com/topologi/diffx/load/DOMRecorder.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/DOMRecorder.java
rename to src/diffx/com/topologi/diffx/load/DOMRecorder.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/LoadingException.java b/src/diffx/com/topologi/diffx/load/LoadingException.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/LoadingException.java
rename to src/diffx/com/topologi/diffx/load/LoadingException.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/Recorder.java b/src/diffx/com/topologi/diffx/load/Recorder.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/Recorder.java
rename to src/diffx/com/topologi/diffx/load/Recorder.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/SAXRecorder.java b/src/diffx/com/topologi/diffx/load/SAXRecorder.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/SAXRecorder.java
rename to src/diffx/com/topologi/diffx/load/SAXRecorder.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/TextRecorder.java b/src/diffx/com/topologi/diffx/load/TextRecorder.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/TextRecorder.java
rename to src/diffx/com/topologi/diffx/load/TextRecorder.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/XMLRecorder.java b/src/diffx/com/topologi/diffx/load/XMLRecorder.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/XMLRecorder.java
rename to src/diffx/com/topologi/diffx/load/XMLRecorder.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/package.html b/src/diffx/com/topologi/diffx/load/package.html
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/package.html
rename to src/diffx/com/topologi/diffx/load/package.html
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/text/CharactersTokeniser.java b/src/diffx/com/topologi/diffx/load/text/CharactersTokeniser.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/text/CharactersTokeniser.java
rename to src/diffx/com/topologi/diffx/load/text/CharactersTokeniser.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/text/TextTokeniser.java b/src/diffx/com/topologi/diffx/load/text/TextTokeniser.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/text/TextTokeniser.java
rename to src/diffx/com/topologi/diffx/load/text/TextTokeniser.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/text/TextTokeniserByWord.java b/src/diffx/com/topologi/diffx/load/text/TextTokeniserByWord.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/text/TextTokeniserByWord.java
rename to src/diffx/com/topologi/diffx/load/text/TextTokeniserByWord.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/text/TextTokeniserIgnoreSpace.java b/src/diffx/com/topologi/diffx/load/text/TextTokeniserIgnoreSpace.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/text/TextTokeniserIgnoreSpace.java
rename to src/diffx/com/topologi/diffx/load/text/TextTokeniserIgnoreSpace.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/text/TextTokeniserNoSpace.java b/src/diffx/com/topologi/diffx/load/text/TextTokeniserNoSpace.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/text/TextTokeniserNoSpace.java
rename to src/diffx/com/topologi/diffx/load/text/TextTokeniserNoSpace.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/text/TextTokeniserSentence.java b/src/diffx/com/topologi/diffx/load/text/TextTokeniserSentence.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/text/TextTokeniserSentence.java
rename to src/diffx/com/topologi/diffx/load/text/TextTokeniserSentence.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/text/TextTokeniserSingleBlock.java b/src/diffx/com/topologi/diffx/load/text/TextTokeniserSingleBlock.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/text/TextTokeniserSingleBlock.java
rename to src/diffx/com/topologi/diffx/load/text/TextTokeniserSingleBlock.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/text/TokeniserFactory.java b/src/diffx/com/topologi/diffx/load/text/TokeniserFactory.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/text/TokeniserFactory.java
rename to src/diffx/com/topologi/diffx/load/text/TokeniserFactory.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/load/text/package.html b/src/diffx/com/topologi/diffx/load/text/package.html
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/load/text/package.html
rename to src/diffx/com/topologi/diffx/load/text/package.html
diff --git a/docx4j/src/diffx/com/topologi/diffx/package.html b/src/diffx/com/topologi/diffx/package.html
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/package.html
rename to src/diffx/com/topologi/diffx/package.html
diff --git a/docx4j/src/diffx/com/topologi/diffx/sequence/EventSequence.java b/src/diffx/com/topologi/diffx/sequence/EventSequence.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/sequence/EventSequence.java
rename to src/diffx/com/topologi/diffx/sequence/EventSequence.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/sequence/EventSequenceUtils.java b/src/diffx/com/topologi/diffx/sequence/EventSequenceUtils.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/sequence/EventSequenceUtils.java
rename to src/diffx/com/topologi/diffx/sequence/EventSequenceUtils.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/sequence/NaiveSequenceSlicer.java b/src/diffx/com/topologi/diffx/sequence/NaiveSequenceSlicer.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/sequence/NaiveSequenceSlicer.java
rename to src/diffx/com/topologi/diffx/sequence/NaiveSequenceSlicer.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/sequence/PrefixMapping.java b/src/diffx/com/topologi/diffx/sequence/PrefixMapping.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/sequence/PrefixMapping.java
rename to src/diffx/com/topologi/diffx/sequence/PrefixMapping.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/sequence/SequenceSlicer.java b/src/diffx/com/topologi/diffx/sequence/SequenceSlicer.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/sequence/SequenceSlicer.java
rename to src/diffx/com/topologi/diffx/sequence/SequenceSlicer.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/sequence/package.html b/src/diffx/com/topologi/diffx/sequence/package.html
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/sequence/package.html
rename to src/diffx/com/topologi/diffx/sequence/package.html
diff --git a/docx4j/src/diffx/com/topologi/diffx/util/XMLFilenameFilter.java b/src/diffx/com/topologi/diffx/util/XMLFilenameFilter.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/util/XMLFilenameFilter.java
rename to src/diffx/com/topologi/diffx/util/XMLFilenameFilter.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/util/package.html b/src/diffx/com/topologi/diffx/util/package.html
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/util/package.html
rename to src/diffx/com/topologi/diffx/util/package.html
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/NSAwareXMLWriter.java b/src/diffx/com/topologi/diffx/xml/NSAwareXMLWriter.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/NSAwareXMLWriter.java
rename to src/diffx/com/topologi/diffx/xml/NSAwareXMLWriter.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/SimpleXMLWriter.java b/src/diffx/com/topologi/diffx/xml/SimpleXMLWriter.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/SimpleXMLWriter.java
rename to src/diffx/com/topologi/diffx/xml/SimpleXMLWriter.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/UndeclaredNamespaceException.java b/src/diffx/com/topologi/diffx/xml/UndeclaredNamespaceException.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/UndeclaredNamespaceException.java
rename to src/diffx/com/topologi/diffx/xml/UndeclaredNamespaceException.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/XMLFormattable.java b/src/diffx/com/topologi/diffx/xml/XMLFormattable.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/XMLFormattable.java
rename to src/diffx/com/topologi/diffx/xml/XMLFormattable.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/XMLHelper.java b/src/diffx/com/topologi/diffx/xml/XMLHelper.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/XMLHelper.java
rename to src/diffx/com/topologi/diffx/xml/XMLHelper.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/XMLIndenter.java b/src/diffx/com/topologi/diffx/xml/XMLIndenter.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/XMLIndenter.java
rename to src/diffx/com/topologi/diffx/xml/XMLIndenter.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/XMLSerializable.java b/src/diffx/com/topologi/diffx/xml/XMLSerializable.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/XMLSerializable.java
rename to src/diffx/com/topologi/diffx/xml/XMLSerializable.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/XMLSerializer.java b/src/diffx/com/topologi/diffx/xml/XMLSerializer.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/XMLSerializer.java
rename to src/diffx/com/topologi/diffx/xml/XMLSerializer.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/XMLUtils.java b/src/diffx/com/topologi/diffx/xml/XMLUtils.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/XMLUtils.java
rename to src/diffx/com/topologi/diffx/xml/XMLUtils.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/XMLWritable.java b/src/diffx/com/topologi/diffx/xml/XMLWritable.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/XMLWritable.java
rename to src/diffx/com/topologi/diffx/xml/XMLWritable.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/XMLWriter.java b/src/diffx/com/topologi/diffx/xml/XMLWriter.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/XMLWriter.java
rename to src/diffx/com/topologi/diffx/xml/XMLWriter.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/XMLWriterBase.java b/src/diffx/com/topologi/diffx/xml/XMLWriterBase.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/XMLWriterBase.java
rename to src/diffx/com/topologi/diffx/xml/XMLWriterBase.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscape.java b/src/diffx/com/topologi/diffx/xml/esc/XMLEscape.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscape.java
rename to src/diffx/com/topologi/diffx/xml/esc/XMLEscape.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeASCII.java b/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeASCII.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeASCII.java
rename to src/diffx/com/topologi/diffx/xml/esc/XMLEscapeASCII.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeBase.java b/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeBase.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeBase.java
rename to src/diffx/com/topologi/diffx/xml/esc/XMLEscapeBase.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeFactory.java b/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeFactory.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeFactory.java
rename to src/diffx/com/topologi/diffx/xml/esc/XMLEscapeFactory.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeUTF8.java b/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeUTF8.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeUTF8.java
rename to src/diffx/com/topologi/diffx/xml/esc/XMLEscapeUTF8.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriter.java b/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriter.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriter.java
rename to src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriter.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriterASCII.java b/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriterASCII.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriterASCII.java
rename to src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriterASCII.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriterBase.java b/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriterBase.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriterBase.java
rename to src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriterBase.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriterUTF8.java b/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriterUTF8.java
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriterUTF8.java
rename to src/diffx/com/topologi/diffx/xml/esc/XMLEscapeWriterUTF8.java
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/esc/package.html b/src/diffx/com/topologi/diffx/xml/esc/package.html
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/esc/package.html
rename to src/diffx/com/topologi/diffx/xml/esc/package.html
diff --git a/docx4j/src/diffx/com/topologi/diffx/xml/package.html b/src/diffx/com/topologi/diffx/xml/package.html
similarity index 100%
rename from docx4j/src/diffx/com/topologi/diffx/xml/package.html
rename to src/diffx/com/topologi/diffx/xml/package.html
diff --git a/docx4j/src/diffx/org/eclipse/compare/EventSequenceComparator.java b/src/diffx/org/eclipse/compare/EventSequenceComparator.java
similarity index 100%
rename from docx4j/src/diffx/org/eclipse/compare/EventSequenceComparator.java
rename to src/diffx/org/eclipse/compare/EventSequenceComparator.java
diff --git a/docx4j/src/diffx/org/eclipse/compare/StringComparator.java b/src/diffx/org/eclipse/compare/StringComparator.java
similarity index 100%
rename from docx4j/src/diffx/org/eclipse/compare/StringComparator.java
rename to src/diffx/org/eclipse/compare/StringComparator.java
diff --git a/docx4j/src/diffx/org/eclipse/compare/internal/CompareMessages.java b/src/diffx/org/eclipse/compare/internal/CompareMessages.java
similarity index 100%
rename from docx4j/src/diffx/org/eclipse/compare/internal/CompareMessages.java
rename to src/diffx/org/eclipse/compare/internal/CompareMessages.java
diff --git a/docx4j/src/diffx/org/eclipse/compare/internal/LCS.java b/src/diffx/org/eclipse/compare/internal/LCS.java
similarity index 100%
rename from docx4j/src/diffx/org/eclipse/compare/internal/LCS.java
rename to src/diffx/org/eclipse/compare/internal/LCS.java
diff --git a/docx4j/src/diffx/org/eclipse/compare/internal/LCSSettings.java b/src/diffx/org/eclipse/compare/internal/LCSSettings.java
similarity index 100%
rename from docx4j/src/diffx/org/eclipse/compare/internal/LCSSettings.java
rename to src/diffx/org/eclipse/compare/internal/LCSSettings.java
diff --git a/docx4j/src/diffx/org/eclipse/compare/rangedifferencer/DifferencesIterator.java b/src/diffx/org/eclipse/compare/rangedifferencer/DifferencesIterator.java
similarity index 100%
rename from docx4j/src/diffx/org/eclipse/compare/rangedifferencer/DifferencesIterator.java
rename to src/diffx/org/eclipse/compare/rangedifferencer/DifferencesIterator.java
diff --git a/docx4j/src/diffx/org/eclipse/compare/rangedifferencer/IRangeComparator.java b/src/diffx/org/eclipse/compare/rangedifferencer/IRangeComparator.java
similarity index 100%
rename from docx4j/src/diffx/org/eclipse/compare/rangedifferencer/IRangeComparator.java
rename to src/diffx/org/eclipse/compare/rangedifferencer/IRangeComparator.java
diff --git a/docx4j/src/diffx/org/eclipse/compare/rangedifferencer/OldDifferencer.java b/src/diffx/org/eclipse/compare/rangedifferencer/OldDifferencer.java
similarity index 100%
rename from docx4j/src/diffx/org/eclipse/compare/rangedifferencer/OldDifferencer.java
rename to src/diffx/org/eclipse/compare/rangedifferencer/OldDifferencer.java
diff --git a/docx4j/src/diffx/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java b/src/diffx/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java
similarity index 100%
rename from docx4j/src/diffx/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java
rename to src/diffx/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java
diff --git a/docx4j/src/diffx/org/eclipse/compare/rangedifferencer/RangeDifference.java b/src/diffx/org/eclipse/compare/rangedifferencer/RangeDifference.java
similarity index 100%
rename from docx4j/src/diffx/org/eclipse/compare/rangedifferencer/RangeDifference.java
rename to src/diffx/org/eclipse/compare/rangedifferencer/RangeDifference.java
diff --git a/docx4j/src/diffx/org/eclipse/compare/rangedifferencer/RangeDifferencer.java b/src/diffx/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
similarity index 100%
rename from docx4j/src/diffx/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
rename to src/diffx/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
diff --git a/docx4j/src/docx4j-extras/PdfViaHtml/org/docx4j/convert/out/pdf/viaHTML/Conversion.java b/src/docx4j-extras/PdfViaHtml/org/docx4j/convert/out/pdf/viaHTML/Conversion.java
similarity index 100%
rename from docx4j/src/docx4j-extras/PdfViaHtml/org/docx4j/convert/out/pdf/viaHTML/Conversion.java
rename to src/docx4j-extras/PdfViaHtml/org/docx4j/convert/out/pdf/viaHTML/Conversion.java
diff --git a/docx4j/src/docx4j-extras/PdfViaIText/org/docx4j/convert/out/pdf/viaIText/Conversion.java b/src/docx4j-extras/PdfViaIText/org/docx4j/convert/out/pdf/viaIText/Conversion.java
similarity index 100%
rename from docx4j/src/docx4j-extras/PdfViaIText/org/docx4j/convert/out/pdf/viaIText/Conversion.java
rename to src/docx4j-extras/PdfViaIText/org/docx4j/convert/out/pdf/viaIText/Conversion.java
diff --git a/docx4j/src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/AlfrescoJcrNodeMapper.java b/src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/AlfrescoJcrNodeMapper.java
similarity index 100%
rename from docx4j/src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/AlfrescoJcrNodeMapper.java
rename to src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/AlfrescoJcrNodeMapper.java
diff --git a/docx4j/src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/ISO9075.java b/src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/ISO9075.java
similarity index 100%
rename from docx4j/src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/ISO9075.java
rename to src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/ISO9075.java
diff --git a/docx4j/src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/JackrabbitJcrNodeMapper.java b/src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/JackrabbitJcrNodeMapper.java
similarity index 100%
rename from docx4j/src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/JackrabbitJcrNodeMapper.java
rename to src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/JackrabbitJcrNodeMapper.java
diff --git a/docx4j/src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/NodeMapper.java b/src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/NodeMapper.java
similarity index 100%
rename from docx4j/src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/NodeMapper.java
rename to src/docx4j-extras/jcr/org/docx4j/JcrNodeMapper/NodeMapper.java
diff --git a/docx4j/src/docx4j-extras/jcr/org/docx4j/openpackaging/io/LoadFromJCR.java b/src/docx4j-extras/jcr/org/docx4j/openpackaging/io/LoadFromJCR.java
similarity index 100%
rename from docx4j/src/docx4j-extras/jcr/org/docx4j/openpackaging/io/LoadFromJCR.java
rename to src/docx4j-extras/jcr/org/docx4j/openpackaging/io/LoadFromJCR.java
diff --git a/docx4j/src/docx4j-extras/jcr/org/docx4j/openpackaging/io/SaveToJCR.java b/src/docx4j-extras/jcr/org/docx4j/openpackaging/io/SaveToJCR.java
similarity index 100%
rename from docx4j/src/docx4j-extras/jcr/org/docx4j/openpackaging/io/SaveToJCR.java
rename to src/docx4j-extras/jcr/org/docx4j/openpackaging/io/SaveToJCR.java
diff --git a/docx4j/src/docx4j-extras/vfs/org/docx4j/extras/vfs/LoadFromVFSZipFile.java b/src/docx4j-extras/vfs/org/docx4j/extras/vfs/LoadFromVFSZipFile.java
similarity index 100%
rename from docx4j/src/docx4j-extras/vfs/org/docx4j/extras/vfs/LoadFromVFSZipFile.java
rename to src/docx4j-extras/vfs/org/docx4j/extras/vfs/LoadFromVFSZipFile.java
diff --git a/docx4j/src/docx4j-extras/vfs/org/docx4j/extras/vfs/SaveToVFSZipFile.java b/src/docx4j-extras/vfs/org/docx4j/extras/vfs/SaveToVFSZipFile.java
similarity index 100%
rename from docx4j/src/docx4j-extras/vfs/org/docx4j/extras/vfs/SaveToVFSZipFile.java
rename to src/docx4j-extras/vfs/org/docx4j/extras/vfs/SaveToVFSZipFile.java
diff --git a/docx4j/src/docx4j-extras/vfs/org/docx4j/extras/vfs/VFSConversionImageHandler.java b/src/docx4j-extras/vfs/org/docx4j/extras/vfs/VFSConversionImageHandler.java
similarity index 100%
rename from docx4j/src/docx4j-extras/vfs/org/docx4j/extras/vfs/VFSConversionImageHandler.java
rename to src/docx4j-extras/vfs/org/docx4j/extras/vfs/VFSConversionImageHandler.java
diff --git a/docx4j/src/docx4j-extras/vfs/org/docx4j/extras/vfs/VFSDoc.java b/src/docx4j-extras/vfs/org/docx4j/extras/vfs/VFSDoc.java
similarity index 100%
rename from docx4j/src/docx4j-extras/vfs/org/docx4j/extras/vfs/VFSDoc.java
rename to src/docx4j-extras/vfs/org/docx4j/extras/vfs/VFSDoc.java
diff --git a/docx4j/src/docx4j-extras/vfs/org/docx4j/extras/vfs/VFSUtils.java b/src/docx4j-extras/vfs/org/docx4j/extras/vfs/VFSUtils.java
similarity index 100%
rename from docx4j/src/docx4j-extras/vfs/org/docx4j/extras/vfs/VFSUtils.java
rename to src/docx4j-extras/vfs/org/docx4j/extras/vfs/VFSUtils.java
diff --git a/docx4j/src/glox4j/java/org/glox4j/openpackaging/packages/GloxPackage.java b/src/glox4j/java/org/glox4j/openpackaging/packages/GloxPackage.java
similarity index 100%
rename from docx4j/src/glox4j/java/org/glox4j/openpackaging/packages/GloxPackage.java
rename to src/glox4j/java/org/glox4j/openpackaging/packages/GloxPackage.java
diff --git a/docx4j/src/glox4j/java/org/glox4j/samples/CreateDocx.java b/src/glox4j/java/org/glox4j/samples/CreateDocx.java
similarity index 100%
rename from docx4j/src/glox4j/java/org/glox4j/samples/CreateDocx.java
rename to src/glox4j/java/org/glox4j/samples/CreateDocx.java
diff --git a/docx4j/src/glox4j/java/org/glox4j/samples/ExtractGloxFromExemplar.java b/src/glox4j/java/org/glox4j/samples/ExtractGloxFromExemplar.java
similarity index 100%
rename from docx4j/src/glox4j/java/org/glox4j/samples/ExtractGloxFromExemplar.java
rename to src/glox4j/java/org/glox4j/samples/ExtractGloxFromExemplar.java
diff --git a/docx4j/src/glox4j/java/org/glox4j/samples/ParseGlox.java b/src/glox4j/java/org/glox4j/samples/ParseGlox.java
similarity index 100%
rename from docx4j/src/glox4j/java/org/glox4j/samples/ParseGlox.java
rename to src/glox4j/java/org/glox4j/samples/ParseGlox.java
diff --git a/docx4j/src/main/antlr/XPathEnhancer.g b/src/main/antlr/XPathEnhancer.g
similarity index 100%
rename from docx4j/src/main/antlr/XPathEnhancer.g
rename to src/main/antlr/XPathEnhancer.g
diff --git a/docx4j/src/main/antlr/XPathEnhancer.tokens b/src/main/antlr/XPathEnhancer.tokens
similarity index 100%
rename from docx4j/src/main/antlr/XPathEnhancer.tokens
rename to src/main/antlr/XPathEnhancer.tokens
diff --git a/docx4j/src/main/java/org/docx4j/Docx4jProperties.java b/src/main/java/org/docx4j/Docx4jProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/Docx4jProperties.java
rename to src/main/java/org/docx4j/Docx4jProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/TextUtils.java b/src/main/java/org/docx4j/TextUtils.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/TextUtils.java
rename to src/main/java/org/docx4j/TextUtils.java
diff --git a/docx4j/src/main/java/org/docx4j/TraversalUtil.java b/src/main/java/org/docx4j/TraversalUtil.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/TraversalUtil.java
rename to src/main/java/org/docx4j/TraversalUtil.java
diff --git a/docx4j/src/main/java/org/docx4j/UnitsOfMeasurement.java b/src/main/java/org/docx4j/UnitsOfMeasurement.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/UnitsOfMeasurement.java
rename to src/main/java/org/docx4j/UnitsOfMeasurement.java
diff --git a/docx4j/src/main/java/org/docx4j/XmlUtils.java b/src/main/java/org/docx4j/XmlUtils.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/XmlUtils.java
rename to src/main/java/org/docx4j/XmlUtils.java
diff --git a/docx4j/src/main/java/org/docx4j/bibliography/CTAuthorType.java b/src/main/java/org/docx4j/bibliography/CTAuthorType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/bibliography/CTAuthorType.java
rename to src/main/java/org/docx4j/bibliography/CTAuthorType.java
diff --git a/docx4j/src/main/java/org/docx4j/bibliography/CTNameListType.java b/src/main/java/org/docx4j/bibliography/CTNameListType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/bibliography/CTNameListType.java
rename to src/main/java/org/docx4j/bibliography/CTNameListType.java
diff --git a/docx4j/src/main/java/org/docx4j/bibliography/CTNameOrCorporateType.java b/src/main/java/org/docx4j/bibliography/CTNameOrCorporateType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/bibliography/CTNameOrCorporateType.java
rename to src/main/java/org/docx4j/bibliography/CTNameOrCorporateType.java
diff --git a/docx4j/src/main/java/org/docx4j/bibliography/CTNameType.java b/src/main/java/org/docx4j/bibliography/CTNameType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/bibliography/CTNameType.java
rename to src/main/java/org/docx4j/bibliography/CTNameType.java
diff --git a/docx4j/src/main/java/org/docx4j/bibliography/CTPersonType.java b/src/main/java/org/docx4j/bibliography/CTPersonType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/bibliography/CTPersonType.java
rename to src/main/java/org/docx4j/bibliography/CTPersonType.java
diff --git a/docx4j/src/main/java/org/docx4j/bibliography/CTSourceType.java b/src/main/java/org/docx4j/bibliography/CTSourceType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/bibliography/CTSourceType.java
rename to src/main/java/org/docx4j/bibliography/CTSourceType.java
diff --git a/docx4j/src/main/java/org/docx4j/bibliography/CTSources.java b/src/main/java/org/docx4j/bibliography/CTSources.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/bibliography/CTSources.java
rename to src/main/java/org/docx4j/bibliography/CTSources.java
diff --git a/docx4j/src/main/java/org/docx4j/bibliography/ObjectFactory.java b/src/main/java/org/docx4j/bibliography/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/bibliography/ObjectFactory.java
rename to src/main/java/org/docx4j/bibliography/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/bibliography/STSourceType.java b/src/main/java/org/docx4j/bibliography/STSourceType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/bibliography/STSourceType.java
rename to src/main/java/org/docx4j/bibliography/STSourceType.java
diff --git a/docx4j/src/main/java/org/docx4j/bibliography/package-info.java b/src/main/java/org/docx4j/bibliography/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/bibliography/package-info.java
rename to src/main/java/org/docx4j/bibliography/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/in/Doc.java b/src/main/java/org/docx4j/convert/in/Doc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/in/Doc.java
rename to src/main/java/org/docx4j/convert/in/Doc.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/in/FlatOpcXmlImporter.java b/src/main/java/org/docx4j/convert/in/FlatOpcXmlImporter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/in/FlatOpcXmlImporter.java
rename to src/main/java/org/docx4j/convert/in/FlatOpcXmlImporter.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/in/xhtml/Importer.java b/src/main/java/org/docx4j/convert/in/xhtml/Importer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/in/xhtml/Importer.java
rename to src/main/java/org/docx4j/convert/in/xhtml/Importer.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/in/xhtml/ListHelper.java b/src/main/java/org/docx4j/convert/in/xhtml/ListHelper.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/in/xhtml/ListHelper.java
rename to src/main/java/org/docx4j/convert/in/xhtml/ListHelper.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/AbstractConversionSettings.java b/src/main/java/org/docx4j/convert/out/AbstractConversionSettings.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/AbstractConversionSettings.java
rename to src/main/java/org/docx4j/convert/out/AbstractConversionSettings.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/Containerization.java b/src/main/java/org/docx4j/convert/out/Containerization.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/Containerization.java
rename to src/main/java/org/docx4j/convert/out/Containerization.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/ConvertUtils.java b/src/main/java/org/docx4j/convert/out/ConvertUtils.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/ConvertUtils.java
rename to src/main/java/org/docx4j/convert/out/ConvertUtils.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/Converter.java b/src/main/java/org/docx4j/convert/out/Converter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/Converter.java
rename to src/main/java/org/docx4j/convert/out/Converter.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/ModelConverter.java b/src/main/java/org/docx4j/convert/out/ModelConverter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/ModelConverter.java
rename to src/main/java/org/docx4j/convert/out/ModelConverter.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/OasisTableWriter.java b/src/main/java/org/docx4j/convert/out/OasisTableWriter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/OasisTableWriter.java
rename to src/main/java/org/docx4j/convert/out/OasisTableWriter.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/Output.java b/src/main/java/org/docx4j/convert/out/Output.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/Output.java
rename to src/main/java/org/docx4j/convert/out/Output.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/PageBreak.java b/src/main/java/org/docx4j/convert/out/PageBreak.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/PageBreak.java
rename to src/main/java/org/docx4j/convert/out/PageBreak.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/flatOpcXml/FlatOpcXmlCreator.java b/src/main/java/org/docx4j/convert/out/flatOpcXml/FlatOpcXmlCreator.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/flatOpcXml/FlatOpcXmlCreator.java
rename to src/main/java/org/docx4j/convert/out/flatOpcXml/FlatOpcXmlCreator.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/html/AbstractHtmlExporter.java b/src/main/java/org/docx4j/convert/out/html/AbstractHtmlExporter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/html/AbstractHtmlExporter.java
rename to src/main/java/org/docx4j/convert/out/html/AbstractHtmlExporter.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/html/HTMLConversionImageHandler.java b/src/main/java/org/docx4j/convert/out/html/HTMLConversionImageHandler.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/html/HTMLConversionImageHandler.java
rename to src/main/java/org/docx4j/convert/out/html/HTMLConversionImageHandler.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/html/HtmlExporterNG2.java b/src/main/java/org/docx4j/convert/out/html/HtmlExporterNG2.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/html/HtmlExporterNG2.java
rename to src/main/java/org/docx4j/convert/out/html/HtmlExporterNG2.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/html/SdtTagHandler.java b/src/main/java/org/docx4j/convert/out/html/SdtTagHandler.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/html/SdtTagHandler.java
rename to src/main/java/org/docx4j/convert/out/html/SdtTagHandler.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/html/SdtWriter.java b/src/main/java/org/docx4j/convert/out/html/SdtWriter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/html/SdtWriter.java
rename to src/main/java/org/docx4j/convert/out/html/SdtWriter.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/html/SymbolWriter.java b/src/main/java/org/docx4j/convert/out/html/SymbolWriter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/html/SymbolWriter.java
rename to src/main/java/org/docx4j/convert/out/html/SymbolWriter.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/html/TableWriter.java b/src/main/java/org/docx4j/convert/out/html/TableWriter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/html/TableWriter.java
rename to src/main/java/org/docx4j/convert/out/html/TableWriter.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/html/TagClass.java b/src/main/java/org/docx4j/convert/out/html/TagClass.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/html/TagClass.java
rename to src/main/java/org/docx4j/convert/out/html/TagClass.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/html/TagSingleBox.java b/src/main/java/org/docx4j/convert/out/html/TagSingleBox.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/html/TagSingleBox.java
rename to src/main/java/org/docx4j/convert/out/html/TagSingleBox.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/html/docx2xhtmlNG2.xslt b/src/main/java/org/docx4j/convert/out/html/docx2xhtmlNG2.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/html/docx2xhtmlNG2.xslt
rename to src/main/java/org/docx4j/convert/out/html/docx2xhtmlNG2.xslt
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/pdf/PdfConversion.java b/src/main/java/org/docx4j/convert/out/pdf/PdfConversion.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/pdf/PdfConversion.java
rename to src/main/java/org/docx4j/convert/out/pdf/PdfConversion.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/Conversion.java b/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/Conversion.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/Conversion.java
rename to src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/Conversion.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/InField.java b/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/InField.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/InField.java
rename to src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/InField.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/LayoutMasterSetBuilder.java b/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/LayoutMasterSetBuilder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/LayoutMasterSetBuilder.java
rename to src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/LayoutMasterSetBuilder.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/PDFConversionImageHandler.java b/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/PDFConversionImageHandler.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/PDFConversionImageHandler.java
rename to src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/PDFConversionImageHandler.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/PartTracker.java b/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/PartTracker.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/PartTracker.java
rename to src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/PartTracker.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/PdfSettings.java b/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/PdfSettings.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/PdfSettings.java
rename to src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/PdfSettings.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/SymbolWriter.java b/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/SymbolWriter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/SymbolWriter.java
rename to src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/SymbolWriter.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/TableWriter.java b/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/TableWriter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/TableWriter.java
rename to src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/TableWriter.java
diff --git a/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/docx2fo.xslt b/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/docx2fo.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/docx2fo.xslt
rename to src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/docx2fo.xslt
diff --git a/docx4j/src/main/java/org/docx4j/customXmlProperties/DatastoreItem.java b/src/main/java/org/docx4j/customXmlProperties/DatastoreItem.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/customXmlProperties/DatastoreItem.java
rename to src/main/java/org/docx4j/customXmlProperties/DatastoreItem.java
diff --git a/docx4j/src/main/java/org/docx4j/customXmlProperties/ObjectFactory.java b/src/main/java/org/docx4j/customXmlProperties/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/customXmlProperties/ObjectFactory.java
rename to src/main/java/org/docx4j/customXmlProperties/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/customXmlProperties/SchemaRefs.java b/src/main/java/org/docx4j/customXmlProperties/SchemaRefs.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/customXmlProperties/SchemaRefs.java
rename to src/main/java/org/docx4j/customXmlProperties/SchemaRefs.java
diff --git a/docx4j/src/main/java/org/docx4j/customXmlProperties/package-info.java b/src/main/java/org/docx4j/customXmlProperties/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/customXmlProperties/package-info.java
rename to src/main/java/org/docx4j/customXmlProperties/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/customxml/ObjectFactory.java b/src/main/java/org/docx4j/customxml/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/customxml/ObjectFactory.java
rename to src/main/java/org/docx4j/customxml/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/customxml/SchemaLibrary.java b/src/main/java/org/docx4j/customxml/SchemaLibrary.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/customxml/SchemaLibrary.java
rename to src/main/java/org/docx4j/customxml/SchemaLibrary.java
diff --git a/docx4j/src/main/java/org/docx4j/customxml/package-info.java b/src/main/java/org/docx4j/customxml/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/customxml/package-info.java
rename to src/main/java/org/docx4j/customxml/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/diff/Differencer.java b/src/main/java/org/docx4j/diff/Differencer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/diff/Differencer.java
rename to src/main/java/org/docx4j/diff/Differencer.java
diff --git a/docx4j/src/main/java/org/docx4j/diff/MarkupDelete.xslt b/src/main/java/org/docx4j/diff/MarkupDelete.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/diff/MarkupDelete.xslt
rename to src/main/java/org/docx4j/diff/MarkupDelete.xslt
diff --git a/docx4j/src/main/java/org/docx4j/diff/MarkupInsert.xslt b/src/main/java/org/docx4j/diff/MarkupInsert.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/diff/MarkupInsert.xslt
rename to src/main/java/org/docx4j/diff/MarkupInsert.xslt
diff --git a/docx4j/src/main/java/org/docx4j/diff/diffx2html.xslt b/src/main/java/org/docx4j/diff/diffx2html.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/diff/diffx2html.xslt
rename to src/main/java/org/docx4j/diff/diffx2html.xslt
diff --git a/docx4j/src/main/java/org/docx4j/diff/diffx2wml.xslt b/src/main/java/org/docx4j/diff/diffx2wml.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/diff/diffx2wml.xslt
rename to src/main/java/org/docx4j/diff/diffx2wml.xslt
diff --git a/docx4j/src/main/java/org/docx4j/dml/BaseStyles.java b/src/main/java/org/docx4j/dml/BaseStyles.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/BaseStyles.java
rename to src/main/java/org/docx4j/dml/BaseStyles.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAdjPoint2D.java b/src/main/java/org/docx4j/dml/CTAdjPoint2D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAdjPoint2D.java
rename to src/main/java/org/docx4j/dml/CTAdjPoint2D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAdjustHandleList.java b/src/main/java/org/docx4j/dml/CTAdjustHandleList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAdjustHandleList.java
rename to src/main/java/org/docx4j/dml/CTAdjustHandleList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAlphaBiLevelEffect.java b/src/main/java/org/docx4j/dml/CTAlphaBiLevelEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAlphaBiLevelEffect.java
rename to src/main/java/org/docx4j/dml/CTAlphaBiLevelEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAlphaCeilingEffect.java b/src/main/java/org/docx4j/dml/CTAlphaCeilingEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAlphaCeilingEffect.java
rename to src/main/java/org/docx4j/dml/CTAlphaCeilingEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAlphaFloorEffect.java b/src/main/java/org/docx4j/dml/CTAlphaFloorEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAlphaFloorEffect.java
rename to src/main/java/org/docx4j/dml/CTAlphaFloorEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAlphaInverseEffect.java b/src/main/java/org/docx4j/dml/CTAlphaInverseEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAlphaInverseEffect.java
rename to src/main/java/org/docx4j/dml/CTAlphaInverseEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAlphaModulateEffect.java b/src/main/java/org/docx4j/dml/CTAlphaModulateEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAlphaModulateEffect.java
rename to src/main/java/org/docx4j/dml/CTAlphaModulateEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAlphaModulateFixedEffect.java b/src/main/java/org/docx4j/dml/CTAlphaModulateFixedEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAlphaModulateFixedEffect.java
rename to src/main/java/org/docx4j/dml/CTAlphaModulateFixedEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAlphaOutsetEffect.java b/src/main/java/org/docx4j/dml/CTAlphaOutsetEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAlphaOutsetEffect.java
rename to src/main/java/org/docx4j/dml/CTAlphaOutsetEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAlphaReplaceEffect.java b/src/main/java/org/docx4j/dml/CTAlphaReplaceEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAlphaReplaceEffect.java
rename to src/main/java/org/docx4j/dml/CTAlphaReplaceEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAngle.java b/src/main/java/org/docx4j/dml/CTAngle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAngle.java
rename to src/main/java/org/docx4j/dml/CTAngle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAnimationChartBuildProperties.java b/src/main/java/org/docx4j/dml/CTAnimationChartBuildProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAnimationChartBuildProperties.java
rename to src/main/java/org/docx4j/dml/CTAnimationChartBuildProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAnimationChartElement.java b/src/main/java/org/docx4j/dml/CTAnimationChartElement.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAnimationChartElement.java
rename to src/main/java/org/docx4j/dml/CTAnimationChartElement.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAnimationDgmBuildProperties.java b/src/main/java/org/docx4j/dml/CTAnimationDgmBuildProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAnimationDgmBuildProperties.java
rename to src/main/java/org/docx4j/dml/CTAnimationDgmBuildProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAnimationDgmElement.java b/src/main/java/org/docx4j/dml/CTAnimationDgmElement.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAnimationDgmElement.java
rename to src/main/java/org/docx4j/dml/CTAnimationDgmElement.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAnimationElementChoice.java b/src/main/java/org/docx4j/dml/CTAnimationElementChoice.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAnimationElementChoice.java
rename to src/main/java/org/docx4j/dml/CTAnimationElementChoice.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAnimationGraphicalObjectBuildProperties.java b/src/main/java/org/docx4j/dml/CTAnimationGraphicalObjectBuildProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAnimationGraphicalObjectBuildProperties.java
rename to src/main/java/org/docx4j/dml/CTAnimationGraphicalObjectBuildProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAudioCD.java b/src/main/java/org/docx4j/dml/CTAudioCD.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAudioCD.java
rename to src/main/java/org/docx4j/dml/CTAudioCD.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAudioCDTime.java b/src/main/java/org/docx4j/dml/CTAudioCDTime.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAudioCDTime.java
rename to src/main/java/org/docx4j/dml/CTAudioCDTime.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTAudioFile.java b/src/main/java/org/docx4j/dml/CTAudioFile.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTAudioFile.java
rename to src/main/java/org/docx4j/dml/CTAudioFile.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTBackdrop.java b/src/main/java/org/docx4j/dml/CTBackdrop.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTBackdrop.java
rename to src/main/java/org/docx4j/dml/CTBackdrop.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTBackgroundFillStyleList.java b/src/main/java/org/docx4j/dml/CTBackgroundFillStyleList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTBackgroundFillStyleList.java
rename to src/main/java/org/docx4j/dml/CTBackgroundFillStyleList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTBackgroundFormatting.java b/src/main/java/org/docx4j/dml/CTBackgroundFormatting.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTBackgroundFormatting.java
rename to src/main/java/org/docx4j/dml/CTBackgroundFormatting.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTBaseStylesOverride.java b/src/main/java/org/docx4j/dml/CTBaseStylesOverride.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTBaseStylesOverride.java
rename to src/main/java/org/docx4j/dml/CTBaseStylesOverride.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTBevel.java b/src/main/java/org/docx4j/dml/CTBevel.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTBevel.java
rename to src/main/java/org/docx4j/dml/CTBevel.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTBiLevelEffect.java b/src/main/java/org/docx4j/dml/CTBiLevelEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTBiLevelEffect.java
rename to src/main/java/org/docx4j/dml/CTBiLevelEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTBlendEffect.java b/src/main/java/org/docx4j/dml/CTBlendEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTBlendEffect.java
rename to src/main/java/org/docx4j/dml/CTBlendEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTBlip.java b/src/main/java/org/docx4j/dml/CTBlip.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTBlip.java
rename to src/main/java/org/docx4j/dml/CTBlip.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTBlipFillProperties.java b/src/main/java/org/docx4j/dml/CTBlipFillProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTBlipFillProperties.java
rename to src/main/java/org/docx4j/dml/CTBlipFillProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTBlurEffect.java b/src/main/java/org/docx4j/dml/CTBlurEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTBlurEffect.java
rename to src/main/java/org/docx4j/dml/CTBlurEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTCamera.java b/src/main/java/org/docx4j/dml/CTCamera.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTCamera.java
rename to src/main/java/org/docx4j/dml/CTCamera.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTCell3D.java b/src/main/java/org/docx4j/dml/CTCell3D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTCell3D.java
rename to src/main/java/org/docx4j/dml/CTCell3D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTClipboardStyleSheet.java b/src/main/java/org/docx4j/dml/CTClipboardStyleSheet.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTClipboardStyleSheet.java
rename to src/main/java/org/docx4j/dml/CTClipboardStyleSheet.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTColor.java b/src/main/java/org/docx4j/dml/CTColor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTColor.java
rename to src/main/java/org/docx4j/dml/CTColor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTColorChangeEffect.java b/src/main/java/org/docx4j/dml/CTColorChangeEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTColorChangeEffect.java
rename to src/main/java/org/docx4j/dml/CTColorChangeEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTColorMRU.java b/src/main/java/org/docx4j/dml/CTColorMRU.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTColorMRU.java
rename to src/main/java/org/docx4j/dml/CTColorMRU.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTColorMapping.java b/src/main/java/org/docx4j/dml/CTColorMapping.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTColorMapping.java
rename to src/main/java/org/docx4j/dml/CTColorMapping.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTColorMappingOverride.java b/src/main/java/org/docx4j/dml/CTColorMappingOverride.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTColorMappingOverride.java
rename to src/main/java/org/docx4j/dml/CTColorMappingOverride.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTColorReplaceEffect.java b/src/main/java/org/docx4j/dml/CTColorReplaceEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTColorReplaceEffect.java
rename to src/main/java/org/docx4j/dml/CTColorReplaceEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTColorScheme.java b/src/main/java/org/docx4j/dml/CTColorScheme.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTColorScheme.java
rename to src/main/java/org/docx4j/dml/CTColorScheme.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTColorSchemeAndMapping.java b/src/main/java/org/docx4j/dml/CTColorSchemeAndMapping.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTColorSchemeAndMapping.java
rename to src/main/java/org/docx4j/dml/CTColorSchemeAndMapping.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTColorSchemeList.java b/src/main/java/org/docx4j/dml/CTColorSchemeList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTColorSchemeList.java
rename to src/main/java/org/docx4j/dml/CTColorSchemeList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTComplementTransform.java b/src/main/java/org/docx4j/dml/CTComplementTransform.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTComplementTransform.java
rename to src/main/java/org/docx4j/dml/CTComplementTransform.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTConnection.java b/src/main/java/org/docx4j/dml/CTConnection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTConnection.java
rename to src/main/java/org/docx4j/dml/CTConnection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTConnectionSite.java b/src/main/java/org/docx4j/dml/CTConnectionSite.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTConnectionSite.java
rename to src/main/java/org/docx4j/dml/CTConnectionSite.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTConnectionSiteList.java b/src/main/java/org/docx4j/dml/CTConnectionSiteList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTConnectionSiteList.java
rename to src/main/java/org/docx4j/dml/CTConnectionSiteList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTConnectorLocking.java b/src/main/java/org/docx4j/dml/CTConnectorLocking.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTConnectorLocking.java
rename to src/main/java/org/docx4j/dml/CTConnectorLocking.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTCustomColor.java b/src/main/java/org/docx4j/dml/CTCustomColor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTCustomColor.java
rename to src/main/java/org/docx4j/dml/CTCustomColor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTCustomColorList.java b/src/main/java/org/docx4j/dml/CTCustomColorList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTCustomColorList.java
rename to src/main/java/org/docx4j/dml/CTCustomColorList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTCustomGeometry2D.java b/src/main/java/org/docx4j/dml/CTCustomGeometry2D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTCustomGeometry2D.java
rename to src/main/java/org/docx4j/dml/CTCustomGeometry2D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTDashStop.java b/src/main/java/org/docx4j/dml/CTDashStop.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTDashStop.java
rename to src/main/java/org/docx4j/dml/CTDashStop.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTDashStopList.java b/src/main/java/org/docx4j/dml/CTDashStopList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTDashStopList.java
rename to src/main/java/org/docx4j/dml/CTDashStopList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTDefaultShapeDefinition.java b/src/main/java/org/docx4j/dml/CTDefaultShapeDefinition.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTDefaultShapeDefinition.java
rename to src/main/java/org/docx4j/dml/CTDefaultShapeDefinition.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTDuotoneEffect.java b/src/main/java/org/docx4j/dml/CTDuotoneEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTDuotoneEffect.java
rename to src/main/java/org/docx4j/dml/CTDuotoneEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTEffectContainer.java b/src/main/java/org/docx4j/dml/CTEffectContainer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTEffectContainer.java
rename to src/main/java/org/docx4j/dml/CTEffectContainer.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTEffectList.java b/src/main/java/org/docx4j/dml/CTEffectList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTEffectList.java
rename to src/main/java/org/docx4j/dml/CTEffectList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTEffectProperties.java b/src/main/java/org/docx4j/dml/CTEffectProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTEffectProperties.java
rename to src/main/java/org/docx4j/dml/CTEffectProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTEffectReference.java b/src/main/java/org/docx4j/dml/CTEffectReference.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTEffectReference.java
rename to src/main/java/org/docx4j/dml/CTEffectReference.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTEffectStyleItem.java b/src/main/java/org/docx4j/dml/CTEffectStyleItem.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTEffectStyleItem.java
rename to src/main/java/org/docx4j/dml/CTEffectStyleItem.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTEffectStyleList.java b/src/main/java/org/docx4j/dml/CTEffectStyleList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTEffectStyleList.java
rename to src/main/java/org/docx4j/dml/CTEffectStyleList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTEmbeddedWAVAudioFile.java b/src/main/java/org/docx4j/dml/CTEmbeddedWAVAudioFile.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTEmbeddedWAVAudioFile.java
rename to src/main/java/org/docx4j/dml/CTEmbeddedWAVAudioFile.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTEmptyElement.java b/src/main/java/org/docx4j/dml/CTEmptyElement.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTEmptyElement.java
rename to src/main/java/org/docx4j/dml/CTEmptyElement.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTFillEffect.java b/src/main/java/org/docx4j/dml/CTFillEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTFillEffect.java
rename to src/main/java/org/docx4j/dml/CTFillEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTFillOverlayEffect.java b/src/main/java/org/docx4j/dml/CTFillOverlayEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTFillOverlayEffect.java
rename to src/main/java/org/docx4j/dml/CTFillOverlayEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTFillProperties.java b/src/main/java/org/docx4j/dml/CTFillProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTFillProperties.java
rename to src/main/java/org/docx4j/dml/CTFillProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTFillStyleList.java b/src/main/java/org/docx4j/dml/CTFillStyleList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTFillStyleList.java
rename to src/main/java/org/docx4j/dml/CTFillStyleList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTFixedPercentage.java b/src/main/java/org/docx4j/dml/CTFixedPercentage.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTFixedPercentage.java
rename to src/main/java/org/docx4j/dml/CTFixedPercentage.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTFlatText.java b/src/main/java/org/docx4j/dml/CTFlatText.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTFlatText.java
rename to src/main/java/org/docx4j/dml/CTFlatText.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTFontReference.java b/src/main/java/org/docx4j/dml/CTFontReference.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTFontReference.java
rename to src/main/java/org/docx4j/dml/CTFontReference.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGammaTransform.java b/src/main/java/org/docx4j/dml/CTGammaTransform.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGammaTransform.java
rename to src/main/java/org/docx4j/dml/CTGammaTransform.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGeomGuide.java b/src/main/java/org/docx4j/dml/CTGeomGuide.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGeomGuide.java
rename to src/main/java/org/docx4j/dml/CTGeomGuide.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGeomGuideList.java b/src/main/java/org/docx4j/dml/CTGeomGuideList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGeomGuideList.java
rename to src/main/java/org/docx4j/dml/CTGeomGuideList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGeomRect.java b/src/main/java/org/docx4j/dml/CTGeomRect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGeomRect.java
rename to src/main/java/org/docx4j/dml/CTGeomRect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGlowEffect.java b/src/main/java/org/docx4j/dml/CTGlowEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGlowEffect.java
rename to src/main/java/org/docx4j/dml/CTGlowEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGradientFillProperties.java b/src/main/java/org/docx4j/dml/CTGradientFillProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGradientFillProperties.java
rename to src/main/java/org/docx4j/dml/CTGradientFillProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGradientStop.java b/src/main/java/org/docx4j/dml/CTGradientStop.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGradientStop.java
rename to src/main/java/org/docx4j/dml/CTGradientStop.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGradientStopList.java b/src/main/java/org/docx4j/dml/CTGradientStopList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGradientStopList.java
rename to src/main/java/org/docx4j/dml/CTGradientStopList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGraphicalObjectFrameLocking.java b/src/main/java/org/docx4j/dml/CTGraphicalObjectFrameLocking.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGraphicalObjectFrameLocking.java
rename to src/main/java/org/docx4j/dml/CTGraphicalObjectFrameLocking.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGrayscaleEffect.java b/src/main/java/org/docx4j/dml/CTGrayscaleEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGrayscaleEffect.java
rename to src/main/java/org/docx4j/dml/CTGrayscaleEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGrayscaleTransform.java b/src/main/java/org/docx4j/dml/CTGrayscaleTransform.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGrayscaleTransform.java
rename to src/main/java/org/docx4j/dml/CTGrayscaleTransform.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGroupFillProperties.java b/src/main/java/org/docx4j/dml/CTGroupFillProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGroupFillProperties.java
rename to src/main/java/org/docx4j/dml/CTGroupFillProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGroupLocking.java b/src/main/java/org/docx4j/dml/CTGroupLocking.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGroupLocking.java
rename to src/main/java/org/docx4j/dml/CTGroupLocking.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGroupShapeProperties.java b/src/main/java/org/docx4j/dml/CTGroupShapeProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGroupShapeProperties.java
rename to src/main/java/org/docx4j/dml/CTGroupShapeProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGroupTransform2D.java b/src/main/java/org/docx4j/dml/CTGroupTransform2D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGroupTransform2D.java
rename to src/main/java/org/docx4j/dml/CTGroupTransform2D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGvmlConnector.java b/src/main/java/org/docx4j/dml/CTGvmlConnector.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGvmlConnector.java
rename to src/main/java/org/docx4j/dml/CTGvmlConnector.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGvmlConnectorNonVisual.java b/src/main/java/org/docx4j/dml/CTGvmlConnectorNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGvmlConnectorNonVisual.java
rename to src/main/java/org/docx4j/dml/CTGvmlConnectorNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGvmlGraphicFrameNonVisual.java b/src/main/java/org/docx4j/dml/CTGvmlGraphicFrameNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGvmlGraphicFrameNonVisual.java
rename to src/main/java/org/docx4j/dml/CTGvmlGraphicFrameNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGvmlGraphicalObjectFrame.java b/src/main/java/org/docx4j/dml/CTGvmlGraphicalObjectFrame.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGvmlGraphicalObjectFrame.java
rename to src/main/java/org/docx4j/dml/CTGvmlGraphicalObjectFrame.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGvmlGroupShape.java b/src/main/java/org/docx4j/dml/CTGvmlGroupShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGvmlGroupShape.java
rename to src/main/java/org/docx4j/dml/CTGvmlGroupShape.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGvmlGroupShapeNonVisual.java b/src/main/java/org/docx4j/dml/CTGvmlGroupShapeNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGvmlGroupShapeNonVisual.java
rename to src/main/java/org/docx4j/dml/CTGvmlGroupShapeNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGvmlPicture.java b/src/main/java/org/docx4j/dml/CTGvmlPicture.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGvmlPicture.java
rename to src/main/java/org/docx4j/dml/CTGvmlPicture.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGvmlPictureNonVisual.java b/src/main/java/org/docx4j/dml/CTGvmlPictureNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGvmlPictureNonVisual.java
rename to src/main/java/org/docx4j/dml/CTGvmlPictureNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGvmlShape.java b/src/main/java/org/docx4j/dml/CTGvmlShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGvmlShape.java
rename to src/main/java/org/docx4j/dml/CTGvmlShape.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGvmlShapeNonVisual.java b/src/main/java/org/docx4j/dml/CTGvmlShapeNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGvmlShapeNonVisual.java
rename to src/main/java/org/docx4j/dml/CTGvmlShapeNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGvmlTextShape.java b/src/main/java/org/docx4j/dml/CTGvmlTextShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGvmlTextShape.java
rename to src/main/java/org/docx4j/dml/CTGvmlTextShape.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTGvmlUseShapeRectangle.java b/src/main/java/org/docx4j/dml/CTGvmlUseShapeRectangle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTGvmlUseShapeRectangle.java
rename to src/main/java/org/docx4j/dml/CTGvmlUseShapeRectangle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTHSLEffect.java b/src/main/java/org/docx4j/dml/CTHSLEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTHSLEffect.java
rename to src/main/java/org/docx4j/dml/CTHSLEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTHslColor.java b/src/main/java/org/docx4j/dml/CTHslColor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTHslColor.java
rename to src/main/java/org/docx4j/dml/CTHslColor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTHyperlink.java b/src/main/java/org/docx4j/dml/CTHyperlink.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTHyperlink.java
rename to src/main/java/org/docx4j/dml/CTHyperlink.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTInnerShadowEffect.java b/src/main/java/org/docx4j/dml/CTInnerShadowEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTInnerShadowEffect.java
rename to src/main/java/org/docx4j/dml/CTInnerShadowEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTInverseGammaTransform.java b/src/main/java/org/docx4j/dml/CTInverseGammaTransform.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTInverseGammaTransform.java
rename to src/main/java/org/docx4j/dml/CTInverseGammaTransform.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTInverseTransform.java b/src/main/java/org/docx4j/dml/CTInverseTransform.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTInverseTransform.java
rename to src/main/java/org/docx4j/dml/CTInverseTransform.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTLightRig.java b/src/main/java/org/docx4j/dml/CTLightRig.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTLightRig.java
rename to src/main/java/org/docx4j/dml/CTLightRig.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTLineEndProperties.java b/src/main/java/org/docx4j/dml/CTLineEndProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTLineEndProperties.java
rename to src/main/java/org/docx4j/dml/CTLineEndProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTLineJoinBevel.java b/src/main/java/org/docx4j/dml/CTLineJoinBevel.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTLineJoinBevel.java
rename to src/main/java/org/docx4j/dml/CTLineJoinBevel.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTLineJoinMiterProperties.java b/src/main/java/org/docx4j/dml/CTLineJoinMiterProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTLineJoinMiterProperties.java
rename to src/main/java/org/docx4j/dml/CTLineJoinMiterProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTLineJoinRound.java b/src/main/java/org/docx4j/dml/CTLineJoinRound.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTLineJoinRound.java
rename to src/main/java/org/docx4j/dml/CTLineJoinRound.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTLineProperties.java b/src/main/java/org/docx4j/dml/CTLineProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTLineProperties.java
rename to src/main/java/org/docx4j/dml/CTLineProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTLineStyleList.java b/src/main/java/org/docx4j/dml/CTLineStyleList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTLineStyleList.java
rename to src/main/java/org/docx4j/dml/CTLineStyleList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTLinearShadeProperties.java b/src/main/java/org/docx4j/dml/CTLinearShadeProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTLinearShadeProperties.java
rename to src/main/java/org/docx4j/dml/CTLinearShadeProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTLuminanceEffect.java b/src/main/java/org/docx4j/dml/CTLuminanceEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTLuminanceEffect.java
rename to src/main/java/org/docx4j/dml/CTLuminanceEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTNoFillProperties.java b/src/main/java/org/docx4j/dml/CTNoFillProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTNoFillProperties.java
rename to src/main/java/org/docx4j/dml/CTNoFillProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTNonVisualConnectorProperties.java b/src/main/java/org/docx4j/dml/CTNonVisualConnectorProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTNonVisualConnectorProperties.java
rename to src/main/java/org/docx4j/dml/CTNonVisualConnectorProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTNonVisualDrawingProps.java b/src/main/java/org/docx4j/dml/CTNonVisualDrawingProps.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTNonVisualDrawingProps.java
rename to src/main/java/org/docx4j/dml/CTNonVisualDrawingProps.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTNonVisualDrawingShapeProps.java b/src/main/java/org/docx4j/dml/CTNonVisualDrawingShapeProps.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTNonVisualDrawingShapeProps.java
rename to src/main/java/org/docx4j/dml/CTNonVisualDrawingShapeProps.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTNonVisualGraphicFrameProperties.java b/src/main/java/org/docx4j/dml/CTNonVisualGraphicFrameProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTNonVisualGraphicFrameProperties.java
rename to src/main/java/org/docx4j/dml/CTNonVisualGraphicFrameProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTNonVisualGroupDrawingShapeProps.java b/src/main/java/org/docx4j/dml/CTNonVisualGroupDrawingShapeProps.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTNonVisualGroupDrawingShapeProps.java
rename to src/main/java/org/docx4j/dml/CTNonVisualGroupDrawingShapeProps.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTNonVisualPictureProperties.java b/src/main/java/org/docx4j/dml/CTNonVisualPictureProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTNonVisualPictureProperties.java
rename to src/main/java/org/docx4j/dml/CTNonVisualPictureProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTObjectStyleDefaults.java b/src/main/java/org/docx4j/dml/CTObjectStyleDefaults.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTObjectStyleDefaults.java
rename to src/main/java/org/docx4j/dml/CTObjectStyleDefaults.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTOfficeArtExtension.java b/src/main/java/org/docx4j/dml/CTOfficeArtExtension.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTOfficeArtExtension.java
rename to src/main/java/org/docx4j/dml/CTOfficeArtExtension.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTOfficeArtExtensionList.java b/src/main/java/org/docx4j/dml/CTOfficeArtExtensionList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTOfficeArtExtensionList.java
rename to src/main/java/org/docx4j/dml/CTOfficeArtExtensionList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTOuterShadowEffect.java b/src/main/java/org/docx4j/dml/CTOuterShadowEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTOuterShadowEffect.java
rename to src/main/java/org/docx4j/dml/CTOuterShadowEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPath2D.java b/src/main/java/org/docx4j/dml/CTPath2D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPath2D.java
rename to src/main/java/org/docx4j/dml/CTPath2D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPath2DArcTo.java b/src/main/java/org/docx4j/dml/CTPath2DArcTo.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPath2DArcTo.java
rename to src/main/java/org/docx4j/dml/CTPath2DArcTo.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPath2DClose.java b/src/main/java/org/docx4j/dml/CTPath2DClose.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPath2DClose.java
rename to src/main/java/org/docx4j/dml/CTPath2DClose.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPath2DCubicBezierTo.java b/src/main/java/org/docx4j/dml/CTPath2DCubicBezierTo.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPath2DCubicBezierTo.java
rename to src/main/java/org/docx4j/dml/CTPath2DCubicBezierTo.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPath2DLineTo.java b/src/main/java/org/docx4j/dml/CTPath2DLineTo.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPath2DLineTo.java
rename to src/main/java/org/docx4j/dml/CTPath2DLineTo.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPath2DList.java b/src/main/java/org/docx4j/dml/CTPath2DList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPath2DList.java
rename to src/main/java/org/docx4j/dml/CTPath2DList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPath2DMoveTo.java b/src/main/java/org/docx4j/dml/CTPath2DMoveTo.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPath2DMoveTo.java
rename to src/main/java/org/docx4j/dml/CTPath2DMoveTo.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPath2DQuadBezierTo.java b/src/main/java/org/docx4j/dml/CTPath2DQuadBezierTo.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPath2DQuadBezierTo.java
rename to src/main/java/org/docx4j/dml/CTPath2DQuadBezierTo.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPathShadeProperties.java b/src/main/java/org/docx4j/dml/CTPathShadeProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPathShadeProperties.java
rename to src/main/java/org/docx4j/dml/CTPathShadeProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPatternFillProperties.java b/src/main/java/org/docx4j/dml/CTPatternFillProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPatternFillProperties.java
rename to src/main/java/org/docx4j/dml/CTPatternFillProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPercentage.java b/src/main/java/org/docx4j/dml/CTPercentage.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPercentage.java
rename to src/main/java/org/docx4j/dml/CTPercentage.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPictureLocking.java b/src/main/java/org/docx4j/dml/CTPictureLocking.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPictureLocking.java
rename to src/main/java/org/docx4j/dml/CTPictureLocking.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPoint2D.java b/src/main/java/org/docx4j/dml/CTPoint2D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPoint2D.java
rename to src/main/java/org/docx4j/dml/CTPoint2D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPoint3D.java b/src/main/java/org/docx4j/dml/CTPoint3D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPoint3D.java
rename to src/main/java/org/docx4j/dml/CTPoint3D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPolarAdjustHandle.java b/src/main/java/org/docx4j/dml/CTPolarAdjustHandle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPolarAdjustHandle.java
rename to src/main/java/org/docx4j/dml/CTPolarAdjustHandle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPositiveFixedAngle.java b/src/main/java/org/docx4j/dml/CTPositiveFixedAngle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPositiveFixedAngle.java
rename to src/main/java/org/docx4j/dml/CTPositiveFixedAngle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPositiveFixedPercentage.java b/src/main/java/org/docx4j/dml/CTPositiveFixedPercentage.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPositiveFixedPercentage.java
rename to src/main/java/org/docx4j/dml/CTPositiveFixedPercentage.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPositivePercentage.java b/src/main/java/org/docx4j/dml/CTPositivePercentage.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPositivePercentage.java
rename to src/main/java/org/docx4j/dml/CTPositivePercentage.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPositiveSize2D.java b/src/main/java/org/docx4j/dml/CTPositiveSize2D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPositiveSize2D.java
rename to src/main/java/org/docx4j/dml/CTPositiveSize2D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPresetColor.java b/src/main/java/org/docx4j/dml/CTPresetColor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPresetColor.java
rename to src/main/java/org/docx4j/dml/CTPresetColor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPresetGeometry2D.java b/src/main/java/org/docx4j/dml/CTPresetGeometry2D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPresetGeometry2D.java
rename to src/main/java/org/docx4j/dml/CTPresetGeometry2D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPresetLineDashProperties.java b/src/main/java/org/docx4j/dml/CTPresetLineDashProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPresetLineDashProperties.java
rename to src/main/java/org/docx4j/dml/CTPresetLineDashProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPresetShadowEffect.java b/src/main/java/org/docx4j/dml/CTPresetShadowEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPresetShadowEffect.java
rename to src/main/java/org/docx4j/dml/CTPresetShadowEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTPresetTextShape.java b/src/main/java/org/docx4j/dml/CTPresetTextShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTPresetTextShape.java
rename to src/main/java/org/docx4j/dml/CTPresetTextShape.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTQuickTimeFile.java b/src/main/java/org/docx4j/dml/CTQuickTimeFile.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTQuickTimeFile.java
rename to src/main/java/org/docx4j/dml/CTQuickTimeFile.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTRatio.java b/src/main/java/org/docx4j/dml/CTRatio.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTRatio.java
rename to src/main/java/org/docx4j/dml/CTRatio.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTReflectionEffect.java b/src/main/java/org/docx4j/dml/CTReflectionEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTReflectionEffect.java
rename to src/main/java/org/docx4j/dml/CTReflectionEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTRegularTextRun.java b/src/main/java/org/docx4j/dml/CTRegularTextRun.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTRegularTextRun.java
rename to src/main/java/org/docx4j/dml/CTRegularTextRun.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTRelativeOffsetEffect.java b/src/main/java/org/docx4j/dml/CTRelativeOffsetEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTRelativeOffsetEffect.java
rename to src/main/java/org/docx4j/dml/CTRelativeOffsetEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTRelativeRect.java b/src/main/java/org/docx4j/dml/CTRelativeRect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTRelativeRect.java
rename to src/main/java/org/docx4j/dml/CTRelativeRect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTSRgbColor.java b/src/main/java/org/docx4j/dml/CTSRgbColor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTSRgbColor.java
rename to src/main/java/org/docx4j/dml/CTSRgbColor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTScRgbColor.java b/src/main/java/org/docx4j/dml/CTScRgbColor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTScRgbColor.java
rename to src/main/java/org/docx4j/dml/CTScRgbColor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTScale2D.java b/src/main/java/org/docx4j/dml/CTScale2D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTScale2D.java
rename to src/main/java/org/docx4j/dml/CTScale2D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTScene3D.java b/src/main/java/org/docx4j/dml/CTScene3D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTScene3D.java
rename to src/main/java/org/docx4j/dml/CTScene3D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTSchemeColor.java b/src/main/java/org/docx4j/dml/CTSchemeColor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTSchemeColor.java
rename to src/main/java/org/docx4j/dml/CTSchemeColor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTShape3D.java b/src/main/java/org/docx4j/dml/CTShape3D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTShape3D.java
rename to src/main/java/org/docx4j/dml/CTShape3D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTShapeLocking.java b/src/main/java/org/docx4j/dml/CTShapeLocking.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTShapeLocking.java
rename to src/main/java/org/docx4j/dml/CTShapeLocking.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTShapeProperties.java b/src/main/java/org/docx4j/dml/CTShapeProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTShapeProperties.java
rename to src/main/java/org/docx4j/dml/CTShapeProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTShapeStyle.java b/src/main/java/org/docx4j/dml/CTShapeStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTShapeStyle.java
rename to src/main/java/org/docx4j/dml/CTShapeStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTSoftEdgesEffect.java b/src/main/java/org/docx4j/dml/CTSoftEdgesEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTSoftEdgesEffect.java
rename to src/main/java/org/docx4j/dml/CTSoftEdgesEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTSolidColorFillProperties.java b/src/main/java/org/docx4j/dml/CTSolidColorFillProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTSolidColorFillProperties.java
rename to src/main/java/org/docx4j/dml/CTSolidColorFillProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTSphereCoords.java b/src/main/java/org/docx4j/dml/CTSphereCoords.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTSphereCoords.java
rename to src/main/java/org/docx4j/dml/CTSphereCoords.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTStretchInfoProperties.java b/src/main/java/org/docx4j/dml/CTStretchInfoProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTStretchInfoProperties.java
rename to src/main/java/org/docx4j/dml/CTStretchInfoProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTStyleMatrix.java b/src/main/java/org/docx4j/dml/CTStyleMatrix.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTStyleMatrix.java
rename to src/main/java/org/docx4j/dml/CTStyleMatrix.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTStyleMatrixReference.java b/src/main/java/org/docx4j/dml/CTStyleMatrixReference.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTStyleMatrixReference.java
rename to src/main/java/org/docx4j/dml/CTStyleMatrixReference.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTSystemColor.java b/src/main/java/org/docx4j/dml/CTSystemColor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTSystemColor.java
rename to src/main/java/org/docx4j/dml/CTSystemColor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTable.java b/src/main/java/org/docx4j/dml/CTTable.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTable.java
rename to src/main/java/org/docx4j/dml/CTTable.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTableBackgroundStyle.java b/src/main/java/org/docx4j/dml/CTTableBackgroundStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTableBackgroundStyle.java
rename to src/main/java/org/docx4j/dml/CTTableBackgroundStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTableCell.java b/src/main/java/org/docx4j/dml/CTTableCell.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTableCell.java
rename to src/main/java/org/docx4j/dml/CTTableCell.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTableCellBorderStyle.java b/src/main/java/org/docx4j/dml/CTTableCellBorderStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTableCellBorderStyle.java
rename to src/main/java/org/docx4j/dml/CTTableCellBorderStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTableCellProperties.java b/src/main/java/org/docx4j/dml/CTTableCellProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTableCellProperties.java
rename to src/main/java/org/docx4j/dml/CTTableCellProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTableCol.java b/src/main/java/org/docx4j/dml/CTTableCol.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTableCol.java
rename to src/main/java/org/docx4j/dml/CTTableCol.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTableGrid.java b/src/main/java/org/docx4j/dml/CTTableGrid.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTableGrid.java
rename to src/main/java/org/docx4j/dml/CTTableGrid.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTablePartStyle.java b/src/main/java/org/docx4j/dml/CTTablePartStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTablePartStyle.java
rename to src/main/java/org/docx4j/dml/CTTablePartStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTableProperties.java b/src/main/java/org/docx4j/dml/CTTableProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTableProperties.java
rename to src/main/java/org/docx4j/dml/CTTableProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTableRow.java b/src/main/java/org/docx4j/dml/CTTableRow.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTableRow.java
rename to src/main/java/org/docx4j/dml/CTTableRow.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTableStyle.java b/src/main/java/org/docx4j/dml/CTTableStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTableStyle.java
rename to src/main/java/org/docx4j/dml/CTTableStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTableStyleCellStyle.java b/src/main/java/org/docx4j/dml/CTTableStyleCellStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTableStyleCellStyle.java
rename to src/main/java/org/docx4j/dml/CTTableStyleCellStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTableStyleList.java b/src/main/java/org/docx4j/dml/CTTableStyleList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTableStyleList.java
rename to src/main/java/org/docx4j/dml/CTTableStyleList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTableStyleTextStyle.java b/src/main/java/org/docx4j/dml/CTTableStyleTextStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTableStyleTextStyle.java
rename to src/main/java/org/docx4j/dml/CTTableStyleTextStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextAutonumberBullet.java b/src/main/java/org/docx4j/dml/CTTextAutonumberBullet.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextAutonumberBullet.java
rename to src/main/java/org/docx4j/dml/CTTextAutonumberBullet.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextBlipBullet.java b/src/main/java/org/docx4j/dml/CTTextBlipBullet.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextBlipBullet.java
rename to src/main/java/org/docx4j/dml/CTTextBlipBullet.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextBody.java b/src/main/java/org/docx4j/dml/CTTextBody.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextBody.java
rename to src/main/java/org/docx4j/dml/CTTextBody.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextBodyProperties.java b/src/main/java/org/docx4j/dml/CTTextBodyProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextBodyProperties.java
rename to src/main/java/org/docx4j/dml/CTTextBodyProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextBulletColorFollowText.java b/src/main/java/org/docx4j/dml/CTTextBulletColorFollowText.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextBulletColorFollowText.java
rename to src/main/java/org/docx4j/dml/CTTextBulletColorFollowText.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextBulletSizeFollowText.java b/src/main/java/org/docx4j/dml/CTTextBulletSizeFollowText.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextBulletSizeFollowText.java
rename to src/main/java/org/docx4j/dml/CTTextBulletSizeFollowText.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextBulletSizePercent.java b/src/main/java/org/docx4j/dml/CTTextBulletSizePercent.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextBulletSizePercent.java
rename to src/main/java/org/docx4j/dml/CTTextBulletSizePercent.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextBulletSizePoint.java b/src/main/java/org/docx4j/dml/CTTextBulletSizePoint.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextBulletSizePoint.java
rename to src/main/java/org/docx4j/dml/CTTextBulletSizePoint.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextBulletTypefaceFollowText.java b/src/main/java/org/docx4j/dml/CTTextBulletTypefaceFollowText.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextBulletTypefaceFollowText.java
rename to src/main/java/org/docx4j/dml/CTTextBulletTypefaceFollowText.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextCharBullet.java b/src/main/java/org/docx4j/dml/CTTextCharBullet.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextCharBullet.java
rename to src/main/java/org/docx4j/dml/CTTextCharBullet.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextCharacterProperties.java b/src/main/java/org/docx4j/dml/CTTextCharacterProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextCharacterProperties.java
rename to src/main/java/org/docx4j/dml/CTTextCharacterProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextField.java b/src/main/java/org/docx4j/dml/CTTextField.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextField.java
rename to src/main/java/org/docx4j/dml/CTTextField.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextLineBreak.java b/src/main/java/org/docx4j/dml/CTTextLineBreak.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextLineBreak.java
rename to src/main/java/org/docx4j/dml/CTTextLineBreak.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextListStyle.java b/src/main/java/org/docx4j/dml/CTTextListStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextListStyle.java
rename to src/main/java/org/docx4j/dml/CTTextListStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextNoAutofit.java b/src/main/java/org/docx4j/dml/CTTextNoAutofit.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextNoAutofit.java
rename to src/main/java/org/docx4j/dml/CTTextNoAutofit.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextNoBullet.java b/src/main/java/org/docx4j/dml/CTTextNoBullet.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextNoBullet.java
rename to src/main/java/org/docx4j/dml/CTTextNoBullet.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextNormalAutofit.java b/src/main/java/org/docx4j/dml/CTTextNormalAutofit.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextNormalAutofit.java
rename to src/main/java/org/docx4j/dml/CTTextNormalAutofit.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextParagraph.java b/src/main/java/org/docx4j/dml/CTTextParagraph.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextParagraph.java
rename to src/main/java/org/docx4j/dml/CTTextParagraph.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextParagraphProperties.java b/src/main/java/org/docx4j/dml/CTTextParagraphProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextParagraphProperties.java
rename to src/main/java/org/docx4j/dml/CTTextParagraphProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextShapeAutofit.java b/src/main/java/org/docx4j/dml/CTTextShapeAutofit.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextShapeAutofit.java
rename to src/main/java/org/docx4j/dml/CTTextShapeAutofit.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextSpacing.java b/src/main/java/org/docx4j/dml/CTTextSpacing.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextSpacing.java
rename to src/main/java/org/docx4j/dml/CTTextSpacing.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextSpacingPercent.java b/src/main/java/org/docx4j/dml/CTTextSpacingPercent.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextSpacingPercent.java
rename to src/main/java/org/docx4j/dml/CTTextSpacingPercent.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextSpacingPoint.java b/src/main/java/org/docx4j/dml/CTTextSpacingPoint.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextSpacingPoint.java
rename to src/main/java/org/docx4j/dml/CTTextSpacingPoint.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextTabStop.java b/src/main/java/org/docx4j/dml/CTTextTabStop.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextTabStop.java
rename to src/main/java/org/docx4j/dml/CTTextTabStop.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextTabStopList.java b/src/main/java/org/docx4j/dml/CTTextTabStopList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextTabStopList.java
rename to src/main/java/org/docx4j/dml/CTTextTabStopList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextUnderlineFillFollowText.java b/src/main/java/org/docx4j/dml/CTTextUnderlineFillFollowText.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextUnderlineFillFollowText.java
rename to src/main/java/org/docx4j/dml/CTTextUnderlineFillFollowText.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextUnderlineFillGroupWrapper.java b/src/main/java/org/docx4j/dml/CTTextUnderlineFillGroupWrapper.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextUnderlineFillGroupWrapper.java
rename to src/main/java/org/docx4j/dml/CTTextUnderlineFillGroupWrapper.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTextUnderlineLineFollowText.java b/src/main/java/org/docx4j/dml/CTTextUnderlineLineFollowText.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTextUnderlineLineFollowText.java
rename to src/main/java/org/docx4j/dml/CTTextUnderlineLineFollowText.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTThemeableLineStyle.java b/src/main/java/org/docx4j/dml/CTThemeableLineStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTThemeableLineStyle.java
rename to src/main/java/org/docx4j/dml/CTThemeableLineStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTileInfoProperties.java b/src/main/java/org/docx4j/dml/CTTileInfoProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTileInfoProperties.java
rename to src/main/java/org/docx4j/dml/CTTileInfoProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTintEffect.java b/src/main/java/org/docx4j/dml/CTTintEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTintEffect.java
rename to src/main/java/org/docx4j/dml/CTTintEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTransform2D.java b/src/main/java/org/docx4j/dml/CTTransform2D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTransform2D.java
rename to src/main/java/org/docx4j/dml/CTTransform2D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTTransformEffect.java b/src/main/java/org/docx4j/dml/CTTransformEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTTransformEffect.java
rename to src/main/java/org/docx4j/dml/CTTransformEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTVector3D.java b/src/main/java/org/docx4j/dml/CTVector3D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTVector3D.java
rename to src/main/java/org/docx4j/dml/CTVector3D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTVideoFile.java b/src/main/java/org/docx4j/dml/CTVideoFile.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTVideoFile.java
rename to src/main/java/org/docx4j/dml/CTVideoFile.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTWholeE2OFormatting.java b/src/main/java/org/docx4j/dml/CTWholeE2OFormatting.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTWholeE2OFormatting.java
rename to src/main/java/org/docx4j/dml/CTWholeE2OFormatting.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/CTXYAdjustHandle.java b/src/main/java/org/docx4j/dml/CTXYAdjustHandle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/CTXYAdjustHandle.java
rename to src/main/java/org/docx4j/dml/CTXYAdjustHandle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/FontCollection.java b/src/main/java/org/docx4j/dml/FontCollection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/FontCollection.java
rename to src/main/java/org/docx4j/dml/FontCollection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/Graphic.java b/src/main/java/org/docx4j/dml/Graphic.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/Graphic.java
rename to src/main/java/org/docx4j/dml/Graphic.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/GraphicData.java b/src/main/java/org/docx4j/dml/GraphicData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/GraphicData.java
rename to src/main/java/org/docx4j/dml/GraphicData.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/ObjectFactory.java b/src/main/java/org/docx4j/dml/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/ObjectFactory.java
rename to src/main/java/org/docx4j/dml/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STAnimationBuildType.java b/src/main/java/org/docx4j/dml/STAnimationBuildType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STAnimationBuildType.java
rename to src/main/java/org/docx4j/dml/STAnimationBuildType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STAnimationChartOnlyBuildType.java b/src/main/java/org/docx4j/dml/STAnimationChartOnlyBuildType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STAnimationChartOnlyBuildType.java
rename to src/main/java/org/docx4j/dml/STAnimationChartOnlyBuildType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STAnimationDgmOnlyBuildType.java b/src/main/java/org/docx4j/dml/STAnimationDgmOnlyBuildType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STAnimationDgmOnlyBuildType.java
rename to src/main/java/org/docx4j/dml/STAnimationDgmOnlyBuildType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STBevelPresetType.java b/src/main/java/org/docx4j/dml/STBevelPresetType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STBevelPresetType.java
rename to src/main/java/org/docx4j/dml/STBevelPresetType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STBlackWhiteMode.java b/src/main/java/org/docx4j/dml/STBlackWhiteMode.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STBlackWhiteMode.java
rename to src/main/java/org/docx4j/dml/STBlackWhiteMode.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STBlendMode.java b/src/main/java/org/docx4j/dml/STBlendMode.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STBlendMode.java
rename to src/main/java/org/docx4j/dml/STBlendMode.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STBlipCompression.java b/src/main/java/org/docx4j/dml/STBlipCompression.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STBlipCompression.java
rename to src/main/java/org/docx4j/dml/STBlipCompression.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STChartBuildStep.java b/src/main/java/org/docx4j/dml/STChartBuildStep.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STChartBuildStep.java
rename to src/main/java/org/docx4j/dml/STChartBuildStep.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STColorSchemeIndex.java b/src/main/java/org/docx4j/dml/STColorSchemeIndex.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STColorSchemeIndex.java
rename to src/main/java/org/docx4j/dml/STColorSchemeIndex.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STCompoundLine.java b/src/main/java/org/docx4j/dml/STCompoundLine.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STCompoundLine.java
rename to src/main/java/org/docx4j/dml/STCompoundLine.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STDgmBuildStep.java b/src/main/java/org/docx4j/dml/STDgmBuildStep.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STDgmBuildStep.java
rename to src/main/java/org/docx4j/dml/STDgmBuildStep.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STEffectContainerType.java b/src/main/java/org/docx4j/dml/STEffectContainerType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STEffectContainerType.java
rename to src/main/java/org/docx4j/dml/STEffectContainerType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STFontCollectionIndex.java b/src/main/java/org/docx4j/dml/STFontCollectionIndex.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STFontCollectionIndex.java
rename to src/main/java/org/docx4j/dml/STFontCollectionIndex.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STLightRigDirection.java b/src/main/java/org/docx4j/dml/STLightRigDirection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STLightRigDirection.java
rename to src/main/java/org/docx4j/dml/STLightRigDirection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STLightRigType.java b/src/main/java/org/docx4j/dml/STLightRigType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STLightRigType.java
rename to src/main/java/org/docx4j/dml/STLightRigType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STLineCap.java b/src/main/java/org/docx4j/dml/STLineCap.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STLineCap.java
rename to src/main/java/org/docx4j/dml/STLineCap.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STLineEndLength.java b/src/main/java/org/docx4j/dml/STLineEndLength.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STLineEndLength.java
rename to src/main/java/org/docx4j/dml/STLineEndLength.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STLineEndType.java b/src/main/java/org/docx4j/dml/STLineEndType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STLineEndType.java
rename to src/main/java/org/docx4j/dml/STLineEndType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STLineEndWidth.java b/src/main/java/org/docx4j/dml/STLineEndWidth.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STLineEndWidth.java
rename to src/main/java/org/docx4j/dml/STLineEndWidth.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STOnOffStyleType.java b/src/main/java/org/docx4j/dml/STOnOffStyleType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STOnOffStyleType.java
rename to src/main/java/org/docx4j/dml/STOnOffStyleType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STPathFillMode.java b/src/main/java/org/docx4j/dml/STPathFillMode.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STPathFillMode.java
rename to src/main/java/org/docx4j/dml/STPathFillMode.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STPathShadeType.java b/src/main/java/org/docx4j/dml/STPathShadeType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STPathShadeType.java
rename to src/main/java/org/docx4j/dml/STPathShadeType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STPenAlignment.java b/src/main/java/org/docx4j/dml/STPenAlignment.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STPenAlignment.java
rename to src/main/java/org/docx4j/dml/STPenAlignment.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STPresetCameraType.java b/src/main/java/org/docx4j/dml/STPresetCameraType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STPresetCameraType.java
rename to src/main/java/org/docx4j/dml/STPresetCameraType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STPresetColorVal.java b/src/main/java/org/docx4j/dml/STPresetColorVal.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STPresetColorVal.java
rename to src/main/java/org/docx4j/dml/STPresetColorVal.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STPresetLineDashVal.java b/src/main/java/org/docx4j/dml/STPresetLineDashVal.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STPresetLineDashVal.java
rename to src/main/java/org/docx4j/dml/STPresetLineDashVal.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STPresetMaterialType.java b/src/main/java/org/docx4j/dml/STPresetMaterialType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STPresetMaterialType.java
rename to src/main/java/org/docx4j/dml/STPresetMaterialType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STPresetPatternVal.java b/src/main/java/org/docx4j/dml/STPresetPatternVal.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STPresetPatternVal.java
rename to src/main/java/org/docx4j/dml/STPresetPatternVal.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STPresetShadowVal.java b/src/main/java/org/docx4j/dml/STPresetShadowVal.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STPresetShadowVal.java
rename to src/main/java/org/docx4j/dml/STPresetShadowVal.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STRectAlignment.java b/src/main/java/org/docx4j/dml/STRectAlignment.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STRectAlignment.java
rename to src/main/java/org/docx4j/dml/STRectAlignment.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STSchemeColorVal.java b/src/main/java/org/docx4j/dml/STSchemeColorVal.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STSchemeColorVal.java
rename to src/main/java/org/docx4j/dml/STSchemeColorVal.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STShapeType.java b/src/main/java/org/docx4j/dml/STShapeType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STShapeType.java
rename to src/main/java/org/docx4j/dml/STShapeType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTextAlignType.java b/src/main/java/org/docx4j/dml/STTextAlignType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTextAlignType.java
rename to src/main/java/org/docx4j/dml/STTextAlignType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTextAnchoringType.java b/src/main/java/org/docx4j/dml/STTextAnchoringType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTextAnchoringType.java
rename to src/main/java/org/docx4j/dml/STTextAnchoringType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTextAutonumberScheme.java b/src/main/java/org/docx4j/dml/STTextAutonumberScheme.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTextAutonumberScheme.java
rename to src/main/java/org/docx4j/dml/STTextAutonumberScheme.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTextCapsType.java b/src/main/java/org/docx4j/dml/STTextCapsType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTextCapsType.java
rename to src/main/java/org/docx4j/dml/STTextCapsType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTextFontAlignType.java b/src/main/java/org/docx4j/dml/STTextFontAlignType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTextFontAlignType.java
rename to src/main/java/org/docx4j/dml/STTextFontAlignType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTextHorzOverflowType.java b/src/main/java/org/docx4j/dml/STTextHorzOverflowType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTextHorzOverflowType.java
rename to src/main/java/org/docx4j/dml/STTextHorzOverflowType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTextShapeType.java b/src/main/java/org/docx4j/dml/STTextShapeType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTextShapeType.java
rename to src/main/java/org/docx4j/dml/STTextShapeType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTextStrikeType.java b/src/main/java/org/docx4j/dml/STTextStrikeType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTextStrikeType.java
rename to src/main/java/org/docx4j/dml/STTextStrikeType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTextTabAlignType.java b/src/main/java/org/docx4j/dml/STTextTabAlignType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTextTabAlignType.java
rename to src/main/java/org/docx4j/dml/STTextTabAlignType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTextUnderlineType.java b/src/main/java/org/docx4j/dml/STTextUnderlineType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTextUnderlineType.java
rename to src/main/java/org/docx4j/dml/STTextUnderlineType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTextVertOverflowType.java b/src/main/java/org/docx4j/dml/STTextVertOverflowType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTextVertOverflowType.java
rename to src/main/java/org/docx4j/dml/STTextVertOverflowType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTextVerticalType.java b/src/main/java/org/docx4j/dml/STTextVerticalType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTextVerticalType.java
rename to src/main/java/org/docx4j/dml/STTextVerticalType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTextWrappingType.java b/src/main/java/org/docx4j/dml/STTextWrappingType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTextWrappingType.java
rename to src/main/java/org/docx4j/dml/STTextWrappingType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/STTileFlipMode.java b/src/main/java/org/docx4j/dml/STTileFlipMode.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/STTileFlipMode.java
rename to src/main/java/org/docx4j/dml/STTileFlipMode.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/TextFont.java b/src/main/java/org/docx4j/dml/TextFont.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/TextFont.java
rename to src/main/java/org/docx4j/dml/TextFont.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/Theme.java b/src/main/java/org/docx4j/dml/Theme.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/Theme.java
rename to src/main/java/org/docx4j/dml/Theme.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTArea3DChart.java b/src/main/java/org/docx4j/dml/chart/CTArea3DChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTArea3DChart.java
rename to src/main/java/org/docx4j/dml/chart/CTArea3DChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTAreaChart.java b/src/main/java/org/docx4j/dml/chart/CTAreaChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTAreaChart.java
rename to src/main/java/org/docx4j/dml/chart/CTAreaChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTAreaSer.java b/src/main/java/org/docx4j/dml/chart/CTAreaSer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTAreaSer.java
rename to src/main/java/org/docx4j/dml/chart/CTAreaSer.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTAxDataSource.java b/src/main/java/org/docx4j/dml/chart/CTAxDataSource.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTAxDataSource.java
rename to src/main/java/org/docx4j/dml/chart/CTAxDataSource.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTAxPos.java b/src/main/java/org/docx4j/dml/chart/CTAxPos.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTAxPos.java
rename to src/main/java/org/docx4j/dml/chart/CTAxPos.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTAxisUnit.java b/src/main/java/org/docx4j/dml/chart/CTAxisUnit.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTAxisUnit.java
rename to src/main/java/org/docx4j/dml/chart/CTAxisUnit.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTBandFmt.java b/src/main/java/org/docx4j/dml/chart/CTBandFmt.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTBandFmt.java
rename to src/main/java/org/docx4j/dml/chart/CTBandFmt.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTBandFmts.java b/src/main/java/org/docx4j/dml/chart/CTBandFmts.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTBandFmts.java
rename to src/main/java/org/docx4j/dml/chart/CTBandFmts.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTBar3DChart.java b/src/main/java/org/docx4j/dml/chart/CTBar3DChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTBar3DChart.java
rename to src/main/java/org/docx4j/dml/chart/CTBar3DChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTBarChart.java b/src/main/java/org/docx4j/dml/chart/CTBarChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTBarChart.java
rename to src/main/java/org/docx4j/dml/chart/CTBarChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTBarDir.java b/src/main/java/org/docx4j/dml/chart/CTBarDir.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTBarDir.java
rename to src/main/java/org/docx4j/dml/chart/CTBarDir.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTBarGrouping.java b/src/main/java/org/docx4j/dml/chart/CTBarGrouping.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTBarGrouping.java
rename to src/main/java/org/docx4j/dml/chart/CTBarGrouping.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTBarSer.java b/src/main/java/org/docx4j/dml/chart/CTBarSer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTBarSer.java
rename to src/main/java/org/docx4j/dml/chart/CTBarSer.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTBoolean.java b/src/main/java/org/docx4j/dml/chart/CTBoolean.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTBoolean.java
rename to src/main/java/org/docx4j/dml/chart/CTBoolean.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTBubbleChart.java b/src/main/java/org/docx4j/dml/chart/CTBubbleChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTBubbleChart.java
rename to src/main/java/org/docx4j/dml/chart/CTBubbleChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTBubbleScale.java b/src/main/java/org/docx4j/dml/chart/CTBubbleScale.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTBubbleScale.java
rename to src/main/java/org/docx4j/dml/chart/CTBubbleScale.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTBubbleSer.java b/src/main/java/org/docx4j/dml/chart/CTBubbleSer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTBubbleSer.java
rename to src/main/java/org/docx4j/dml/chart/CTBubbleSer.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTBuiltInUnit.java b/src/main/java/org/docx4j/dml/chart/CTBuiltInUnit.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTBuiltInUnit.java
rename to src/main/java/org/docx4j/dml/chart/CTBuiltInUnit.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTCatAx.java b/src/main/java/org/docx4j/dml/chart/CTCatAx.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTCatAx.java
rename to src/main/java/org/docx4j/dml/chart/CTCatAx.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTChart.java b/src/main/java/org/docx4j/dml/chart/CTChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTChart.java
rename to src/main/java/org/docx4j/dml/chart/CTChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTChartLines.java b/src/main/java/org/docx4j/dml/chart/CTChartLines.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTChartLines.java
rename to src/main/java/org/docx4j/dml/chart/CTChartLines.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTChartSpace.java b/src/main/java/org/docx4j/dml/chart/CTChartSpace.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTChartSpace.java
rename to src/main/java/org/docx4j/dml/chart/CTChartSpace.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTCrossBetween.java b/src/main/java/org/docx4j/dml/chart/CTCrossBetween.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTCrossBetween.java
rename to src/main/java/org/docx4j/dml/chart/CTCrossBetween.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTCrosses.java b/src/main/java/org/docx4j/dml/chart/CTCrosses.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTCrosses.java
rename to src/main/java/org/docx4j/dml/chart/CTCrosses.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTCustSplit.java b/src/main/java/org/docx4j/dml/chart/CTCustSplit.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTCustSplit.java
rename to src/main/java/org/docx4j/dml/chart/CTCustSplit.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTDLbl.java b/src/main/java/org/docx4j/dml/chart/CTDLbl.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTDLbl.java
rename to src/main/java/org/docx4j/dml/chart/CTDLbl.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTDLblPos.java b/src/main/java/org/docx4j/dml/chart/CTDLblPos.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTDLblPos.java
rename to src/main/java/org/docx4j/dml/chart/CTDLblPos.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTDLbls.java b/src/main/java/org/docx4j/dml/chart/CTDLbls.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTDLbls.java
rename to src/main/java/org/docx4j/dml/chart/CTDLbls.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTDPt.java b/src/main/java/org/docx4j/dml/chart/CTDPt.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTDPt.java
rename to src/main/java/org/docx4j/dml/chart/CTDPt.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTDTable.java b/src/main/java/org/docx4j/dml/chart/CTDTable.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTDTable.java
rename to src/main/java/org/docx4j/dml/chart/CTDTable.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTDateAx.java b/src/main/java/org/docx4j/dml/chart/CTDateAx.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTDateAx.java
rename to src/main/java/org/docx4j/dml/chart/CTDateAx.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTDepthPercent.java b/src/main/java/org/docx4j/dml/chart/CTDepthPercent.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTDepthPercent.java
rename to src/main/java/org/docx4j/dml/chart/CTDepthPercent.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTDispBlanksAs.java b/src/main/java/org/docx4j/dml/chart/CTDispBlanksAs.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTDispBlanksAs.java
rename to src/main/java/org/docx4j/dml/chart/CTDispBlanksAs.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTDispUnits.java b/src/main/java/org/docx4j/dml/chart/CTDispUnits.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTDispUnits.java
rename to src/main/java/org/docx4j/dml/chart/CTDispUnits.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTDispUnitsLbl.java b/src/main/java/org/docx4j/dml/chart/CTDispUnitsLbl.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTDispUnitsLbl.java
rename to src/main/java/org/docx4j/dml/chart/CTDispUnitsLbl.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTDouble.java b/src/main/java/org/docx4j/dml/chart/CTDouble.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTDouble.java
rename to src/main/java/org/docx4j/dml/chart/CTDouble.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTDoughnutChart.java b/src/main/java/org/docx4j/dml/chart/CTDoughnutChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTDoughnutChart.java
rename to src/main/java/org/docx4j/dml/chart/CTDoughnutChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTErrBarType.java b/src/main/java/org/docx4j/dml/chart/CTErrBarType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTErrBarType.java
rename to src/main/java/org/docx4j/dml/chart/CTErrBarType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTErrBars.java b/src/main/java/org/docx4j/dml/chart/CTErrBars.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTErrBars.java
rename to src/main/java/org/docx4j/dml/chart/CTErrBars.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTErrDir.java b/src/main/java/org/docx4j/dml/chart/CTErrDir.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTErrDir.java
rename to src/main/java/org/docx4j/dml/chart/CTErrDir.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTErrValType.java b/src/main/java/org/docx4j/dml/chart/CTErrValType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTErrValType.java
rename to src/main/java/org/docx4j/dml/chart/CTErrValType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTExtension.java b/src/main/java/org/docx4j/dml/chart/CTExtension.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTExtension.java
rename to src/main/java/org/docx4j/dml/chart/CTExtension.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTExtensionList.java b/src/main/java/org/docx4j/dml/chart/CTExtensionList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTExtensionList.java
rename to src/main/java/org/docx4j/dml/chart/CTExtensionList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTExternalData.java b/src/main/java/org/docx4j/dml/chart/CTExternalData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTExternalData.java
rename to src/main/java/org/docx4j/dml/chart/CTExternalData.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTFirstSliceAng.java b/src/main/java/org/docx4j/dml/chart/CTFirstSliceAng.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTFirstSliceAng.java
rename to src/main/java/org/docx4j/dml/chart/CTFirstSliceAng.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTGapAmount.java b/src/main/java/org/docx4j/dml/chart/CTGapAmount.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTGapAmount.java
rename to src/main/java/org/docx4j/dml/chart/CTGapAmount.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTGrouping.java b/src/main/java/org/docx4j/dml/chart/CTGrouping.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTGrouping.java
rename to src/main/java/org/docx4j/dml/chart/CTGrouping.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTHPercent.java b/src/main/java/org/docx4j/dml/chart/CTHPercent.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTHPercent.java
rename to src/main/java/org/docx4j/dml/chart/CTHPercent.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTHeaderFooter.java b/src/main/java/org/docx4j/dml/chart/CTHeaderFooter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTHeaderFooter.java
rename to src/main/java/org/docx4j/dml/chart/CTHeaderFooter.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTHoleSize.java b/src/main/java/org/docx4j/dml/chart/CTHoleSize.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTHoleSize.java
rename to src/main/java/org/docx4j/dml/chart/CTHoleSize.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTLayout.java b/src/main/java/org/docx4j/dml/chart/CTLayout.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTLayout.java
rename to src/main/java/org/docx4j/dml/chart/CTLayout.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTLayoutMode.java b/src/main/java/org/docx4j/dml/chart/CTLayoutMode.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTLayoutMode.java
rename to src/main/java/org/docx4j/dml/chart/CTLayoutMode.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTLayoutTarget.java b/src/main/java/org/docx4j/dml/chart/CTLayoutTarget.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTLayoutTarget.java
rename to src/main/java/org/docx4j/dml/chart/CTLayoutTarget.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTLblAlgn.java b/src/main/java/org/docx4j/dml/chart/CTLblAlgn.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTLblAlgn.java
rename to src/main/java/org/docx4j/dml/chart/CTLblAlgn.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTLblOffset.java b/src/main/java/org/docx4j/dml/chart/CTLblOffset.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTLblOffset.java
rename to src/main/java/org/docx4j/dml/chart/CTLblOffset.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTLegend.java b/src/main/java/org/docx4j/dml/chart/CTLegend.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTLegend.java
rename to src/main/java/org/docx4j/dml/chart/CTLegend.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTLegendEntry.java b/src/main/java/org/docx4j/dml/chart/CTLegendEntry.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTLegendEntry.java
rename to src/main/java/org/docx4j/dml/chart/CTLegendEntry.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTLegendPos.java b/src/main/java/org/docx4j/dml/chart/CTLegendPos.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTLegendPos.java
rename to src/main/java/org/docx4j/dml/chart/CTLegendPos.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTLine3DChart.java b/src/main/java/org/docx4j/dml/chart/CTLine3DChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTLine3DChart.java
rename to src/main/java/org/docx4j/dml/chart/CTLine3DChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTLineChart.java b/src/main/java/org/docx4j/dml/chart/CTLineChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTLineChart.java
rename to src/main/java/org/docx4j/dml/chart/CTLineChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTLineSer.java b/src/main/java/org/docx4j/dml/chart/CTLineSer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTLineSer.java
rename to src/main/java/org/docx4j/dml/chart/CTLineSer.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTLogBase.java b/src/main/java/org/docx4j/dml/chart/CTLogBase.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTLogBase.java
rename to src/main/java/org/docx4j/dml/chart/CTLogBase.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTLvl.java b/src/main/java/org/docx4j/dml/chart/CTLvl.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTLvl.java
rename to src/main/java/org/docx4j/dml/chart/CTLvl.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTManualLayout.java b/src/main/java/org/docx4j/dml/chart/CTManualLayout.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTManualLayout.java
rename to src/main/java/org/docx4j/dml/chart/CTManualLayout.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTMarker.java b/src/main/java/org/docx4j/dml/chart/CTMarker.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTMarker.java
rename to src/main/java/org/docx4j/dml/chart/CTMarker.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTMarkerSize.java b/src/main/java/org/docx4j/dml/chart/CTMarkerSize.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTMarkerSize.java
rename to src/main/java/org/docx4j/dml/chart/CTMarkerSize.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTMarkerStyle.java b/src/main/java/org/docx4j/dml/chart/CTMarkerStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTMarkerStyle.java
rename to src/main/java/org/docx4j/dml/chart/CTMarkerStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTMultiLvlStrData.java b/src/main/java/org/docx4j/dml/chart/CTMultiLvlStrData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTMultiLvlStrData.java
rename to src/main/java/org/docx4j/dml/chart/CTMultiLvlStrData.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTMultiLvlStrRef.java b/src/main/java/org/docx4j/dml/chart/CTMultiLvlStrRef.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTMultiLvlStrRef.java
rename to src/main/java/org/docx4j/dml/chart/CTMultiLvlStrRef.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTNumData.java b/src/main/java/org/docx4j/dml/chart/CTNumData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTNumData.java
rename to src/main/java/org/docx4j/dml/chart/CTNumData.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTNumDataSource.java b/src/main/java/org/docx4j/dml/chart/CTNumDataSource.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTNumDataSource.java
rename to src/main/java/org/docx4j/dml/chart/CTNumDataSource.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTNumFmt.java b/src/main/java/org/docx4j/dml/chart/CTNumFmt.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTNumFmt.java
rename to src/main/java/org/docx4j/dml/chart/CTNumFmt.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTNumRef.java b/src/main/java/org/docx4j/dml/chart/CTNumRef.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTNumRef.java
rename to src/main/java/org/docx4j/dml/chart/CTNumRef.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTNumVal.java b/src/main/java/org/docx4j/dml/chart/CTNumVal.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTNumVal.java
rename to src/main/java/org/docx4j/dml/chart/CTNumVal.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTOfPieChart.java b/src/main/java/org/docx4j/dml/chart/CTOfPieChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTOfPieChart.java
rename to src/main/java/org/docx4j/dml/chart/CTOfPieChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTOfPieType.java b/src/main/java/org/docx4j/dml/chart/CTOfPieType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTOfPieType.java
rename to src/main/java/org/docx4j/dml/chart/CTOfPieType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTOrder.java b/src/main/java/org/docx4j/dml/chart/CTOrder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTOrder.java
rename to src/main/java/org/docx4j/dml/chart/CTOrder.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTOrientation.java b/src/main/java/org/docx4j/dml/chart/CTOrientation.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTOrientation.java
rename to src/main/java/org/docx4j/dml/chart/CTOrientation.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTOverlap.java b/src/main/java/org/docx4j/dml/chart/CTOverlap.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTOverlap.java
rename to src/main/java/org/docx4j/dml/chart/CTOverlap.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPageMargins.java b/src/main/java/org/docx4j/dml/chart/CTPageMargins.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPageMargins.java
rename to src/main/java/org/docx4j/dml/chart/CTPageMargins.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPageSetup.java b/src/main/java/org/docx4j/dml/chart/CTPageSetup.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPageSetup.java
rename to src/main/java/org/docx4j/dml/chart/CTPageSetup.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPeriod.java b/src/main/java/org/docx4j/dml/chart/CTPeriod.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPeriod.java
rename to src/main/java/org/docx4j/dml/chart/CTPeriod.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPerspective.java b/src/main/java/org/docx4j/dml/chart/CTPerspective.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPerspective.java
rename to src/main/java/org/docx4j/dml/chart/CTPerspective.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPictureFormat.java b/src/main/java/org/docx4j/dml/chart/CTPictureFormat.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPictureFormat.java
rename to src/main/java/org/docx4j/dml/chart/CTPictureFormat.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPictureOptions.java b/src/main/java/org/docx4j/dml/chart/CTPictureOptions.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPictureOptions.java
rename to src/main/java/org/docx4j/dml/chart/CTPictureOptions.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPictureStackUnit.java b/src/main/java/org/docx4j/dml/chart/CTPictureStackUnit.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPictureStackUnit.java
rename to src/main/java/org/docx4j/dml/chart/CTPictureStackUnit.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPie3DChart.java b/src/main/java/org/docx4j/dml/chart/CTPie3DChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPie3DChart.java
rename to src/main/java/org/docx4j/dml/chart/CTPie3DChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPieChart.java b/src/main/java/org/docx4j/dml/chart/CTPieChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPieChart.java
rename to src/main/java/org/docx4j/dml/chart/CTPieChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPieSer.java b/src/main/java/org/docx4j/dml/chart/CTPieSer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPieSer.java
rename to src/main/java/org/docx4j/dml/chart/CTPieSer.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPivotFmt.java b/src/main/java/org/docx4j/dml/chart/CTPivotFmt.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPivotFmt.java
rename to src/main/java/org/docx4j/dml/chart/CTPivotFmt.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPivotFmts.java b/src/main/java/org/docx4j/dml/chart/CTPivotFmts.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPivotFmts.java
rename to src/main/java/org/docx4j/dml/chart/CTPivotFmts.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPivotSource.java b/src/main/java/org/docx4j/dml/chart/CTPivotSource.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPivotSource.java
rename to src/main/java/org/docx4j/dml/chart/CTPivotSource.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPlotArea.java b/src/main/java/org/docx4j/dml/chart/CTPlotArea.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPlotArea.java
rename to src/main/java/org/docx4j/dml/chart/CTPlotArea.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTPrintSettings.java b/src/main/java/org/docx4j/dml/chart/CTPrintSettings.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTPrintSettings.java
rename to src/main/java/org/docx4j/dml/chart/CTPrintSettings.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTProtection.java b/src/main/java/org/docx4j/dml/chart/CTProtection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTProtection.java
rename to src/main/java/org/docx4j/dml/chart/CTProtection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTRadarChart.java b/src/main/java/org/docx4j/dml/chart/CTRadarChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTRadarChart.java
rename to src/main/java/org/docx4j/dml/chart/CTRadarChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTRadarSer.java b/src/main/java/org/docx4j/dml/chart/CTRadarSer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTRadarSer.java
rename to src/main/java/org/docx4j/dml/chart/CTRadarSer.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTRadarStyle.java b/src/main/java/org/docx4j/dml/chart/CTRadarStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTRadarStyle.java
rename to src/main/java/org/docx4j/dml/chart/CTRadarStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTRelId.java b/src/main/java/org/docx4j/dml/chart/CTRelId.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTRelId.java
rename to src/main/java/org/docx4j/dml/chart/CTRelId.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTRotX.java b/src/main/java/org/docx4j/dml/chart/CTRotX.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTRotX.java
rename to src/main/java/org/docx4j/dml/chart/CTRotX.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTRotY.java b/src/main/java/org/docx4j/dml/chart/CTRotY.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTRotY.java
rename to src/main/java/org/docx4j/dml/chart/CTRotY.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTScaling.java b/src/main/java/org/docx4j/dml/chart/CTScaling.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTScaling.java
rename to src/main/java/org/docx4j/dml/chart/CTScaling.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTScatterChart.java b/src/main/java/org/docx4j/dml/chart/CTScatterChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTScatterChart.java
rename to src/main/java/org/docx4j/dml/chart/CTScatterChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTScatterSer.java b/src/main/java/org/docx4j/dml/chart/CTScatterSer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTScatterSer.java
rename to src/main/java/org/docx4j/dml/chart/CTScatterSer.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTScatterStyle.java b/src/main/java/org/docx4j/dml/chart/CTScatterStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTScatterStyle.java
rename to src/main/java/org/docx4j/dml/chart/CTScatterStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTSecondPieSize.java b/src/main/java/org/docx4j/dml/chart/CTSecondPieSize.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTSecondPieSize.java
rename to src/main/java/org/docx4j/dml/chart/CTSecondPieSize.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTSerAx.java b/src/main/java/org/docx4j/dml/chart/CTSerAx.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTSerAx.java
rename to src/main/java/org/docx4j/dml/chart/CTSerAx.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTSerTx.java b/src/main/java/org/docx4j/dml/chart/CTSerTx.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTSerTx.java
rename to src/main/java/org/docx4j/dml/chart/CTSerTx.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTShape.java b/src/main/java/org/docx4j/dml/chart/CTShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTShape.java
rename to src/main/java/org/docx4j/dml/chart/CTShape.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTSizeRepresents.java b/src/main/java/org/docx4j/dml/chart/CTSizeRepresents.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTSizeRepresents.java
rename to src/main/java/org/docx4j/dml/chart/CTSizeRepresents.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTSkip.java b/src/main/java/org/docx4j/dml/chart/CTSkip.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTSkip.java
rename to src/main/java/org/docx4j/dml/chart/CTSkip.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTSplitType.java b/src/main/java/org/docx4j/dml/chart/CTSplitType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTSplitType.java
rename to src/main/java/org/docx4j/dml/chart/CTSplitType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTStockChart.java b/src/main/java/org/docx4j/dml/chart/CTStockChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTStockChart.java
rename to src/main/java/org/docx4j/dml/chart/CTStockChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTStrData.java b/src/main/java/org/docx4j/dml/chart/CTStrData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTStrData.java
rename to src/main/java/org/docx4j/dml/chart/CTStrData.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTStrRef.java b/src/main/java/org/docx4j/dml/chart/CTStrRef.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTStrRef.java
rename to src/main/java/org/docx4j/dml/chart/CTStrRef.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTStrVal.java b/src/main/java/org/docx4j/dml/chart/CTStrVal.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTStrVal.java
rename to src/main/java/org/docx4j/dml/chart/CTStrVal.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTStyle.java b/src/main/java/org/docx4j/dml/chart/CTStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTStyle.java
rename to src/main/java/org/docx4j/dml/chart/CTStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTSurface.java b/src/main/java/org/docx4j/dml/chart/CTSurface.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTSurface.java
rename to src/main/java/org/docx4j/dml/chart/CTSurface.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTSurface3DChart.java b/src/main/java/org/docx4j/dml/chart/CTSurface3DChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTSurface3DChart.java
rename to src/main/java/org/docx4j/dml/chart/CTSurface3DChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTSurfaceChart.java b/src/main/java/org/docx4j/dml/chart/CTSurfaceChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTSurfaceChart.java
rename to src/main/java/org/docx4j/dml/chart/CTSurfaceChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTSurfaceSer.java b/src/main/java/org/docx4j/dml/chart/CTSurfaceSer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTSurfaceSer.java
rename to src/main/java/org/docx4j/dml/chart/CTSurfaceSer.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTTextLanguageID.java b/src/main/java/org/docx4j/dml/chart/CTTextLanguageID.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTTextLanguageID.java
rename to src/main/java/org/docx4j/dml/chart/CTTextLanguageID.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTTickLblPos.java b/src/main/java/org/docx4j/dml/chart/CTTickLblPos.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTTickLblPos.java
rename to src/main/java/org/docx4j/dml/chart/CTTickLblPos.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTTickMark.java b/src/main/java/org/docx4j/dml/chart/CTTickMark.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTTickMark.java
rename to src/main/java/org/docx4j/dml/chart/CTTickMark.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTTimeUnit.java b/src/main/java/org/docx4j/dml/chart/CTTimeUnit.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTTimeUnit.java
rename to src/main/java/org/docx4j/dml/chart/CTTimeUnit.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTTitle.java b/src/main/java/org/docx4j/dml/chart/CTTitle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTTitle.java
rename to src/main/java/org/docx4j/dml/chart/CTTitle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTTrendline.java b/src/main/java/org/docx4j/dml/chart/CTTrendline.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTTrendline.java
rename to src/main/java/org/docx4j/dml/chart/CTTrendline.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTTrendlineLbl.java b/src/main/java/org/docx4j/dml/chart/CTTrendlineLbl.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTTrendlineLbl.java
rename to src/main/java/org/docx4j/dml/chart/CTTrendlineLbl.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTTrendlineType.java b/src/main/java/org/docx4j/dml/chart/CTTrendlineType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTTrendlineType.java
rename to src/main/java/org/docx4j/dml/chart/CTTrendlineType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTTx.java b/src/main/java/org/docx4j/dml/chart/CTTx.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTTx.java
rename to src/main/java/org/docx4j/dml/chart/CTTx.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTUnsignedInt.java b/src/main/java/org/docx4j/dml/chart/CTUnsignedInt.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTUnsignedInt.java
rename to src/main/java/org/docx4j/dml/chart/CTUnsignedInt.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTUpDownBar.java b/src/main/java/org/docx4j/dml/chart/CTUpDownBar.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTUpDownBar.java
rename to src/main/java/org/docx4j/dml/chart/CTUpDownBar.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTUpDownBars.java b/src/main/java/org/docx4j/dml/chart/CTUpDownBars.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTUpDownBars.java
rename to src/main/java/org/docx4j/dml/chart/CTUpDownBars.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTValAx.java b/src/main/java/org/docx4j/dml/chart/CTValAx.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTValAx.java
rename to src/main/java/org/docx4j/dml/chart/CTValAx.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/CTView3D.java b/src/main/java/org/docx4j/dml/chart/CTView3D.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/CTView3D.java
rename to src/main/java/org/docx4j/dml/chart/CTView3D.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/ListSer.java b/src/main/java/org/docx4j/dml/chart/ListSer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/ListSer.java
rename to src/main/java/org/docx4j/dml/chart/ListSer.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/ObjectFactory.java b/src/main/java/org/docx4j/dml/chart/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/ObjectFactory.java
rename to src/main/java/org/docx4j/dml/chart/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STAxPos.java b/src/main/java/org/docx4j/dml/chart/STAxPos.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STAxPos.java
rename to src/main/java/org/docx4j/dml/chart/STAxPos.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STBarDir.java b/src/main/java/org/docx4j/dml/chart/STBarDir.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STBarDir.java
rename to src/main/java/org/docx4j/dml/chart/STBarDir.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STBarGrouping.java b/src/main/java/org/docx4j/dml/chart/STBarGrouping.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STBarGrouping.java
rename to src/main/java/org/docx4j/dml/chart/STBarGrouping.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STBuiltInUnit.java b/src/main/java/org/docx4j/dml/chart/STBuiltInUnit.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STBuiltInUnit.java
rename to src/main/java/org/docx4j/dml/chart/STBuiltInUnit.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STCrossBetween.java b/src/main/java/org/docx4j/dml/chart/STCrossBetween.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STCrossBetween.java
rename to src/main/java/org/docx4j/dml/chart/STCrossBetween.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STCrosses.java b/src/main/java/org/docx4j/dml/chart/STCrosses.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STCrosses.java
rename to src/main/java/org/docx4j/dml/chart/STCrosses.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STDLblPos.java b/src/main/java/org/docx4j/dml/chart/STDLblPos.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STDLblPos.java
rename to src/main/java/org/docx4j/dml/chart/STDLblPos.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STDispBlanksAs.java b/src/main/java/org/docx4j/dml/chart/STDispBlanksAs.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STDispBlanksAs.java
rename to src/main/java/org/docx4j/dml/chart/STDispBlanksAs.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STErrBarType.java b/src/main/java/org/docx4j/dml/chart/STErrBarType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STErrBarType.java
rename to src/main/java/org/docx4j/dml/chart/STErrBarType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STErrDir.java b/src/main/java/org/docx4j/dml/chart/STErrDir.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STErrDir.java
rename to src/main/java/org/docx4j/dml/chart/STErrDir.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STErrValType.java b/src/main/java/org/docx4j/dml/chart/STErrValType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STErrValType.java
rename to src/main/java/org/docx4j/dml/chart/STErrValType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STGrouping.java b/src/main/java/org/docx4j/dml/chart/STGrouping.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STGrouping.java
rename to src/main/java/org/docx4j/dml/chart/STGrouping.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STLayoutMode.java b/src/main/java/org/docx4j/dml/chart/STLayoutMode.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STLayoutMode.java
rename to src/main/java/org/docx4j/dml/chart/STLayoutMode.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STLayoutTarget.java b/src/main/java/org/docx4j/dml/chart/STLayoutTarget.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STLayoutTarget.java
rename to src/main/java/org/docx4j/dml/chart/STLayoutTarget.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STLblAlgn.java b/src/main/java/org/docx4j/dml/chart/STLblAlgn.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STLblAlgn.java
rename to src/main/java/org/docx4j/dml/chart/STLblAlgn.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STLegendPos.java b/src/main/java/org/docx4j/dml/chart/STLegendPos.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STLegendPos.java
rename to src/main/java/org/docx4j/dml/chart/STLegendPos.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STMarkerStyle.java b/src/main/java/org/docx4j/dml/chart/STMarkerStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STMarkerStyle.java
rename to src/main/java/org/docx4j/dml/chart/STMarkerStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STOfPieType.java b/src/main/java/org/docx4j/dml/chart/STOfPieType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STOfPieType.java
rename to src/main/java/org/docx4j/dml/chart/STOfPieType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STOrientation.java b/src/main/java/org/docx4j/dml/chart/STOrientation.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STOrientation.java
rename to src/main/java/org/docx4j/dml/chart/STOrientation.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STPageSetupOrientation.java b/src/main/java/org/docx4j/dml/chart/STPageSetupOrientation.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STPageSetupOrientation.java
rename to src/main/java/org/docx4j/dml/chart/STPageSetupOrientation.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STPictureFormat.java b/src/main/java/org/docx4j/dml/chart/STPictureFormat.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STPictureFormat.java
rename to src/main/java/org/docx4j/dml/chart/STPictureFormat.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STRadarStyle.java b/src/main/java/org/docx4j/dml/chart/STRadarStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STRadarStyle.java
rename to src/main/java/org/docx4j/dml/chart/STRadarStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STScatterStyle.java b/src/main/java/org/docx4j/dml/chart/STScatterStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STScatterStyle.java
rename to src/main/java/org/docx4j/dml/chart/STScatterStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STShape.java b/src/main/java/org/docx4j/dml/chart/STShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STShape.java
rename to src/main/java/org/docx4j/dml/chart/STShape.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STSizeRepresents.java b/src/main/java/org/docx4j/dml/chart/STSizeRepresents.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STSizeRepresents.java
rename to src/main/java/org/docx4j/dml/chart/STSizeRepresents.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STSplitType.java b/src/main/java/org/docx4j/dml/chart/STSplitType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STSplitType.java
rename to src/main/java/org/docx4j/dml/chart/STSplitType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STTickLblPos.java b/src/main/java/org/docx4j/dml/chart/STTickLblPos.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STTickLblPos.java
rename to src/main/java/org/docx4j/dml/chart/STTickLblPos.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STTickMark.java b/src/main/java/org/docx4j/dml/chart/STTickMark.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STTickMark.java
rename to src/main/java/org/docx4j/dml/chart/STTickMark.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STTimeUnit.java b/src/main/java/org/docx4j/dml/chart/STTimeUnit.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STTimeUnit.java
rename to src/main/java/org/docx4j/dml/chart/STTimeUnit.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/STTrendlineType.java b/src/main/java/org/docx4j/dml/chart/STTrendlineType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/STTrendlineType.java
rename to src/main/java/org/docx4j/dml/chart/STTrendlineType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/SerContent.java b/src/main/java/org/docx4j/dml/chart/SerContent.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/SerContent.java
rename to src/main/java/org/docx4j/dml/chart/SerContent.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/SerContentXY.java b/src/main/java/org/docx4j/dml/chart/SerContentXY.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/SerContentXY.java
rename to src/main/java/org/docx4j/dml/chart/SerContentXY.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chart/package-info.java b/src/main/java/org/docx4j/dml/chart/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chart/package-info.java
rename to src/main/java/org/docx4j/dml/chart/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTAbsSizeAnchor.java b/src/main/java/org/docx4j/dml/chartDrawing/CTAbsSizeAnchor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTAbsSizeAnchor.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTAbsSizeAnchor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTConnector.java b/src/main/java/org/docx4j/dml/chartDrawing/CTConnector.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTConnector.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTConnector.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTConnectorNonVisual.java b/src/main/java/org/docx4j/dml/chartDrawing/CTConnectorNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTConnectorNonVisual.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTConnectorNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTDrawing.java b/src/main/java/org/docx4j/dml/chartDrawing/CTDrawing.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTDrawing.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTDrawing.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTGraphicFrame.java b/src/main/java/org/docx4j/dml/chartDrawing/CTGraphicFrame.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTGraphicFrame.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTGraphicFrame.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTGraphicFrameNonVisual.java b/src/main/java/org/docx4j/dml/chartDrawing/CTGraphicFrameNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTGraphicFrameNonVisual.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTGraphicFrameNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTGroupShape.java b/src/main/java/org/docx4j/dml/chartDrawing/CTGroupShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTGroupShape.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTGroupShape.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTGroupShapeNonVisual.java b/src/main/java/org/docx4j/dml/chartDrawing/CTGroupShapeNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTGroupShapeNonVisual.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTGroupShapeNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTMarker.java b/src/main/java/org/docx4j/dml/chartDrawing/CTMarker.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTMarker.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTMarker.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTPicture.java b/src/main/java/org/docx4j/dml/chartDrawing/CTPicture.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTPicture.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTPicture.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTPictureNonVisual.java b/src/main/java/org/docx4j/dml/chartDrawing/CTPictureNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTPictureNonVisual.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTPictureNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTRelSizeAnchor.java b/src/main/java/org/docx4j/dml/chartDrawing/CTRelSizeAnchor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTRelSizeAnchor.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTRelSizeAnchor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTShape.java b/src/main/java/org/docx4j/dml/chartDrawing/CTShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTShape.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTShape.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTShapeNonVisual.java b/src/main/java/org/docx4j/dml/chartDrawing/CTShapeNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/CTShapeNonVisual.java
rename to src/main/java/org/docx4j/dml/chartDrawing/CTShapeNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/ObjectFactory.java b/src/main/java/org/docx4j/dml/chartDrawing/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/ObjectFactory.java
rename to src/main/java/org/docx4j/dml/chartDrawing/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/chartDrawing/package-info.java b/src/main/java/org/docx4j/dml/chartDrawing/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/chartDrawing/package-info.java
rename to src/main/java/org/docx4j/dml/chartDrawing/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/compatibility/CTCompat.java b/src/main/java/org/docx4j/dml/compatibility/CTCompat.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/compatibility/CTCompat.java
rename to src/main/java/org/docx4j/dml/compatibility/CTCompat.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/compatibility/ObjectFactory.java b/src/main/java/org/docx4j/dml/compatibility/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/compatibility/ObjectFactory.java
rename to src/main/java/org/docx4j/dml/compatibility/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/compatibility/package-info.java b/src/main/java/org/docx4j/dml/compatibility/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/compatibility/package-info.java
rename to src/main/java/org/docx4j/dml/compatibility/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTAdj.java b/src/main/java/org/docx4j/dml/diagram/CTAdj.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTAdj.java
rename to src/main/java/org/docx4j/dml/diagram/CTAdj.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTAdjLst.java b/src/main/java/org/docx4j/dml/diagram/CTAdjLst.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTAdjLst.java
rename to src/main/java/org/docx4j/dml/diagram/CTAdjLst.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTAlgorithm.java b/src/main/java/org/docx4j/dml/diagram/CTAlgorithm.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTAlgorithm.java
rename to src/main/java/org/docx4j/dml/diagram/CTAlgorithm.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTAnimLvl.java b/src/main/java/org/docx4j/dml/diagram/CTAnimLvl.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTAnimLvl.java
rename to src/main/java/org/docx4j/dml/diagram/CTAnimLvl.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTAnimOne.java b/src/main/java/org/docx4j/dml/diagram/CTAnimOne.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTAnimOne.java
rename to src/main/java/org/docx4j/dml/diagram/CTAnimOne.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTBulletEnabled.java b/src/main/java/org/docx4j/dml/diagram/CTBulletEnabled.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTBulletEnabled.java
rename to src/main/java/org/docx4j/dml/diagram/CTBulletEnabled.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTCTCategories.java b/src/main/java/org/docx4j/dml/diagram/CTCTCategories.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTCTCategories.java
rename to src/main/java/org/docx4j/dml/diagram/CTCTCategories.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTCTCategory.java b/src/main/java/org/docx4j/dml/diagram/CTCTCategory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTCTCategory.java
rename to src/main/java/org/docx4j/dml/diagram/CTCTCategory.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTCTDescription.java b/src/main/java/org/docx4j/dml/diagram/CTCTDescription.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTCTDescription.java
rename to src/main/java/org/docx4j/dml/diagram/CTCTDescription.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTCTName.java b/src/main/java/org/docx4j/dml/diagram/CTCTName.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTCTName.java
rename to src/main/java/org/docx4j/dml/diagram/CTCTName.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTCTStyleLabel.java b/src/main/java/org/docx4j/dml/diagram/CTCTStyleLabel.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTCTStyleLabel.java
rename to src/main/java/org/docx4j/dml/diagram/CTCTStyleLabel.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTCategories.java b/src/main/java/org/docx4j/dml/diagram/CTCategories.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTCategories.java
rename to src/main/java/org/docx4j/dml/diagram/CTCategories.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTCategory.java b/src/main/java/org/docx4j/dml/diagram/CTCategory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTCategory.java
rename to src/main/java/org/docx4j/dml/diagram/CTCategory.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTChildMax.java b/src/main/java/org/docx4j/dml/diagram/CTChildMax.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTChildMax.java
rename to src/main/java/org/docx4j/dml/diagram/CTChildMax.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTChildPref.java b/src/main/java/org/docx4j/dml/diagram/CTChildPref.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTChildPref.java
rename to src/main/java/org/docx4j/dml/diagram/CTChildPref.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTChoose.java b/src/main/java/org/docx4j/dml/diagram/CTChoose.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTChoose.java
rename to src/main/java/org/docx4j/dml/diagram/CTChoose.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTColorTransform.java b/src/main/java/org/docx4j/dml/diagram/CTColorTransform.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTColorTransform.java
rename to src/main/java/org/docx4j/dml/diagram/CTColorTransform.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTColorTransformHeader.java b/src/main/java/org/docx4j/dml/diagram/CTColorTransformHeader.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTColorTransformHeader.java
rename to src/main/java/org/docx4j/dml/diagram/CTColorTransformHeader.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTColorTransformHeaderLst.java b/src/main/java/org/docx4j/dml/diagram/CTColorTransformHeaderLst.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTColorTransformHeaderLst.java
rename to src/main/java/org/docx4j/dml/diagram/CTColorTransformHeaderLst.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTColors.java b/src/main/java/org/docx4j/dml/diagram/CTColors.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTColors.java
rename to src/main/java/org/docx4j/dml/diagram/CTColors.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTConstraint.java b/src/main/java/org/docx4j/dml/diagram/CTConstraint.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTConstraint.java
rename to src/main/java/org/docx4j/dml/diagram/CTConstraint.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTConstraints.java b/src/main/java/org/docx4j/dml/diagram/CTConstraints.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTConstraints.java
rename to src/main/java/org/docx4j/dml/diagram/CTConstraints.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTCxn.java b/src/main/java/org/docx4j/dml/diagram/CTCxn.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTCxn.java
rename to src/main/java/org/docx4j/dml/diagram/CTCxn.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTCxnList.java b/src/main/java/org/docx4j/dml/diagram/CTCxnList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTCxnList.java
rename to src/main/java/org/docx4j/dml/diagram/CTCxnList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTDataModel.java b/src/main/java/org/docx4j/dml/diagram/CTDataModel.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTDataModel.java
rename to src/main/java/org/docx4j/dml/diagram/CTDataModel.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTDescription.java b/src/main/java/org/docx4j/dml/diagram/CTDescription.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTDescription.java
rename to src/main/java/org/docx4j/dml/diagram/CTDescription.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTDiagramDefinition.java b/src/main/java/org/docx4j/dml/diagram/CTDiagramDefinition.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTDiagramDefinition.java
rename to src/main/java/org/docx4j/dml/diagram/CTDiagramDefinition.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTDiagramDefinitionHeader.java b/src/main/java/org/docx4j/dml/diagram/CTDiagramDefinitionHeader.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTDiagramDefinitionHeader.java
rename to src/main/java/org/docx4j/dml/diagram/CTDiagramDefinitionHeader.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTDiagramDefinitionHeaderLst.java b/src/main/java/org/docx4j/dml/diagram/CTDiagramDefinitionHeaderLst.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTDiagramDefinitionHeaderLst.java
rename to src/main/java/org/docx4j/dml/diagram/CTDiagramDefinitionHeaderLst.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTDirection.java b/src/main/java/org/docx4j/dml/diagram/CTDirection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTDirection.java
rename to src/main/java/org/docx4j/dml/diagram/CTDirection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTElemPropSet.java b/src/main/java/org/docx4j/dml/diagram/CTElemPropSet.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTElemPropSet.java
rename to src/main/java/org/docx4j/dml/diagram/CTElemPropSet.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTForEach.java b/src/main/java/org/docx4j/dml/diagram/CTForEach.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTForEach.java
rename to src/main/java/org/docx4j/dml/diagram/CTForEach.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTHierBranchStyle.java b/src/main/java/org/docx4j/dml/diagram/CTHierBranchStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTHierBranchStyle.java
rename to src/main/java/org/docx4j/dml/diagram/CTHierBranchStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTLayoutNode.java b/src/main/java/org/docx4j/dml/diagram/CTLayoutNode.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTLayoutNode.java
rename to src/main/java/org/docx4j/dml/diagram/CTLayoutNode.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTLayoutVariablePropertySet.java b/src/main/java/org/docx4j/dml/diagram/CTLayoutVariablePropertySet.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTLayoutVariablePropertySet.java
rename to src/main/java/org/docx4j/dml/diagram/CTLayoutVariablePropertySet.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTName.java b/src/main/java/org/docx4j/dml/diagram/CTName.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTName.java
rename to src/main/java/org/docx4j/dml/diagram/CTName.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTNumericRule.java b/src/main/java/org/docx4j/dml/diagram/CTNumericRule.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTNumericRule.java
rename to src/main/java/org/docx4j/dml/diagram/CTNumericRule.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTOrgChart.java b/src/main/java/org/docx4j/dml/diagram/CTOrgChart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTOrgChart.java
rename to src/main/java/org/docx4j/dml/diagram/CTOrgChart.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTOtherwise.java b/src/main/java/org/docx4j/dml/diagram/CTOtherwise.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTOtherwise.java
rename to src/main/java/org/docx4j/dml/diagram/CTOtherwise.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTParameter.java b/src/main/java/org/docx4j/dml/diagram/CTParameter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTParameter.java
rename to src/main/java/org/docx4j/dml/diagram/CTParameter.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTPresentationOf.java b/src/main/java/org/docx4j/dml/diagram/CTPresentationOf.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTPresentationOf.java
rename to src/main/java/org/docx4j/dml/diagram/CTPresentationOf.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTPt.java b/src/main/java/org/docx4j/dml/diagram/CTPt.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTPt.java
rename to src/main/java/org/docx4j/dml/diagram/CTPt.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTPtList.java b/src/main/java/org/docx4j/dml/diagram/CTPtList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTPtList.java
rename to src/main/java/org/docx4j/dml/diagram/CTPtList.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTRelIds.java b/src/main/java/org/docx4j/dml/diagram/CTRelIds.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTRelIds.java
rename to src/main/java/org/docx4j/dml/diagram/CTRelIds.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTResizeHandles.java b/src/main/java/org/docx4j/dml/diagram/CTResizeHandles.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTResizeHandles.java
rename to src/main/java/org/docx4j/dml/diagram/CTResizeHandles.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTRules.java b/src/main/java/org/docx4j/dml/diagram/CTRules.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTRules.java
rename to src/main/java/org/docx4j/dml/diagram/CTRules.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTSDCategories.java b/src/main/java/org/docx4j/dml/diagram/CTSDCategories.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTSDCategories.java
rename to src/main/java/org/docx4j/dml/diagram/CTSDCategories.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTSDCategory.java b/src/main/java/org/docx4j/dml/diagram/CTSDCategory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTSDCategory.java
rename to src/main/java/org/docx4j/dml/diagram/CTSDCategory.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTSDDescription.java b/src/main/java/org/docx4j/dml/diagram/CTSDDescription.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTSDDescription.java
rename to src/main/java/org/docx4j/dml/diagram/CTSDDescription.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTSDName.java b/src/main/java/org/docx4j/dml/diagram/CTSDName.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTSDName.java
rename to src/main/java/org/docx4j/dml/diagram/CTSDName.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTSampleData.java b/src/main/java/org/docx4j/dml/diagram/CTSampleData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTSampleData.java
rename to src/main/java/org/docx4j/dml/diagram/CTSampleData.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTShape.java b/src/main/java/org/docx4j/dml/diagram/CTShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTShape.java
rename to src/main/java/org/docx4j/dml/diagram/CTShape.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTStyleDefinition.java b/src/main/java/org/docx4j/dml/diagram/CTStyleDefinition.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTStyleDefinition.java
rename to src/main/java/org/docx4j/dml/diagram/CTStyleDefinition.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTStyleDefinitionHeader.java b/src/main/java/org/docx4j/dml/diagram/CTStyleDefinitionHeader.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTStyleDefinitionHeader.java
rename to src/main/java/org/docx4j/dml/diagram/CTStyleDefinitionHeader.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTStyleDefinitionHeaderLst.java b/src/main/java/org/docx4j/dml/diagram/CTStyleDefinitionHeaderLst.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTStyleDefinitionHeaderLst.java
rename to src/main/java/org/docx4j/dml/diagram/CTStyleDefinitionHeaderLst.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTStyleLabel.java b/src/main/java/org/docx4j/dml/diagram/CTStyleLabel.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTStyleLabel.java
rename to src/main/java/org/docx4j/dml/diagram/CTStyleLabel.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTTextProps.java b/src/main/java/org/docx4j/dml/diagram/CTTextProps.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTTextProps.java
rename to src/main/java/org/docx4j/dml/diagram/CTTextProps.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/CTWhen.java b/src/main/java/org/docx4j/dml/diagram/CTWhen.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/CTWhen.java
rename to src/main/java/org/docx4j/dml/diagram/CTWhen.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/ObjectFactory.java b/src/main/java/org/docx4j/dml/diagram/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/ObjectFactory.java
rename to src/main/java/org/docx4j/dml/diagram/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STAlgorithmType.java b/src/main/java/org/docx4j/dml/diagram/STAlgorithmType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STAlgorithmType.java
rename to src/main/java/org/docx4j/dml/diagram/STAlgorithmType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STAnimLvlStr.java b/src/main/java/org/docx4j/dml/diagram/STAnimLvlStr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STAnimLvlStr.java
rename to src/main/java/org/docx4j/dml/diagram/STAnimLvlStr.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STAnimOneStr.java b/src/main/java/org/docx4j/dml/diagram/STAnimOneStr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STAnimOneStr.java
rename to src/main/java/org/docx4j/dml/diagram/STAnimOneStr.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STArrowheadStyle.java b/src/main/java/org/docx4j/dml/diagram/STArrowheadStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STArrowheadStyle.java
rename to src/main/java/org/docx4j/dml/diagram/STArrowheadStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STAutoTextRotation.java b/src/main/java/org/docx4j/dml/diagram/STAutoTextRotation.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STAutoTextRotation.java
rename to src/main/java/org/docx4j/dml/diagram/STAutoTextRotation.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STAxisType.java b/src/main/java/org/docx4j/dml/diagram/STAxisType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STAxisType.java
rename to src/main/java/org/docx4j/dml/diagram/STAxisType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STBendPoint.java b/src/main/java/org/docx4j/dml/diagram/STBendPoint.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STBendPoint.java
rename to src/main/java/org/docx4j/dml/diagram/STBendPoint.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STBoolOperator.java b/src/main/java/org/docx4j/dml/diagram/STBoolOperator.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STBoolOperator.java
rename to src/main/java/org/docx4j/dml/diagram/STBoolOperator.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STBreakpoint.java b/src/main/java/org/docx4j/dml/diagram/STBreakpoint.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STBreakpoint.java
rename to src/main/java/org/docx4j/dml/diagram/STBreakpoint.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STCenterShapeMapping.java b/src/main/java/org/docx4j/dml/diagram/STCenterShapeMapping.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STCenterShapeMapping.java
rename to src/main/java/org/docx4j/dml/diagram/STCenterShapeMapping.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STChildAlignment.java b/src/main/java/org/docx4j/dml/diagram/STChildAlignment.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STChildAlignment.java
rename to src/main/java/org/docx4j/dml/diagram/STChildAlignment.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STChildDirection.java b/src/main/java/org/docx4j/dml/diagram/STChildDirection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STChildDirection.java
rename to src/main/java/org/docx4j/dml/diagram/STChildDirection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STChildOrderType.java b/src/main/java/org/docx4j/dml/diagram/STChildOrderType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STChildOrderType.java
rename to src/main/java/org/docx4j/dml/diagram/STChildOrderType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STClrAppMethod.java b/src/main/java/org/docx4j/dml/diagram/STClrAppMethod.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STClrAppMethod.java
rename to src/main/java/org/docx4j/dml/diagram/STClrAppMethod.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STConnectorPoint.java b/src/main/java/org/docx4j/dml/diagram/STConnectorPoint.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STConnectorPoint.java
rename to src/main/java/org/docx4j/dml/diagram/STConnectorPoint.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STConnectorRouting.java b/src/main/java/org/docx4j/dml/diagram/STConnectorRouting.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STConnectorRouting.java
rename to src/main/java/org/docx4j/dml/diagram/STConnectorRouting.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STConstraintRelationship.java b/src/main/java/org/docx4j/dml/diagram/STConstraintRelationship.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STConstraintRelationship.java
rename to src/main/java/org/docx4j/dml/diagram/STConstraintRelationship.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STConstraintType.java b/src/main/java/org/docx4j/dml/diagram/STConstraintType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STConstraintType.java
rename to src/main/java/org/docx4j/dml/diagram/STConstraintType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STContinueDirection.java b/src/main/java/org/docx4j/dml/diagram/STContinueDirection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STContinueDirection.java
rename to src/main/java/org/docx4j/dml/diagram/STContinueDirection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STCxnType.java b/src/main/java/org/docx4j/dml/diagram/STCxnType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STCxnType.java
rename to src/main/java/org/docx4j/dml/diagram/STCxnType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STDirection.java b/src/main/java/org/docx4j/dml/diagram/STDirection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STDirection.java
rename to src/main/java/org/docx4j/dml/diagram/STDirection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STElementType.java b/src/main/java/org/docx4j/dml/diagram/STElementType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STElementType.java
rename to src/main/java/org/docx4j/dml/diagram/STElementType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STFlowDirection.java b/src/main/java/org/docx4j/dml/diagram/STFlowDirection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STFlowDirection.java
rename to src/main/java/org/docx4j/dml/diagram/STFlowDirection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STFunctionOperator.java b/src/main/java/org/docx4j/dml/diagram/STFunctionOperator.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STFunctionOperator.java
rename to src/main/java/org/docx4j/dml/diagram/STFunctionOperator.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STFunctionType.java b/src/main/java/org/docx4j/dml/diagram/STFunctionType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STFunctionType.java
rename to src/main/java/org/docx4j/dml/diagram/STFunctionType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STGrowDirection.java b/src/main/java/org/docx4j/dml/diagram/STGrowDirection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STGrowDirection.java
rename to src/main/java/org/docx4j/dml/diagram/STGrowDirection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STHierBranchStyle.java b/src/main/java/org/docx4j/dml/diagram/STHierBranchStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STHierBranchStyle.java
rename to src/main/java/org/docx4j/dml/diagram/STHierBranchStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STHierarchyAlignment.java b/src/main/java/org/docx4j/dml/diagram/STHierarchyAlignment.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STHierarchyAlignment.java
rename to src/main/java/org/docx4j/dml/diagram/STHierarchyAlignment.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STHorizontalAlignment.java b/src/main/java/org/docx4j/dml/diagram/STHorizontalAlignment.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STHorizontalAlignment.java
rename to src/main/java/org/docx4j/dml/diagram/STHorizontalAlignment.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STHueDir.java b/src/main/java/org/docx4j/dml/diagram/STHueDir.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STHueDir.java
rename to src/main/java/org/docx4j/dml/diagram/STHueDir.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STLinearDirection.java b/src/main/java/org/docx4j/dml/diagram/STLinearDirection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STLinearDirection.java
rename to src/main/java/org/docx4j/dml/diagram/STLinearDirection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STNodeHorizontalAlignment.java b/src/main/java/org/docx4j/dml/diagram/STNodeHorizontalAlignment.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STNodeHorizontalAlignment.java
rename to src/main/java/org/docx4j/dml/diagram/STNodeHorizontalAlignment.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STNodeVerticalAlignment.java b/src/main/java/org/docx4j/dml/diagram/STNodeVerticalAlignment.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STNodeVerticalAlignment.java
rename to src/main/java/org/docx4j/dml/diagram/STNodeVerticalAlignment.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STOffset.java b/src/main/java/org/docx4j/dml/diagram/STOffset.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STOffset.java
rename to src/main/java/org/docx4j/dml/diagram/STOffset.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STOutputShapeType.java b/src/main/java/org/docx4j/dml/diagram/STOutputShapeType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STOutputShapeType.java
rename to src/main/java/org/docx4j/dml/diagram/STOutputShapeType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STParameterId.java b/src/main/java/org/docx4j/dml/diagram/STParameterId.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STParameterId.java
rename to src/main/java/org/docx4j/dml/diagram/STParameterId.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STPtType.java b/src/main/java/org/docx4j/dml/diagram/STPtType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STPtType.java
rename to src/main/java/org/docx4j/dml/diagram/STPtType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STPyramidAccentPosition.java b/src/main/java/org/docx4j/dml/diagram/STPyramidAccentPosition.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STPyramidAccentPosition.java
rename to src/main/java/org/docx4j/dml/diagram/STPyramidAccentPosition.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STPyramidAccentTextMargin.java b/src/main/java/org/docx4j/dml/diagram/STPyramidAccentTextMargin.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STPyramidAccentTextMargin.java
rename to src/main/java/org/docx4j/dml/diagram/STPyramidAccentTextMargin.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STResizeHandlesStr.java b/src/main/java/org/docx4j/dml/diagram/STResizeHandlesStr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STResizeHandlesStr.java
rename to src/main/java/org/docx4j/dml/diagram/STResizeHandlesStr.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STRotationPath.java b/src/main/java/org/docx4j/dml/diagram/STRotationPath.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STRotationPath.java
rename to src/main/java/org/docx4j/dml/diagram/STRotationPath.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STSecondaryChildAlignment.java b/src/main/java/org/docx4j/dml/diagram/STSecondaryChildAlignment.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STSecondaryChildAlignment.java
rename to src/main/java/org/docx4j/dml/diagram/STSecondaryChildAlignment.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STSecondaryLinearDirection.java b/src/main/java/org/docx4j/dml/diagram/STSecondaryLinearDirection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STSecondaryLinearDirection.java
rename to src/main/java/org/docx4j/dml/diagram/STSecondaryLinearDirection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STStartingElement.java b/src/main/java/org/docx4j/dml/diagram/STStartingElement.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STStartingElement.java
rename to src/main/java/org/docx4j/dml/diagram/STStartingElement.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STTextAlignment.java b/src/main/java/org/docx4j/dml/diagram/STTextAlignment.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STTextAlignment.java
rename to src/main/java/org/docx4j/dml/diagram/STTextAlignment.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STTextAnchorHorizontal.java b/src/main/java/org/docx4j/dml/diagram/STTextAnchorHorizontal.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STTextAnchorHorizontal.java
rename to src/main/java/org/docx4j/dml/diagram/STTextAnchorHorizontal.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STTextAnchorVertical.java b/src/main/java/org/docx4j/dml/diagram/STTextAnchorVertical.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STTextAnchorVertical.java
rename to src/main/java/org/docx4j/dml/diagram/STTextAnchorVertical.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STTextBlockDirection.java b/src/main/java/org/docx4j/dml/diagram/STTextBlockDirection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STTextBlockDirection.java
rename to src/main/java/org/docx4j/dml/diagram/STTextBlockDirection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STTextDirection.java b/src/main/java/org/docx4j/dml/diagram/STTextDirection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STTextDirection.java
rename to src/main/java/org/docx4j/dml/diagram/STTextDirection.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STVariableType.java b/src/main/java/org/docx4j/dml/diagram/STVariableType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STVariableType.java
rename to src/main/java/org/docx4j/dml/diagram/STVariableType.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/STVerticalAlignment.java b/src/main/java/org/docx4j/dml/diagram/STVerticalAlignment.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/STVerticalAlignment.java
rename to src/main/java/org/docx4j/dml/diagram/STVerticalAlignment.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram/package-info.java b/src/main/java/org/docx4j/dml/diagram/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram/package-info.java
rename to src/main/java/org/docx4j/dml/diagram/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram2008/CTDataModelExtBlock.java b/src/main/java/org/docx4j/dml/diagram2008/CTDataModelExtBlock.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram2008/CTDataModelExtBlock.java
rename to src/main/java/org/docx4j/dml/diagram2008/CTDataModelExtBlock.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram2008/CTDrawing.java b/src/main/java/org/docx4j/dml/diagram2008/CTDrawing.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram2008/CTDrawing.java
rename to src/main/java/org/docx4j/dml/diagram2008/CTDrawing.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram2008/CTGroupShape.java b/src/main/java/org/docx4j/dml/diagram2008/CTGroupShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram2008/CTGroupShape.java
rename to src/main/java/org/docx4j/dml/diagram2008/CTGroupShape.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram2008/CTGroupShapeNonVisual.java b/src/main/java/org/docx4j/dml/diagram2008/CTGroupShapeNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram2008/CTGroupShapeNonVisual.java
rename to src/main/java/org/docx4j/dml/diagram2008/CTGroupShapeNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram2008/CTShape.java b/src/main/java/org/docx4j/dml/diagram2008/CTShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram2008/CTShape.java
rename to src/main/java/org/docx4j/dml/diagram2008/CTShape.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram2008/CTShapeNonVisual.java b/src/main/java/org/docx4j/dml/diagram2008/CTShapeNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram2008/CTShapeNonVisual.java
rename to src/main/java/org/docx4j/dml/diagram2008/CTShapeNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram2008/ObjectFactory.java b/src/main/java/org/docx4j/dml/diagram2008/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram2008/ObjectFactory.java
rename to src/main/java/org/docx4j/dml/diagram2008/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/diagram2008/package-info.java b/src/main/java/org/docx4j/dml/diagram2008/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/diagram2008/package-info.java
rename to src/main/java/org/docx4j/dml/diagram2008/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/lockedCanvas/ObjectFactory.java b/src/main/java/org/docx4j/dml/lockedCanvas/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/lockedCanvas/ObjectFactory.java
rename to src/main/java/org/docx4j/dml/lockedCanvas/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/package-info.java b/src/main/java/org/docx4j/dml/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/package-info.java
rename to src/main/java/org/docx4j/dml/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/picture/CTPictureNonVisual.java b/src/main/java/org/docx4j/dml/picture/CTPictureNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/picture/CTPictureNonVisual.java
rename to src/main/java/org/docx4j/dml/picture/CTPictureNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/picture/ObjectFactory.java b/src/main/java/org/docx4j/dml/picture/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/picture/ObjectFactory.java
rename to src/main/java/org/docx4j/dml/picture/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/picture/Pic.java b/src/main/java/org/docx4j/dml/picture/Pic.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/picture/Pic.java
rename to src/main/java/org/docx4j/dml/picture/Pic.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/picture/package-info.java b/src/main/java/org/docx4j/dml/picture/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/picture/package-info.java
rename to src/main/java/org/docx4j/dml/picture/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/script b/src/main/java/org/docx4j/dml/script
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/script
rename to src/main/java/org/docx4j/dml/script
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTAbsoluteAnchor.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTAbsoluteAnchor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTAbsoluteAnchor.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTAbsoluteAnchor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTAnchorClientData.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTAnchorClientData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTAnchorClientData.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTAnchorClientData.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTConnector.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTConnector.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTConnector.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTConnector.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTConnectorNonVisual.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTConnectorNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTConnectorNonVisual.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTConnectorNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTDrawing.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTDrawing.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTDrawing.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTDrawing.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGraphicalObjectFrame.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGraphicalObjectFrame.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGraphicalObjectFrame.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGraphicalObjectFrame.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGraphicalObjectFrameNonVisual.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGraphicalObjectFrameNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGraphicalObjectFrameNonVisual.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGraphicalObjectFrameNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGroupShape.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGroupShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGroupShape.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGroupShape.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGroupShapeNonVisual.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGroupShapeNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGroupShapeNonVisual.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTGroupShapeNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTMarker.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTMarker.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTMarker.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTMarker.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTOneCellAnchor.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTOneCellAnchor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTOneCellAnchor.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTOneCellAnchor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTPicture.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTPicture.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTPicture.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTPicture.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTPictureNonVisual.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTPictureNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTPictureNonVisual.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTPictureNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTShape.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTShape.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTShape.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTShapeNonVisual.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTShapeNonVisual.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTShapeNonVisual.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTShapeNonVisual.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTTwoCellAnchor.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTTwoCellAnchor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/CTTwoCellAnchor.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/CTTwoCellAnchor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/ObjectFactory.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/ObjectFactory.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/STEditAs.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/STEditAs.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/STEditAs.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/STEditAs.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/package-info.java b/src/main/java/org/docx4j/dml/spreadsheetdrawing/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/spreadsheetdrawing/package-info.java
rename to src/main/java/org/docx4j/dml/spreadsheetdrawing/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/Anchor.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/Anchor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/Anchor.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/Anchor.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTEffectExtent.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTEffectExtent.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTEffectExtent.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/CTEffectExtent.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTPosH.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTPosH.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTPosH.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/CTPosH.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTPosV.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTPosV.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTPosV.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/CTPosV.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapNone.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapNone.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapNone.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapNone.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapPath.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapPath.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapPath.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapPath.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapSquare.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapSquare.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapSquare.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapSquare.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapThrough.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapThrough.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapThrough.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapThrough.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapTight.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapTight.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapTight.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapTight.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapTopBottom.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapTopBottom.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapTopBottom.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/CTWrapTopBottom.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/Inline.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/Inline.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/Inline.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/Inline.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/ObjectFactory.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/ObjectFactory.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/STAlignH.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/STAlignH.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/STAlignH.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/STAlignH.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/STAlignV.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/STAlignV.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/STAlignV.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/STAlignV.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/STRelFromH.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/STRelFromH.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/STRelFromH.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/STRelFromH.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/STRelFromV.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/STRelFromV.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/STRelFromV.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/STRelFromV.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/STWrapText.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/STWrapText.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/STWrapText.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/STWrapText.java
diff --git a/docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/package-info.java b/src/main/java/org/docx4j/dml/wordprocessingDrawing/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/dml/wordprocessingDrawing/package-info.java
rename to src/main/java/org/docx4j/dml/wordprocessingDrawing/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/CoreProperties.java b/src/main/java/org/docx4j/docProps/core/CoreProperties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/CoreProperties.java
rename to src/main/java/org/docx4j/docProps/core/CoreProperties.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/ObjectFactory.java b/src/main/java/org/docx4j/docProps/core/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/ObjectFactory.java
rename to src/main/java/org/docx4j/docProps/core/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/elements/ElementContainer.java b/src/main/java/org/docx4j/docProps/core/dc/elements/ElementContainer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/elements/ElementContainer.java
rename to src/main/java/org/docx4j/docProps/core/dc/elements/ElementContainer.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/elements/ObjectFactory.java b/src/main/java/org/docx4j/docProps/core/dc/elements/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/elements/ObjectFactory.java
rename to src/main/java/org/docx4j/docProps/core/dc/elements/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/elements/SimpleLiteral.java b/src/main/java/org/docx4j/docProps/core/dc/elements/SimpleLiteral.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/elements/SimpleLiteral.java
rename to src/main/java/org/docx4j/docProps/core/dc/elements/SimpleLiteral.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/elements/package-info.java b/src/main/java/org/docx4j/docProps/core/dc/elements/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/elements/package-info.java
rename to src/main/java/org/docx4j/docProps/core/dc/elements/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/Box.java b/src/main/java/org/docx4j/docProps/core/dc/terms/Box.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/Box.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/Box.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/DCMIType.java b/src/main/java/org/docx4j/docProps/core/dc/terms/DCMIType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/DCMIType.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/DCMIType.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/DDC.java b/src/main/java/org/docx4j/docProps/core/dc/terms/DDC.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/DDC.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/DDC.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/ElementOrRefinementContainer.java b/src/main/java/org/docx4j/docProps/core/dc/terms/ElementOrRefinementContainer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/ElementOrRefinementContainer.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/ElementOrRefinementContainer.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/IMT.java b/src/main/java/org/docx4j/docProps/core/dc/terms/IMT.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/IMT.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/IMT.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/ISO3166.java b/src/main/java/org/docx4j/docProps/core/dc/terms/ISO3166.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/ISO3166.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/ISO3166.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/ISO6392.java b/src/main/java/org/docx4j/docProps/core/dc/terms/ISO6392.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/ISO6392.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/ISO6392.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/LCC.java b/src/main/java/org/docx4j/docProps/core/dc/terms/LCC.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/LCC.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/LCC.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/LCSH.java b/src/main/java/org/docx4j/docProps/core/dc/terms/LCSH.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/LCSH.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/LCSH.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/MESH.java b/src/main/java/org/docx4j/docProps/core/dc/terms/MESH.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/MESH.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/MESH.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/ObjectFactory.java b/src/main/java/org/docx4j/docProps/core/dc/terms/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/ObjectFactory.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/Period.java b/src/main/java/org/docx4j/docProps/core/dc/terms/Period.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/Period.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/Period.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/Point.java b/src/main/java/org/docx4j/docProps/core/dc/terms/Point.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/Point.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/Point.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/RFC1766.java b/src/main/java/org/docx4j/docProps/core/dc/terms/RFC1766.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/RFC1766.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/RFC1766.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/RFC3066.java b/src/main/java/org/docx4j/docProps/core/dc/terms/RFC3066.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/RFC3066.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/RFC3066.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/TGN.java b/src/main/java/org/docx4j/docProps/core/dc/terms/TGN.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/TGN.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/TGN.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/UDC.java b/src/main/java/org/docx4j/docProps/core/dc/terms/UDC.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/UDC.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/UDC.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/URI.java b/src/main/java/org/docx4j/docProps/core/dc/terms/URI.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/URI.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/URI.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/W3CDTF.java b/src/main/java/org/docx4j/docProps/core/dc/terms/W3CDTF.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/W3CDTF.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/W3CDTF.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/package-info.java b/src/main/java/org/docx4j/docProps/core/dc/terms/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/dc/terms/package-info.java
rename to src/main/java/org/docx4j/docProps/core/dc/terms/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/core/package-info.java b/src/main/java/org/docx4j/docProps/core/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/core/package-info.java
rename to src/main/java/org/docx4j/docProps/core/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/custom/ObjectFactory.java b/src/main/java/org/docx4j/docProps/custom/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/custom/ObjectFactory.java
rename to src/main/java/org/docx4j/docProps/custom/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/custom/Properties.java b/src/main/java/org/docx4j/docProps/custom/Properties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/custom/Properties.java
rename to src/main/java/org/docx4j/docProps/custom/Properties.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/custom/package-info.java b/src/main/java/org/docx4j/docProps/custom/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/custom/package-info.java
rename to src/main/java/org/docx4j/docProps/custom/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/extended/ObjectFactory.java b/src/main/java/org/docx4j/docProps/extended/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/extended/ObjectFactory.java
rename to src/main/java/org/docx4j/docProps/extended/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/extended/Properties.java b/src/main/java/org/docx4j/docProps/extended/Properties.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/extended/Properties.java
rename to src/main/java/org/docx4j/docProps/extended/Properties.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/extended/package-info.java b/src/main/java/org/docx4j/docProps/extended/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/extended/package-info.java
rename to src/main/java/org/docx4j/docProps/extended/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/variantTypes/Array.java b/src/main/java/org/docx4j/docProps/variantTypes/Array.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/variantTypes/Array.java
rename to src/main/java/org/docx4j/docProps/variantTypes/Array.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/variantTypes/Cf.java b/src/main/java/org/docx4j/docProps/variantTypes/Cf.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/variantTypes/Cf.java
rename to src/main/java/org/docx4j/docProps/variantTypes/Cf.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/variantTypes/Empty.java b/src/main/java/org/docx4j/docProps/variantTypes/Empty.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/variantTypes/Empty.java
rename to src/main/java/org/docx4j/docProps/variantTypes/Empty.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/variantTypes/Null.java b/src/main/java/org/docx4j/docProps/variantTypes/Null.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/variantTypes/Null.java
rename to src/main/java/org/docx4j/docProps/variantTypes/Null.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/variantTypes/ObjectFactory.java b/src/main/java/org/docx4j/docProps/variantTypes/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/variantTypes/ObjectFactory.java
rename to src/main/java/org/docx4j/docProps/variantTypes/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/variantTypes/Variant.java b/src/main/java/org/docx4j/docProps/variantTypes/Variant.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/variantTypes/Variant.java
rename to src/main/java/org/docx4j/docProps/variantTypes/Variant.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/variantTypes/Vector.java b/src/main/java/org/docx4j/docProps/variantTypes/Vector.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/variantTypes/Vector.java
rename to src/main/java/org/docx4j/docProps/variantTypes/Vector.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/variantTypes/Vstream.java b/src/main/java/org/docx4j/docProps/variantTypes/Vstream.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/variantTypes/Vstream.java
rename to src/main/java/org/docx4j/docProps/variantTypes/Vstream.java
diff --git a/docx4j/src/main/java/org/docx4j/docProps/variantTypes/package-info.java b/src/main/java/org/docx4j/docProps/variantTypes/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/docProps/variantTypes/package-info.java
rename to src/main/java/org/docx4j/docProps/variantTypes/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/document/wordprocessingml/Constants.java b/src/main/java/org/docx4j/document/wordprocessingml/Constants.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/document/wordprocessingml/Constants.java
rename to src/main/java/org/docx4j/document/wordprocessingml/Constants.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/BestMatchingMapper.java b/src/main/java/org/docx4j/fonts/BestMatchingMapper.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/BestMatchingMapper.java
rename to src/main/java/org/docx4j/fonts/BestMatchingMapper.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/FontUtils.java b/src/main/java/org/docx4j/fonts/FontUtils.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/FontUtils.java
rename to src/main/java/org/docx4j/fonts/FontUtils.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/IdentityPlusMapper.java b/src/main/java/org/docx4j/fonts/IdentityPlusMapper.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/IdentityPlusMapper.java
rename to src/main/java/org/docx4j/fonts/IdentityPlusMapper.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/Mapper.java b/src/main/java/org/docx4j/fonts/Mapper.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/Mapper.java
rename to src/main/java/org/docx4j/fonts/Mapper.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/PhysicalFont.java b/src/main/java/org/docx4j/fonts/PhysicalFont.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/PhysicalFont.java
rename to src/main/java/org/docx4j/fonts/PhysicalFont.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/PhysicalFonts.java b/src/main/java/org/docx4j/fonts/PhysicalFonts.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/PhysicalFonts.java
rename to src/main/java/org/docx4j/fonts/PhysicalFonts.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/README.txt b/src/main/java/org/docx4j/fonts/fop/README.txt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/README.txt
rename to src/main/java/org/docx4j/fonts/fop/README.txt
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/Version.java b/src/main/java/org/docx4j/fonts/fop/Version.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/Version.java
rename to src/main/java/org/docx4j/fonts/fop/Version.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/apps/FOPException.java b/src/main/java/org/docx4j/fonts/fop/apps/FOPException.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/apps/FOPException.java
rename to src/main/java/org/docx4j/fonts/fop/apps/FOPException.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/AbstractCodePointMapping.java b/src/main/java/org/docx4j/fonts/fop/fonts/AbstractCodePointMapping.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/AbstractCodePointMapping.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/AbstractCodePointMapping.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/BFEntry.java b/src/main/java/org/docx4j/fonts/fop/fonts/BFEntry.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/BFEntry.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/BFEntry.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/Base14Font.java b/src/main/java/org/docx4j/fonts/fop/fonts/Base14Font.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/Base14Font.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/Base14Font.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/CIDFont.java b/src/main/java/org/docx4j/fonts/fop/fonts/CIDFont.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/CIDFont.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/CIDFont.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/CIDFontType.java b/src/main/java/org/docx4j/fonts/fop/fonts/CIDFontType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/CIDFontType.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/CIDFontType.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/CIDSubset.java b/src/main/java/org/docx4j/fonts/fop/fonts/CIDSubset.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/CIDSubset.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/CIDSubset.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/CodePointMapping.java b/src/main/java/org/docx4j/fonts/fop/fonts/CodePointMapping.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/CodePointMapping.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/CodePointMapping.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/CustomFont.java b/src/main/java/org/docx4j/fonts/fop/fonts/CustomFont.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/CustomFont.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/CustomFont.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/CustomFontCollection.java b/src/main/java/org/docx4j/fonts/fop/fonts/CustomFontCollection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/CustomFontCollection.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/CustomFontCollection.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/EmbedFontInfo.java b/src/main/java/org/docx4j/fonts/fop/fonts/EmbedFontInfo.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/EmbedFontInfo.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/EmbedFontInfo.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/EncodingMode.java b/src/main/java/org/docx4j/fonts/fop/fonts/EncodingMode.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/EncodingMode.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/EncodingMode.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/Enum.java b/src/main/java/org/docx4j/fonts/fop/fonts/Enum.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/Enum.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/Enum.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/Font.java b/src/main/java/org/docx4j/fonts/fop/fonts/Font.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/Font.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/Font.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontCache.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontCache.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontCache.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontCache.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontCollection.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontCollection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontCollection.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontCollection.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontDescriptor.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontDescriptor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontDescriptor.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontDescriptor.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontEventListener.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontEventListener.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontEventListener.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontEventListener.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontInfo.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontInfo.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontInfo.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontInfo.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontLoader.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontLoader.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontLoader.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontLoader.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontManager.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontManager.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontManager.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontManager.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontManagerConfigurator.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontManagerConfigurator.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontManagerConfigurator.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontManagerConfigurator.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontMetrics.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontMetrics.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontMetrics.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontMetrics.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontReader.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontReader.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontReader.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontReader.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontResolver.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontResolver.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontResolver.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontResolver.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontSetup.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontSetup.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontSetup.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontSetup.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontTriplet.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontTriplet.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontTriplet.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontTriplet.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontType.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontType.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontType.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontUtil.java b/src/main/java/org/docx4j/fonts/fop/fonts/FontUtil.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/FontUtil.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/FontUtil.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/Glyphs.java b/src/main/java/org/docx4j/fonts/fop/fonts/Glyphs.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/Glyphs.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/Glyphs.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/LazyFont.java b/src/main/java/org/docx4j/fonts/fop/fonts/LazyFont.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/LazyFont.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/LazyFont.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/MultiByteFont.java b/src/main/java/org/docx4j/fonts/fop/fonts/MultiByteFont.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/MultiByteFont.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/MultiByteFont.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/MutableFont.java b/src/main/java/org/docx4j/fonts/fop/fonts/MutableFont.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/MutableFont.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/MutableFont.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/NamedCharacter.java b/src/main/java/org/docx4j/fonts/fop/fonts/NamedCharacter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/NamedCharacter.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/NamedCharacter.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/SimpleSingleByteEncoding.java b/src/main/java/org/docx4j/fonts/fop/fonts/SimpleSingleByteEncoding.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/SimpleSingleByteEncoding.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/SimpleSingleByteEncoding.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/SingleByteEncoding.java b/src/main/java/org/docx4j/fonts/fop/fonts/SingleByteEncoding.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/SingleByteEncoding.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/SingleByteEncoding.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/SingleByteFont.java b/src/main/java/org/docx4j/fonts/fop/fonts/SingleByteFont.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/SingleByteFont.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/SingleByteFont.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/Typeface.java b/src/main/java/org/docx4j/fonts/fop/fonts/Typeface.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/Typeface.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/Typeface.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/ValuedEnum.java b/src/main/java/org/docx4j/fonts/fop/fonts/ValuedEnum.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/ValuedEnum.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/ValuedEnum.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/apps/AbstractFontReader.java b/src/main/java/org/docx4j/fonts/fop/fonts/apps/AbstractFontReader.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/apps/AbstractFontReader.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/apps/AbstractFontReader.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/apps/TTFReader.java b/src/main/java/org/docx4j/fonts/fop/fonts/apps/TTFReader.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/apps/TTFReader.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/apps/TTFReader.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/apps/package.html b/src/main/java/org/docx4j/fonts/fop/fonts/apps/package.html
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/apps/package.html
rename to src/main/java/org/docx4j/fonts/fop/fonts/apps/package.html
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/FontFileFinder.java b/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/FontFileFinder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/FontFileFinder.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/autodetect/FontFileFinder.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/FontFinder.java b/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/FontFinder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/FontFinder.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/autodetect/FontFinder.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/FontInfoFinder.java b/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/FontInfoFinder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/FontInfoFinder.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/autodetect/FontInfoFinder.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/MacFontDirFinder.java b/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/MacFontDirFinder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/MacFontDirFinder.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/autodetect/MacFontDirFinder.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/NativeFontDirFinder.java b/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/NativeFontDirFinder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/NativeFontDirFinder.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/autodetect/NativeFontDirFinder.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/UnixFontDirFinder.java b/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/UnixFontDirFinder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/UnixFontDirFinder.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/autodetect/UnixFontDirFinder.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/WindowsFontDirFinder.java b/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/WindowsFontDirFinder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/WindowsFontDirFinder.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/autodetect/WindowsFontDirFinder.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/package.html b/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/package.html
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/autodetect/package.html
rename to src/main/java/org/docx4j/fonts/fop/fonts/autodetect/package.html
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/Base14FontCollection.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/Base14FontCollection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/Base14FontCollection.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/Base14FontCollection.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/Courier.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/Courier.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/Courier.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/Courier.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/CourierBold.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/CourierBold.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/CourierBold.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/CourierBold.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/CourierBoldOblique.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/CourierBoldOblique.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/CourierBoldOblique.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/CourierBoldOblique.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/CourierOblique.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/CourierOblique.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/CourierOblique.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/CourierOblique.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/Helvetica.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/Helvetica.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/Helvetica.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/Helvetica.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/HelveticaBold.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/HelveticaBold.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/HelveticaBold.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/HelveticaBold.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/HelveticaBoldOblique.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/HelveticaBoldOblique.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/HelveticaBoldOblique.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/HelveticaBoldOblique.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/HelveticaOblique.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/HelveticaOblique.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/HelveticaOblique.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/HelveticaOblique.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/Symbol.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/Symbol.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/Symbol.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/Symbol.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesBold.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesBold.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesBold.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesBold.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesBoldItalic.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesBoldItalic.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesBoldItalic.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesBoldItalic.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesItalic.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesItalic.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesItalic.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesItalic.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesRoman.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesRoman.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesRoman.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/TimesRoman.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/ZapfDingbats.java b/src/main/java/org/docx4j/fonts/fop/fonts/base14/ZapfDingbats.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/ZapfDingbats.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/ZapfDingbats.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/package.html b/src/main/java/org/docx4j/fonts/fop/fonts/base14/package.html
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/base14/package.html
rename to src/main/java/org/docx4j/fonts/fop/fonts/base14/package.html
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/package.html b/src/main/java/org/docx4j/fonts/fop/fonts/package.html
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/package.html
rename to src/main/java/org/docx4j/fonts/fop/fonts/package.html
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/AttributeValue.java b/src/main/java/org/docx4j/fonts/fop/fonts/substitute/AttributeValue.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/AttributeValue.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/substitute/AttributeValue.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontQualifier.java b/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontQualifier.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontQualifier.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontQualifier.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontSubstitution.java b/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontSubstitution.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontSubstitution.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontSubstitution.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontSubstitutions.java b/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontSubstitutions.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontSubstitutions.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontSubstitutions.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontSubstitutionsConfigurator.java b/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontSubstitutionsConfigurator.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontSubstitutionsConfigurator.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontSubstitutionsConfigurator.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontWeightRange.java b/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontWeightRange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontWeightRange.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/substitute/FontWeightRange.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/package.html b/src/main/java/org/docx4j/fonts/fop/fonts/substitute/package.html
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/substitute/package.html
rename to src/main/java/org/docx4j/fonts/fop/fonts/substitute/package.html
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/FontFileReader.java b/src/main/java/org/docx4j/fonts/fop/fonts/truetype/FontFileReader.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/FontFileReader.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/truetype/FontFileReader.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFCmapEntry.java b/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFCmapEntry.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFCmapEntry.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFCmapEntry.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFDirTabEntry.java b/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFDirTabEntry.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFDirTabEntry.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFDirTabEntry.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFFile.java b/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFFile.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFFile.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFFile.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFFontLoader.java b/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFFontLoader.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFFontLoader.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFFontLoader.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFMtxEntry.java b/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFMtxEntry.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFMtxEntry.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFMtxEntry.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFSubSetFile.java b/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFSubSetFile.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFSubSetFile.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/truetype/TTFSubSetFile.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/package.html b/src/main/java/org/docx4j/fonts/fop/fonts/truetype/package.html
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/truetype/package.html
rename to src/main/java/org/docx4j/fonts/fop/fonts/truetype/package.html
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMCharMetrics.java b/src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMCharMetrics.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMCharMetrics.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMCharMetrics.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMFile.java b/src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMFile.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMFile.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMFile.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMParser.java b/src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMParser.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMParser.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMParser.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMWritingDirectionMetrics.java b/src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMWritingDirectionMetrics.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMWritingDirectionMetrics.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/type1/AFMWritingDirectionMetrics.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/PFBData.java b/src/main/java/org/docx4j/fonts/fop/fonts/type1/PFBData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/PFBData.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/type1/PFBData.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/PFBParser.java b/src/main/java/org/docx4j/fonts/fop/fonts/type1/PFBParser.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/PFBParser.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/type1/PFBParser.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/PFMFile.java b/src/main/java/org/docx4j/fonts/fop/fonts/type1/PFMFile.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/PFMFile.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/type1/PFMFile.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/PFMInputStream.java b/src/main/java/org/docx4j/fonts/fop/fonts/type1/PFMInputStream.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/PFMInputStream.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/type1/PFMInputStream.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/Type1FontLoader.java b/src/main/java/org/docx4j/fonts/fop/fonts/type1/Type1FontLoader.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/Type1FontLoader.java
rename to src/main/java/org/docx4j/fonts/fop/fonts/type1/Type1FontLoader.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/package.html b/src/main/java/org/docx4j/fonts/fop/fonts/type1/package.html
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/fonts/type1/package.html
rename to src/main/java/org/docx4j/fonts/fop/fonts/type1/package.html
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/util/CharUtilities.java b/src/main/java/org/docx4j/fonts/fop/util/CharUtilities.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/util/CharUtilities.java
rename to src/main/java/org/docx4j/fonts/fop/util/CharUtilities.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/util/CommandLineLogger.java b/src/main/java/org/docx4j/fonts/fop/util/CommandLineLogger.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/util/CommandLineLogger.java
rename to src/main/java/org/docx4j/fonts/fop/util/CommandLineLogger.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/fop/util/LogUtil.java b/src/main/java/org/docx4j/fonts/fop/util/LogUtil.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/fop/util/LogUtil.java
rename to src/main/java/org/docx4j/fonts/fop/util/LogUtil.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/foray/font/format/Panose.java b/src/main/java/org/docx4j/fonts/foray/font/format/Panose.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/foray/font/format/Panose.java
rename to src/main/java/org/docx4j/fonts/foray/font/format/Panose.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/microsoft/MicrosoftFonts.java b/src/main/java/org/docx4j/fonts/microsoft/MicrosoftFonts.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/microsoft/MicrosoftFonts.java
rename to src/main/java/org/docx4j/fonts/microsoft/MicrosoftFonts.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/microsoft/MicrosoftFonts.xml b/src/main/java/org/docx4j/fonts/microsoft/MicrosoftFonts.xml
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/microsoft/MicrosoftFonts.xml
rename to src/main/java/org/docx4j/fonts/microsoft/MicrosoftFonts.xml
diff --git a/docx4j/src/main/java/org/docx4j/fonts/microsoft/MicrosoftFonts.xsd b/src/main/java/org/docx4j/fonts/microsoft/MicrosoftFonts.xsd
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/microsoft/MicrosoftFonts.xsd
rename to src/main/java/org/docx4j/fonts/microsoft/MicrosoftFonts.xsd
diff --git a/docx4j/src/main/java/org/docx4j/fonts/microsoft/MicrosoftFontsRegistry.java b/src/main/java/org/docx4j/fonts/microsoft/MicrosoftFontsRegistry.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/microsoft/MicrosoftFontsRegistry.java
rename to src/main/java/org/docx4j/fonts/microsoft/MicrosoftFontsRegistry.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/microsoft/ObjectFactory.java b/src/main/java/org/docx4j/fonts/microsoft/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/microsoft/ObjectFactory.java
rename to src/main/java/org/docx4j/fonts/microsoft/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/substitutions/FontSubstitutions.java b/src/main/java/org/docx4j/fonts/substitutions/FontSubstitutions.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/substitutions/FontSubstitutions.java
rename to src/main/java/org/docx4j/fonts/substitutions/FontSubstitutions.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/substitutions/FontSubstitutions.xml b/src/main/java/org/docx4j/fonts/substitutions/FontSubstitutions.xml
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/substitutions/FontSubstitutions.xml
rename to src/main/java/org/docx4j/fonts/substitutions/FontSubstitutions.xml
diff --git a/docx4j/src/main/java/org/docx4j/fonts/substitutions/FontSubstitutions.xsd b/src/main/java/org/docx4j/fonts/substitutions/FontSubstitutions.xsd
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/substitutions/FontSubstitutions.xsd
rename to src/main/java/org/docx4j/fonts/substitutions/FontSubstitutions.xsd
diff --git a/docx4j/src/main/java/org/docx4j/fonts/substitutions/ObjectFactory.java b/src/main/java/org/docx4j/fonts/substitutions/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/substitutions/ObjectFactory.java
rename to src/main/java/org/docx4j/fonts/substitutions/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/fonts/substitutions/VCL.xcu b/src/main/java/org/docx4j/fonts/substitutions/VCL.xcu
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/substitutions/VCL.xcu
rename to src/main/java/org/docx4j/fonts/substitutions/VCL.xcu
diff --git a/docx4j/src/main/java/org/docx4j/fonts/substitutions/VCL2Friendly.xslt b/src/main/java/org/docx4j/fonts/substitutions/VCL2Friendly.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/fonts/substitutions/VCL2Friendly.xslt
rename to src/main/java/org/docx4j/fonts/substitutions/VCL2Friendly.xslt
diff --git a/docx4j/src/main/java/org/docx4j/jaxb/Context.java b/src/main/java/org/docx4j/jaxb/Context.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/jaxb/Context.java
rename to src/main/java/org/docx4j/jaxb/Context.java
diff --git a/docx4j/src/main/java/org/docx4j/jaxb/JaxbValidationEventHandler.java b/src/main/java/org/docx4j/jaxb/JaxbValidationEventHandler.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/jaxb/JaxbValidationEventHandler.java
rename to src/main/java/org/docx4j/jaxb/JaxbValidationEventHandler.java
diff --git a/docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMapper.java b/src/main/java/org/docx4j/jaxb/NamespacePrefixMapper.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMapper.java
rename to src/main/java/org/docx4j/jaxb/NamespacePrefixMapper.java
diff --git a/docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperRelationshipsPart.java b/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperRelationshipsPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperRelationshipsPart.java
rename to src/main/java/org/docx4j/jaxb/NamespacePrefixMapperRelationshipsPart.java
diff --git a/docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperRelationshipsPartSunInternal.java b/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperRelationshipsPartSunInternal.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperRelationshipsPartSunInternal.java
rename to src/main/java/org/docx4j/jaxb/NamespacePrefixMapperRelationshipsPartSunInternal.java
diff --git a/docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperSunInternal.java b/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperSunInternal.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperSunInternal.java
rename to src/main/java/org/docx4j/jaxb/NamespacePrefixMapperSunInternal.java
diff --git a/docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperUtils.java b/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperUtils.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperUtils.java
rename to src/main/java/org/docx4j/jaxb/NamespacePrefixMapperUtils.java
diff --git a/docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMappings.java b/src/main/java/org/docx4j/jaxb/NamespacePrefixMappings.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMappings.java
rename to src/main/java/org/docx4j/jaxb/NamespacePrefixMappings.java
diff --git a/docx4j/src/main/java/org/docx4j/jaxb/WmlSchema.java b/src/main/java/org/docx4j/jaxb/WmlSchema.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/jaxb/WmlSchema.java
rename to src/main/java/org/docx4j/jaxb/WmlSchema.java
diff --git a/docx4j/src/main/java/org/docx4j/jaxb/mc-preprocessor.xslt b/src/main/java/org/docx4j/jaxb/mc-preprocessor.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/jaxb/mc-preprocessor.xslt
rename to src/main/java/org/docx4j/jaxb/mc-preprocessor.xslt
diff --git a/docx4j/src/main/java/org/docx4j/math/CTAcc.java b/src/main/java/org/docx4j/math/CTAcc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTAcc.java
rename to src/main/java/org/docx4j/math/CTAcc.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTAccPr.java b/src/main/java/org/docx4j/math/CTAccPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTAccPr.java
rename to src/main/java/org/docx4j/math/CTAccPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTBar.java b/src/main/java/org/docx4j/math/CTBar.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTBar.java
rename to src/main/java/org/docx4j/math/CTBar.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTBarPr.java b/src/main/java/org/docx4j/math/CTBarPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTBarPr.java
rename to src/main/java/org/docx4j/math/CTBarPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTBorderBox.java b/src/main/java/org/docx4j/math/CTBorderBox.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTBorderBox.java
rename to src/main/java/org/docx4j/math/CTBorderBox.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTBorderBoxPr.java b/src/main/java/org/docx4j/math/CTBorderBoxPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTBorderBoxPr.java
rename to src/main/java/org/docx4j/math/CTBorderBoxPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTBox.java b/src/main/java/org/docx4j/math/CTBox.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTBox.java
rename to src/main/java/org/docx4j/math/CTBox.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTBoxPr.java b/src/main/java/org/docx4j/math/CTBoxPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTBoxPr.java
rename to src/main/java/org/docx4j/math/CTBoxPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTBreakBin.java b/src/main/java/org/docx4j/math/CTBreakBin.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTBreakBin.java
rename to src/main/java/org/docx4j/math/CTBreakBin.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTBreakBinSub.java b/src/main/java/org/docx4j/math/CTBreakBinSub.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTBreakBinSub.java
rename to src/main/java/org/docx4j/math/CTBreakBinSub.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTChar.java b/src/main/java/org/docx4j/math/CTChar.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTChar.java
rename to src/main/java/org/docx4j/math/CTChar.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTCtrlPr.java b/src/main/java/org/docx4j/math/CTCtrlPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTCtrlPr.java
rename to src/main/java/org/docx4j/math/CTCtrlPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTD.java b/src/main/java/org/docx4j/math/CTD.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTD.java
rename to src/main/java/org/docx4j/math/CTD.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTDPr.java b/src/main/java/org/docx4j/math/CTDPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTDPr.java
rename to src/main/java/org/docx4j/math/CTDPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTEqArr.java b/src/main/java/org/docx4j/math/CTEqArr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTEqArr.java
rename to src/main/java/org/docx4j/math/CTEqArr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTEqArrPr.java b/src/main/java/org/docx4j/math/CTEqArrPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTEqArrPr.java
rename to src/main/java/org/docx4j/math/CTEqArrPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTF.java b/src/main/java/org/docx4j/math/CTF.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTF.java
rename to src/main/java/org/docx4j/math/CTF.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTFPr.java b/src/main/java/org/docx4j/math/CTFPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTFPr.java
rename to src/main/java/org/docx4j/math/CTFPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTFType.java b/src/main/java/org/docx4j/math/CTFType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTFType.java
rename to src/main/java/org/docx4j/math/CTFType.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTFunc.java b/src/main/java/org/docx4j/math/CTFunc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTFunc.java
rename to src/main/java/org/docx4j/math/CTFunc.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTFuncPr.java b/src/main/java/org/docx4j/math/CTFuncPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTFuncPr.java
rename to src/main/java/org/docx4j/math/CTFuncPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTGroupChr.java b/src/main/java/org/docx4j/math/CTGroupChr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTGroupChr.java
rename to src/main/java/org/docx4j/math/CTGroupChr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTGroupChrPr.java b/src/main/java/org/docx4j/math/CTGroupChrPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTGroupChrPr.java
rename to src/main/java/org/docx4j/math/CTGroupChrPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTInteger2.java b/src/main/java/org/docx4j/math/CTInteger2.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTInteger2.java
rename to src/main/java/org/docx4j/math/CTInteger2.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTInteger255.java b/src/main/java/org/docx4j/math/CTInteger255.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTInteger255.java
rename to src/main/java/org/docx4j/math/CTInteger255.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTLimLoc.java b/src/main/java/org/docx4j/math/CTLimLoc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTLimLoc.java
rename to src/main/java/org/docx4j/math/CTLimLoc.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTLimLow.java b/src/main/java/org/docx4j/math/CTLimLow.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTLimLow.java
rename to src/main/java/org/docx4j/math/CTLimLow.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTLimLowPr.java b/src/main/java/org/docx4j/math/CTLimLowPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTLimLowPr.java
rename to src/main/java/org/docx4j/math/CTLimLowPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTLimUpp.java b/src/main/java/org/docx4j/math/CTLimUpp.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTLimUpp.java
rename to src/main/java/org/docx4j/math/CTLimUpp.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTLimUppPr.java b/src/main/java/org/docx4j/math/CTLimUppPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTLimUppPr.java
rename to src/main/java/org/docx4j/math/CTLimUppPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTM.java b/src/main/java/org/docx4j/math/CTM.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTM.java
rename to src/main/java/org/docx4j/math/CTM.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTMC.java b/src/main/java/org/docx4j/math/CTMC.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTMC.java
rename to src/main/java/org/docx4j/math/CTMC.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTMCPr.java b/src/main/java/org/docx4j/math/CTMCPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTMCPr.java
rename to src/main/java/org/docx4j/math/CTMCPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTMCS.java b/src/main/java/org/docx4j/math/CTMCS.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTMCS.java
rename to src/main/java/org/docx4j/math/CTMCS.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTMPr.java b/src/main/java/org/docx4j/math/CTMPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTMPr.java
rename to src/main/java/org/docx4j/math/CTMPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTMR.java b/src/main/java/org/docx4j/math/CTMR.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTMR.java
rename to src/main/java/org/docx4j/math/CTMR.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTManualBreak.java b/src/main/java/org/docx4j/math/CTManualBreak.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTManualBreak.java
rename to src/main/java/org/docx4j/math/CTManualBreak.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTMathPr.java b/src/main/java/org/docx4j/math/CTMathPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTMathPr.java
rename to src/main/java/org/docx4j/math/CTMathPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTNary.java b/src/main/java/org/docx4j/math/CTNary.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTNary.java
rename to src/main/java/org/docx4j/math/CTNary.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTNaryPr.java b/src/main/java/org/docx4j/math/CTNaryPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTNaryPr.java
rename to src/main/java/org/docx4j/math/CTNaryPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTOMath.java b/src/main/java/org/docx4j/math/CTOMath.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTOMath.java
rename to src/main/java/org/docx4j/math/CTOMath.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTOMathArg.java b/src/main/java/org/docx4j/math/CTOMathArg.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTOMathArg.java
rename to src/main/java/org/docx4j/math/CTOMathArg.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTOMathArgPr.java b/src/main/java/org/docx4j/math/CTOMathArgPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTOMathArgPr.java
rename to src/main/java/org/docx4j/math/CTOMathArgPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTOMathJc.java b/src/main/java/org/docx4j/math/CTOMathJc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTOMathJc.java
rename to src/main/java/org/docx4j/math/CTOMathJc.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTOMathPara.java b/src/main/java/org/docx4j/math/CTOMathPara.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTOMathPara.java
rename to src/main/java/org/docx4j/math/CTOMathPara.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTOMathParaPr.java b/src/main/java/org/docx4j/math/CTOMathParaPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTOMathParaPr.java
rename to src/main/java/org/docx4j/math/CTOMathParaPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTOnOff.java b/src/main/java/org/docx4j/math/CTOnOff.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTOnOff.java
rename to src/main/java/org/docx4j/math/CTOnOff.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTPhant.java b/src/main/java/org/docx4j/math/CTPhant.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTPhant.java
rename to src/main/java/org/docx4j/math/CTPhant.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTPhantPr.java b/src/main/java/org/docx4j/math/CTPhantPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTPhantPr.java
rename to src/main/java/org/docx4j/math/CTPhantPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTR.java b/src/main/java/org/docx4j/math/CTR.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTR.java
rename to src/main/java/org/docx4j/math/CTR.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTRPR.java b/src/main/java/org/docx4j/math/CTRPR.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTRPR.java
rename to src/main/java/org/docx4j/math/CTRPR.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTRad.java b/src/main/java/org/docx4j/math/CTRad.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTRad.java
rename to src/main/java/org/docx4j/math/CTRad.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTRadPr.java b/src/main/java/org/docx4j/math/CTRadPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTRadPr.java
rename to src/main/java/org/docx4j/math/CTRadPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTSPre.java b/src/main/java/org/docx4j/math/CTSPre.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTSPre.java
rename to src/main/java/org/docx4j/math/CTSPre.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTSPrePr.java b/src/main/java/org/docx4j/math/CTSPrePr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTSPrePr.java
rename to src/main/java/org/docx4j/math/CTSPrePr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTSSub.java b/src/main/java/org/docx4j/math/CTSSub.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTSSub.java
rename to src/main/java/org/docx4j/math/CTSSub.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTSSubPr.java b/src/main/java/org/docx4j/math/CTSSubPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTSSubPr.java
rename to src/main/java/org/docx4j/math/CTSSubPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTSSubSup.java b/src/main/java/org/docx4j/math/CTSSubSup.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTSSubSup.java
rename to src/main/java/org/docx4j/math/CTSSubSup.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTSSubSupPr.java b/src/main/java/org/docx4j/math/CTSSubSupPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTSSubSupPr.java
rename to src/main/java/org/docx4j/math/CTSSubSupPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTSSup.java b/src/main/java/org/docx4j/math/CTSSup.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTSSup.java
rename to src/main/java/org/docx4j/math/CTSSup.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTSSupPr.java b/src/main/java/org/docx4j/math/CTSSupPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTSSupPr.java
rename to src/main/java/org/docx4j/math/CTSSupPr.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTScript.java b/src/main/java/org/docx4j/math/CTScript.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTScript.java
rename to src/main/java/org/docx4j/math/CTScript.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTShp.java b/src/main/java/org/docx4j/math/CTShp.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTShp.java
rename to src/main/java/org/docx4j/math/CTShp.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTSpacingRule.java b/src/main/java/org/docx4j/math/CTSpacingRule.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTSpacingRule.java
rename to src/main/java/org/docx4j/math/CTSpacingRule.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTString.java b/src/main/java/org/docx4j/math/CTString.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTString.java
rename to src/main/java/org/docx4j/math/CTString.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTStyle.java b/src/main/java/org/docx4j/math/CTStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTStyle.java
rename to src/main/java/org/docx4j/math/CTStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTText.java b/src/main/java/org/docx4j/math/CTText.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTText.java
rename to src/main/java/org/docx4j/math/CTText.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTTopBot.java b/src/main/java/org/docx4j/math/CTTopBot.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTTopBot.java
rename to src/main/java/org/docx4j/math/CTTopBot.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTTwipsMeasure.java b/src/main/java/org/docx4j/math/CTTwipsMeasure.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTTwipsMeasure.java
rename to src/main/java/org/docx4j/math/CTTwipsMeasure.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTUnSignedInteger.java b/src/main/java/org/docx4j/math/CTUnSignedInteger.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTUnSignedInteger.java
rename to src/main/java/org/docx4j/math/CTUnSignedInteger.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTXAlign.java b/src/main/java/org/docx4j/math/CTXAlign.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTXAlign.java
rename to src/main/java/org/docx4j/math/CTXAlign.java
diff --git a/docx4j/src/main/java/org/docx4j/math/CTYAlign.java b/src/main/java/org/docx4j/math/CTYAlign.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/CTYAlign.java
rename to src/main/java/org/docx4j/math/CTYAlign.java
diff --git a/docx4j/src/main/java/org/docx4j/math/ObjectFactory.java b/src/main/java/org/docx4j/math/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/ObjectFactory.java
rename to src/main/java/org/docx4j/math/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/math/STBreakBin.java b/src/main/java/org/docx4j/math/STBreakBin.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/STBreakBin.java
rename to src/main/java/org/docx4j/math/STBreakBin.java
diff --git a/docx4j/src/main/java/org/docx4j/math/STFType.java b/src/main/java/org/docx4j/math/STFType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/STFType.java
rename to src/main/java/org/docx4j/math/STFType.java
diff --git a/docx4j/src/main/java/org/docx4j/math/STJc.java b/src/main/java/org/docx4j/math/STJc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/STJc.java
rename to src/main/java/org/docx4j/math/STJc.java
diff --git a/docx4j/src/main/java/org/docx4j/math/STLimLoc.java b/src/main/java/org/docx4j/math/STLimLoc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/STLimLoc.java
rename to src/main/java/org/docx4j/math/STLimLoc.java
diff --git a/docx4j/src/main/java/org/docx4j/math/STOnOff.java b/src/main/java/org/docx4j/math/STOnOff.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/STOnOff.java
rename to src/main/java/org/docx4j/math/STOnOff.java
diff --git a/docx4j/src/main/java/org/docx4j/math/STScript.java b/src/main/java/org/docx4j/math/STScript.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/STScript.java
rename to src/main/java/org/docx4j/math/STScript.java
diff --git a/docx4j/src/main/java/org/docx4j/math/STShp.java b/src/main/java/org/docx4j/math/STShp.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/STShp.java
rename to src/main/java/org/docx4j/math/STShp.java
diff --git a/docx4j/src/main/java/org/docx4j/math/STStyle.java b/src/main/java/org/docx4j/math/STStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/STStyle.java
rename to src/main/java/org/docx4j/math/STStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/math/STTopBot.java b/src/main/java/org/docx4j/math/STTopBot.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/STTopBot.java
rename to src/main/java/org/docx4j/math/STTopBot.java
diff --git a/docx4j/src/main/java/org/docx4j/math/STXAlign.java b/src/main/java/org/docx4j/math/STXAlign.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/STXAlign.java
rename to src/main/java/org/docx4j/math/STXAlign.java
diff --git a/docx4j/src/main/java/org/docx4j/math/STYAlign.java b/src/main/java/org/docx4j/math/STYAlign.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/STYAlign.java
rename to src/main/java/org/docx4j/math/STYAlign.java
diff --git a/docx4j/src/main/java/org/docx4j/math/package-info.java b/src/main/java/org/docx4j/math/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/math/package-info.java
rename to src/main/java/org/docx4j/math/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/model/ImmutablePropertyResolver.java b/src/main/java/org/docx4j/model/ImmutablePropertyResolver.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/ImmutablePropertyResolver.java
rename to src/main/java/org/docx4j/model/ImmutablePropertyResolver.java
diff --git a/docx4j/src/main/java/org/docx4j/model/Model.java b/src/main/java/org/docx4j/model/Model.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/Model.java
rename to src/main/java/org/docx4j/model/Model.java
diff --git a/docx4j/src/main/java/org/docx4j/model/PropertyResolver.java b/src/main/java/org/docx4j/model/PropertyResolver.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/PropertyResolver.java
rename to src/main/java/org/docx4j/model/PropertyResolver.java
diff --git a/docx4j/src/main/java/org/docx4j/model/README.txt b/src/main/java/org/docx4j/model/README.txt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/README.txt
rename to src/main/java/org/docx4j/model/README.txt
diff --git a/docx4j/src/main/java/org/docx4j/model/SymbolModel.java b/src/main/java/org/docx4j/model/SymbolModel.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/SymbolModel.java
rename to src/main/java/org/docx4j/model/SymbolModel.java
diff --git a/docx4j/src/main/java/org/docx4j/model/TransformState.java b/src/main/java/org/docx4j/model/TransformState.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/TransformState.java
rename to src/main/java/org/docx4j/model/TransformState.java
diff --git a/docx4j/src/main/java/org/docx4j/model/datastorage/BindingHandler.java b/src/main/java/org/docx4j/model/datastorage/BindingHandler.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/datastorage/BindingHandler.java
rename to src/main/java/org/docx4j/model/datastorage/BindingHandler.java
diff --git a/docx4j/src/main/java/org/docx4j/model/datastorage/CustomXmlDataStorage.java b/src/main/java/org/docx4j/model/datastorage/CustomXmlDataStorage.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/datastorage/CustomXmlDataStorage.java
rename to src/main/java/org/docx4j/model/datastorage/CustomXmlDataStorage.java
diff --git a/docx4j/src/main/java/org/docx4j/model/datastorage/CustomXmlDataStorageImpl.java b/src/main/java/org/docx4j/model/datastorage/CustomXmlDataStorageImpl.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/datastorage/CustomXmlDataStorageImpl.java
rename to src/main/java/org/docx4j/model/datastorage/CustomXmlDataStorageImpl.java
diff --git a/docx4j/src/main/java/org/docx4j/model/datastorage/DocxFetcher.java b/src/main/java/org/docx4j/model/datastorage/DocxFetcher.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/datastorage/DocxFetcher.java
rename to src/main/java/org/docx4j/model/datastorage/DocxFetcher.java
diff --git a/docx4j/src/main/java/org/docx4j/model/datastorage/InputIntegrityException.java b/src/main/java/org/docx4j/model/datastorage/InputIntegrityException.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/datastorage/InputIntegrityException.java
rename to src/main/java/org/docx4j/model/datastorage/InputIntegrityException.java
diff --git a/docx4j/src/main/java/org/docx4j/model/datastorage/OpenDoPEHandler.java b/src/main/java/org/docx4j/model/datastorage/OpenDoPEHandler.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/datastorage/OpenDoPEHandler.java
rename to src/main/java/org/docx4j/model/datastorage/OpenDoPEHandler.java
diff --git a/docx4j/src/main/java/org/docx4j/model/datastorage/OpenDoPEIntegrity.java b/src/main/java/org/docx4j/model/datastorage/OpenDoPEIntegrity.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/datastorage/OpenDoPEIntegrity.java
rename to src/main/java/org/docx4j/model/datastorage/OpenDoPEIntegrity.java
diff --git a/docx4j/src/main/java/org/docx4j/model/datastorage/OpenDoPEIntegrity.xslt b/src/main/java/org/docx4j/model/datastorage/OpenDoPEIntegrity.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/datastorage/OpenDoPEIntegrity.xslt
rename to src/main/java/org/docx4j/model/datastorage/OpenDoPEIntegrity.xslt
diff --git a/docx4j/src/main/java/org/docx4j/model/datastorage/RemovalHandler.java b/src/main/java/org/docx4j/model/datastorage/RemovalHandler.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/datastorage/RemovalHandler.java
rename to src/main/java/org/docx4j/model/datastorage/RemovalHandler.java
diff --git a/docx4j/src/main/java/org/docx4j/model/datastorage/RemovalHandler.xslt b/src/main/java/org/docx4j/model/datastorage/RemovalHandler.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/datastorage/RemovalHandler.xslt
rename to src/main/java/org/docx4j/model/datastorage/RemovalHandler.xslt
diff --git a/docx4j/src/main/java/org/docx4j/model/datastorage/XPathEnhancerLexer.java b/src/main/java/org/docx4j/model/datastorage/XPathEnhancerLexer.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/datastorage/XPathEnhancerLexer.java
rename to src/main/java/org/docx4j/model/datastorage/XPathEnhancerLexer.java
diff --git a/docx4j/src/main/java/org/docx4j/model/datastorage/XPathEnhancerParser.java b/src/main/java/org/docx4j/model/datastorage/XPathEnhancerParser.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/datastorage/XPathEnhancerParser.java
rename to src/main/java/org/docx4j/model/datastorage/XPathEnhancerParser.java
diff --git a/docx4j/src/main/java/org/docx4j/model/datastorage/bind.xslt b/src/main/java/org/docx4j/model/datastorage/bind.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/datastorage/bind.xslt
rename to src/main/java/org/docx4j/model/datastorage/bind.xslt
diff --git a/docx4j/src/main/java/org/docx4j/model/fields/FieldLocator.java b/src/main/java/org/docx4j/model/fields/FieldLocator.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/fields/FieldLocator.java
rename to src/main/java/org/docx4j/model/fields/FieldLocator.java
diff --git a/docx4j/src/main/java/org/docx4j/model/fields/FieldRef.java b/src/main/java/org/docx4j/model/fields/FieldRef.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/fields/FieldRef.java
rename to src/main/java/org/docx4j/model/fields/FieldRef.java
diff --git a/docx4j/src/main/java/org/docx4j/model/fields/FieldsPreprocessor.java b/src/main/java/org/docx4j/model/fields/FieldsPreprocessor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/fields/FieldsPreprocessor.java
rename to src/main/java/org/docx4j/model/fields/FieldsPreprocessor.java
diff --git a/docx4j/src/main/java/org/docx4j/model/fields/FieldsSimpleToComplex.xslt b/src/main/java/org/docx4j/model/fields/FieldsSimpleToComplex.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/fields/FieldsSimpleToComplex.xslt
rename to src/main/java/org/docx4j/model/fields/FieldsSimpleToComplex.xslt
diff --git a/docx4j/src/main/java/org/docx4j/model/fields/merge/DataFieldName.java b/src/main/java/org/docx4j/model/fields/merge/DataFieldName.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/fields/merge/DataFieldName.java
rename to src/main/java/org/docx4j/model/fields/merge/DataFieldName.java
diff --git a/docx4j/src/main/java/org/docx4j/model/fields/merge/MailMerger.java b/src/main/java/org/docx4j/model/fields/merge/MailMerger.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/fields/merge/MailMerger.java
rename to src/main/java/org/docx4j/model/fields/merge/MailMerger.java
diff --git a/docx4j/src/main/java/org/docx4j/model/images/AbstractConversionImageHandler.java b/src/main/java/org/docx4j/model/images/AbstractConversionImageHandler.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/images/AbstractConversionImageHandler.java
rename to src/main/java/org/docx4j/model/images/AbstractConversionImageHandler.java
diff --git a/docx4j/src/main/java/org/docx4j/model/images/AbstractWordXmlPicture.java b/src/main/java/org/docx4j/model/images/AbstractWordXmlPicture.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/images/AbstractWordXmlPicture.java
rename to src/main/java/org/docx4j/model/images/AbstractWordXmlPicture.java
diff --git a/docx4j/src/main/java/org/docx4j/model/images/ConversionImageHandler.java b/src/main/java/org/docx4j/model/images/ConversionImageHandler.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/images/ConversionImageHandler.java
rename to src/main/java/org/docx4j/model/images/ConversionImageHandler.java
diff --git a/docx4j/src/main/java/org/docx4j/model/images/FileConversionImageHandler.java b/src/main/java/org/docx4j/model/images/FileConversionImageHandler.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/images/FileConversionImageHandler.java
rename to src/main/java/org/docx4j/model/images/FileConversionImageHandler.java
diff --git a/docx4j/src/main/java/org/docx4j/model/images/WordXmlPictureE10.java b/src/main/java/org/docx4j/model/images/WordXmlPictureE10.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/images/WordXmlPictureE10.java
rename to src/main/java/org/docx4j/model/images/WordXmlPictureE10.java
diff --git a/docx4j/src/main/java/org/docx4j/model/images/WordXmlPictureE20.java b/src/main/java/org/docx4j/model/images/WordXmlPictureE20.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/images/WordXmlPictureE20.java
rename to src/main/java/org/docx4j/model/images/WordXmlPictureE20.java
diff --git a/docx4j/src/main/java/org/docx4j/model/listnumbering/AbstractListNumberingDefinition.java b/src/main/java/org/docx4j/model/listnumbering/AbstractListNumberingDefinition.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/listnumbering/AbstractListNumberingDefinition.java
rename to src/main/java/org/docx4j/model/listnumbering/AbstractListNumberingDefinition.java
diff --git a/docx4j/src/main/java/org/docx4j/model/listnumbering/Emulator.java b/src/main/java/org/docx4j/model/listnumbering/Emulator.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/listnumbering/Emulator.java
rename to src/main/java/org/docx4j/model/listnumbering/Emulator.java
diff --git a/docx4j/src/main/java/org/docx4j/model/listnumbering/ListLevel.java b/src/main/java/org/docx4j/model/listnumbering/ListLevel.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/listnumbering/ListLevel.java
rename to src/main/java/org/docx4j/model/listnumbering/ListLevel.java
diff --git a/docx4j/src/main/java/org/docx4j/model/listnumbering/ListNumberingDefinition.java b/src/main/java/org/docx4j/model/listnumbering/ListNumberingDefinition.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/listnumbering/ListNumberingDefinition.java
rename to src/main/java/org/docx4j/model/listnumbering/ListNumberingDefinition.java
diff --git a/docx4j/src/main/java/org/docx4j/model/listnumbering/NumberFormat.java b/src/main/java/org/docx4j/model/listnumbering/NumberFormat.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/listnumbering/NumberFormat.java
rename to src/main/java/org/docx4j/model/listnumbering/NumberFormat.java
diff --git a/docx4j/src/main/java/org/docx4j/model/listnumbering/NumberFormatDecimalZero.java b/src/main/java/org/docx4j/model/listnumbering/NumberFormatDecimalZero.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/listnumbering/NumberFormatDecimalZero.java
rename to src/main/java/org/docx4j/model/listnumbering/NumberFormatDecimalZero.java
diff --git a/docx4j/src/main/java/org/docx4j/model/listnumbering/NumberFormatLowerLetter.java b/src/main/java/org/docx4j/model/listnumbering/NumberFormatLowerLetter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/listnumbering/NumberFormatLowerLetter.java
rename to src/main/java/org/docx4j/model/listnumbering/NumberFormatLowerLetter.java
diff --git a/docx4j/src/main/java/org/docx4j/model/listnumbering/NumberFormatRomanAbstract.java b/src/main/java/org/docx4j/model/listnumbering/NumberFormatRomanAbstract.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/listnumbering/NumberFormatRomanAbstract.java
rename to src/main/java/org/docx4j/model/listnumbering/NumberFormatRomanAbstract.java
diff --git a/docx4j/src/main/java/org/docx4j/model/listnumbering/NumberFormatRomanLower.java b/src/main/java/org/docx4j/model/listnumbering/NumberFormatRomanLower.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/listnumbering/NumberFormatRomanLower.java
rename to src/main/java/org/docx4j/model/listnumbering/NumberFormatRomanLower.java
diff --git a/docx4j/src/main/java/org/docx4j/model/listnumbering/NumberFormatRomanUpper.java b/src/main/java/org/docx4j/model/listnumbering/NumberFormatRomanUpper.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/listnumbering/NumberFormatRomanUpper.java
rename to src/main/java/org/docx4j/model/listnumbering/NumberFormatRomanUpper.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/AdHocProperty.java b/src/main/java/org/docx4j/model/properties/AdHocProperty.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/AdHocProperty.java
rename to src/main/java/org/docx4j/model/properties/AdHocProperty.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/Property.java b/src/main/java/org/docx4j/model/properties/Property.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/Property.java
rename to src/main/java/org/docx4j/model/properties/Property.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/PropertyFactory.java b/src/main/java/org/docx4j/model/properties/PropertyFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/PropertyFactory.java
rename to src/main/java/org/docx4j/model/properties/PropertyFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/AbstractPBorder.java b/src/main/java/org/docx4j/model/properties/paragraph/AbstractPBorder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/AbstractPBorder.java
rename to src/main/java/org/docx4j/model/properties/paragraph/AbstractPBorder.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/AbstractParagraphProperty.java b/src/main/java/org/docx4j/model/properties/paragraph/AbstractParagraphProperty.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/AbstractParagraphProperty.java
rename to src/main/java/org/docx4j/model/properties/paragraph/AbstractParagraphProperty.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/Indent.java b/src/main/java/org/docx4j/model/properties/paragraph/Indent.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/Indent.java
rename to src/main/java/org/docx4j/model/properties/paragraph/Indent.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/Justification.java b/src/main/java/org/docx4j/model/properties/paragraph/Justification.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/Justification.java
rename to src/main/java/org/docx4j/model/properties/paragraph/Justification.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/KeepNext.java b/src/main/java/org/docx4j/model/properties/paragraph/KeepNext.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/KeepNext.java
rename to src/main/java/org/docx4j/model/properties/paragraph/KeepNext.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/LineSpacing.java b/src/main/java/org/docx4j/model/properties/paragraph/LineSpacing.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/LineSpacing.java
rename to src/main/java/org/docx4j/model/properties/paragraph/LineSpacing.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/NumberingProperty.java b/src/main/java/org/docx4j/model/properties/paragraph/NumberingProperty.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/NumberingProperty.java
rename to src/main/java/org/docx4j/model/properties/paragraph/NumberingProperty.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/PBorderBottom.java b/src/main/java/org/docx4j/model/properties/paragraph/PBorderBottom.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/PBorderBottom.java
rename to src/main/java/org/docx4j/model/properties/paragraph/PBorderBottom.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/PBorderLeft.java b/src/main/java/org/docx4j/model/properties/paragraph/PBorderLeft.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/PBorderLeft.java
rename to src/main/java/org/docx4j/model/properties/paragraph/PBorderLeft.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/PBorderRight.java b/src/main/java/org/docx4j/model/properties/paragraph/PBorderRight.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/PBorderRight.java
rename to src/main/java/org/docx4j/model/properties/paragraph/PBorderRight.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/PBorderTop.java b/src/main/java/org/docx4j/model/properties/paragraph/PBorderTop.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/PBorderTop.java
rename to src/main/java/org/docx4j/model/properties/paragraph/PBorderTop.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/PShading.java b/src/main/java/org/docx4j/model/properties/paragraph/PShading.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/PShading.java
rename to src/main/java/org/docx4j/model/properties/paragraph/PShading.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/PageBreakBefore.java b/src/main/java/org/docx4j/model/properties/paragraph/PageBreakBefore.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/PageBreakBefore.java
rename to src/main/java/org/docx4j/model/properties/paragraph/PageBreakBefore.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/SpaceAfter.java b/src/main/java/org/docx4j/model/properties/paragraph/SpaceAfter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/SpaceAfter.java
rename to src/main/java/org/docx4j/model/properties/paragraph/SpaceAfter.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/SpaceBefore.java b/src/main/java/org/docx4j/model/properties/paragraph/SpaceBefore.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/SpaceBefore.java
rename to src/main/java/org/docx4j/model/properties/paragraph/SpaceBefore.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/paragraph/TextAlignmentVertical.java b/src/main/java/org/docx4j/model/properties/paragraph/TextAlignmentVertical.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/paragraph/TextAlignmentVertical.java
rename to src/main/java/org/docx4j/model/properties/paragraph/TextAlignmentVertical.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/run/AbstractRunProperty.java b/src/main/java/org/docx4j/model/properties/run/AbstractRunProperty.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/run/AbstractRunProperty.java
rename to src/main/java/org/docx4j/model/properties/run/AbstractRunProperty.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/run/Bold.java b/src/main/java/org/docx4j/model/properties/run/Bold.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/run/Bold.java
rename to src/main/java/org/docx4j/model/properties/run/Bold.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/run/Font.java b/src/main/java/org/docx4j/model/properties/run/Font.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/run/Font.java
rename to src/main/java/org/docx4j/model/properties/run/Font.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/run/FontColor.java b/src/main/java/org/docx4j/model/properties/run/FontColor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/run/FontColor.java
rename to src/main/java/org/docx4j/model/properties/run/FontColor.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/run/FontSize.java b/src/main/java/org/docx4j/model/properties/run/FontSize.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/run/FontSize.java
rename to src/main/java/org/docx4j/model/properties/run/FontSize.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/run/HighlightColor.java b/src/main/java/org/docx4j/model/properties/run/HighlightColor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/run/HighlightColor.java
rename to src/main/java/org/docx4j/model/properties/run/HighlightColor.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/run/Italics.java b/src/main/java/org/docx4j/model/properties/run/Italics.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/run/Italics.java
rename to src/main/java/org/docx4j/model/properties/run/Italics.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/run/RBorder.java b/src/main/java/org/docx4j/model/properties/run/RBorder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/run/RBorder.java
rename to src/main/java/org/docx4j/model/properties/run/RBorder.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/run/RShading.java b/src/main/java/org/docx4j/model/properties/run/RShading.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/run/RShading.java
rename to src/main/java/org/docx4j/model/properties/run/RShading.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/run/Strike.java b/src/main/java/org/docx4j/model/properties/run/Strike.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/run/Strike.java
rename to src/main/java/org/docx4j/model/properties/run/Strike.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/run/Underline.java b/src/main/java/org/docx4j/model/properties/run/Underline.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/run/Underline.java
rename to src/main/java/org/docx4j/model/properties/run/Underline.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/run/VerticalAlignment.java b/src/main/java/org/docx4j/model/properties/run/VerticalAlignment.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/run/VerticalAlignment.java
rename to src/main/java/org/docx4j/model/properties/run/VerticalAlignment.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/table/AbstractBorder.java b/src/main/java/org/docx4j/model/properties/table/AbstractBorder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/table/AbstractBorder.java
rename to src/main/java/org/docx4j/model/properties/table/AbstractBorder.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/table/AbstractTableProperty.java b/src/main/java/org/docx4j/model/properties/table/AbstractTableProperty.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/table/AbstractTableProperty.java
rename to src/main/java/org/docx4j/model/properties/table/AbstractTableProperty.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/table/BorderBottom.java b/src/main/java/org/docx4j/model/properties/table/BorderBottom.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/table/BorderBottom.java
rename to src/main/java/org/docx4j/model/properties/table/BorderBottom.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/table/BorderLeft.java b/src/main/java/org/docx4j/model/properties/table/BorderLeft.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/table/BorderLeft.java
rename to src/main/java/org/docx4j/model/properties/table/BorderLeft.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/table/BorderRight.java b/src/main/java/org/docx4j/model/properties/table/BorderRight.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/table/BorderRight.java
rename to src/main/java/org/docx4j/model/properties/table/BorderRight.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/table/BorderTop.java b/src/main/java/org/docx4j/model/properties/table/BorderTop.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/table/BorderTop.java
rename to src/main/java/org/docx4j/model/properties/table/BorderTop.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/table/Indent.java b/src/main/java/org/docx4j/model/properties/table/Indent.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/table/Indent.java
rename to src/main/java/org/docx4j/model/properties/table/Indent.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/table/tblStyle/AbstractTableStyleProperty.java b/src/main/java/org/docx4j/model/properties/table/tblStyle/AbstractTableStyleProperty.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/table/tblStyle/AbstractTableStyleProperty.java
rename to src/main/java/org/docx4j/model/properties/table/tblStyle/AbstractTableStyleProperty.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/table/tc/AbstractTcProperty.java b/src/main/java/org/docx4j/model/properties/table/tc/AbstractTcProperty.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/table/tc/AbstractTcProperty.java
rename to src/main/java/org/docx4j/model/properties/table/tc/AbstractTcProperty.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/table/tc/Shading.java b/src/main/java/org/docx4j/model/properties/table/tc/Shading.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/table/tc/Shading.java
rename to src/main/java/org/docx4j/model/properties/table/tc/Shading.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/table/tc/TextAlignmentVertical.java b/src/main/java/org/docx4j/model/properties/table/tc/TextAlignmentVertical.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/table/tc/TextAlignmentVertical.java
rename to src/main/java/org/docx4j/model/properties/table/tc/TextAlignmentVertical.java
diff --git a/docx4j/src/main/java/org/docx4j/model/properties/table/tr/AbstractTrProperty.java b/src/main/java/org/docx4j/model/properties/table/tr/AbstractTrProperty.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/properties/table/tr/AbstractTrProperty.java
rename to src/main/java/org/docx4j/model/properties/table/tr/AbstractTrProperty.java
diff --git a/docx4j/src/main/java/org/docx4j/model/sdt/QueryString.java b/src/main/java/org/docx4j/model/sdt/QueryString.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/sdt/QueryString.java
rename to src/main/java/org/docx4j/model/sdt/QueryString.java
diff --git a/docx4j/src/main/java/org/docx4j/model/structure/DocumentModel.java b/src/main/java/org/docx4j/model/structure/DocumentModel.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/structure/DocumentModel.java
rename to src/main/java/org/docx4j/model/structure/DocumentModel.java
diff --git a/docx4j/src/main/java/org/docx4j/model/structure/HeaderFooterPolicy.java b/src/main/java/org/docx4j/model/structure/HeaderFooterPolicy.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/structure/HeaderFooterPolicy.java
rename to src/main/java/org/docx4j/model/structure/HeaderFooterPolicy.java
diff --git a/docx4j/src/main/java/org/docx4j/model/structure/MarginsWellKnown.java b/src/main/java/org/docx4j/model/structure/MarginsWellKnown.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/structure/MarginsWellKnown.java
rename to src/main/java/org/docx4j/model/structure/MarginsWellKnown.java
diff --git a/docx4j/src/main/java/org/docx4j/model/structure/PageDimensions.java b/src/main/java/org/docx4j/model/structure/PageDimensions.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/structure/PageDimensions.java
rename to src/main/java/org/docx4j/model/structure/PageDimensions.java
diff --git a/docx4j/src/main/java/org/docx4j/model/structure/PageSizePaper.java b/src/main/java/org/docx4j/model/structure/PageSizePaper.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/structure/PageSizePaper.java
rename to src/main/java/org/docx4j/model/structure/PageSizePaper.java
diff --git a/docx4j/src/main/java/org/docx4j/model/structure/SectionWrapper.java b/src/main/java/org/docx4j/model/structure/SectionWrapper.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/structure/SectionWrapper.java
rename to src/main/java/org/docx4j/model/structure/SectionWrapper.java
diff --git a/docx4j/src/main/java/org/docx4j/model/structure/jaxb/ObjectFactory.java b/src/main/java/org/docx4j/model/structure/jaxb/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/structure/jaxb/ObjectFactory.java
rename to src/main/java/org/docx4j/model/structure/jaxb/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/model/structure/jaxb/Sections.java b/src/main/java/org/docx4j/model/structure/jaxb/Sections.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/structure/jaxb/Sections.java
rename to src/main/java/org/docx4j/model/structure/jaxb/Sections.java
diff --git a/docx4j/src/main/java/org/docx4j/model/styles/Node.java b/src/main/java/org/docx4j/model/styles/Node.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/styles/Node.java
rename to src/main/java/org/docx4j/model/styles/Node.java
diff --git a/docx4j/src/main/java/org/docx4j/model/styles/StyleTree.java b/src/main/java/org/docx4j/model/styles/StyleTree.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/styles/StyleTree.java
rename to src/main/java/org/docx4j/model/styles/StyleTree.java
diff --git a/docx4j/src/main/java/org/docx4j/model/styles/StyleUtil.java b/src/main/java/org/docx4j/model/styles/StyleUtil.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/styles/StyleUtil.java
rename to src/main/java/org/docx4j/model/styles/StyleUtil.java
diff --git a/docx4j/src/main/java/org/docx4j/model/styles/Tree.java b/src/main/java/org/docx4j/model/styles/Tree.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/styles/Tree.java
rename to src/main/java/org/docx4j/model/styles/Tree.java
diff --git a/docx4j/src/main/java/org/docx4j/model/table/Cell.java b/src/main/java/org/docx4j/model/table/Cell.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/table/Cell.java
rename to src/main/java/org/docx4j/model/table/Cell.java
diff --git a/docx4j/src/main/java/org/docx4j/model/table/TableModel.java b/src/main/java/org/docx4j/model/table/TableModel.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/table/TableModel.java
rename to src/main/java/org/docx4j/model/table/TableModel.java
diff --git a/docx4j/src/main/java/org/docx4j/model/table/TblFactory.java b/src/main/java/org/docx4j/model/table/TblFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/model/table/TblFactory.java
rename to src/main/java/org/docx4j/model/table/TblFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/Base.java b/src/main/java/org/docx4j/openpackaging/Base.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/Base.java
rename to src/main/java/org/docx4j/openpackaging/Base.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/URIHelper.java b/src/main/java/org/docx4j/openpackaging/URIHelper.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/URIHelper.java
rename to src/main/java/org/docx4j/openpackaging/URIHelper.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/CTDefault.java b/src/main/java/org/docx4j/openpackaging/contenttype/CTDefault.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/contenttype/CTDefault.java
rename to src/main/java/org/docx4j/openpackaging/contenttype/CTDefault.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/CTOverride.java b/src/main/java/org/docx4j/openpackaging/contenttype/CTOverride.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/contenttype/CTOverride.java
rename to src/main/java/org/docx4j/openpackaging/contenttype/CTOverride.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/CTTypes.java b/src/main/java/org/docx4j/openpackaging/contenttype/CTTypes.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/contenttype/CTTypes.java
rename to src/main/java/org/docx4j/openpackaging/contenttype/CTTypes.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentType.java b/src/main/java/org/docx4j/openpackaging/contenttype/ContentType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentType.java
rename to src/main/java/org/docx4j/openpackaging/contenttype/ContentType.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypeManager.java b/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypeManager.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypeManager.java
rename to src/main/java/org/docx4j/openpackaging/contenttype/ContentTypeManager.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypes.java b/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypes.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypes.java
rename to src/main/java/org/docx4j/openpackaging/contenttype/ContentTypes.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ObjectFactory.java b/src/main/java/org/docx4j/openpackaging/contenttype/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ObjectFactory.java
rename to src/main/java/org/docx4j/openpackaging/contenttype/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/package-info.java b/src/main/java/org/docx4j/openpackaging/contenttype/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/contenttype/package-info.java
rename to src/main/java/org/docx4j/openpackaging/contenttype/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/exceptions/Docx4JException.java b/src/main/java/org/docx4j/openpackaging/exceptions/Docx4JException.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/exceptions/Docx4JException.java
rename to src/main/java/org/docx4j/openpackaging/exceptions/Docx4JException.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/exceptions/Docx4JRuntimeException.java b/src/main/java/org/docx4j/openpackaging/exceptions/Docx4JRuntimeException.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/exceptions/Docx4JRuntimeException.java
rename to src/main/java/org/docx4j/openpackaging/exceptions/Docx4JRuntimeException.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/exceptions/InvalidFormatException.java b/src/main/java/org/docx4j/openpackaging/exceptions/InvalidFormatException.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/exceptions/InvalidFormatException.java
rename to src/main/java/org/docx4j/openpackaging/exceptions/InvalidFormatException.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/exceptions/InvalidOperationException.java b/src/main/java/org/docx4j/openpackaging/exceptions/InvalidOperationException.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/exceptions/InvalidOperationException.java
rename to src/main/java/org/docx4j/openpackaging/exceptions/InvalidOperationException.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/exceptions/PartUnrecognisedException.java b/src/main/java/org/docx4j/openpackaging/exceptions/PartUnrecognisedException.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/exceptions/PartUnrecognisedException.java
rename to src/main/java/org/docx4j/openpackaging/exceptions/PartUnrecognisedException.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/io/ExternalResourceUtils.java b/src/main/java/org/docx4j/openpackaging/io/ExternalResourceUtils.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/io/ExternalResourceUtils.java
rename to src/main/java/org/docx4j/openpackaging/io/ExternalResourceUtils.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/io/Load.java b/src/main/java/org/docx4j/openpackaging/io/Load.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/io/Load.java
rename to src/main/java/org/docx4j/openpackaging/io/Load.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/io/LoadFromZipFile.java b/src/main/java/org/docx4j/openpackaging/io/LoadFromZipFile.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/io/LoadFromZipFile.java
rename to src/main/java/org/docx4j/openpackaging/io/LoadFromZipFile.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/io/LoadFromZipNG.java b/src/main/java/org/docx4j/openpackaging/io/LoadFromZipNG.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/io/LoadFromZipNG.java
rename to src/main/java/org/docx4j/openpackaging/io/LoadFromZipNG.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/io/SaveToZipFile.java b/src/main/java/org/docx4j/openpackaging/io/SaveToZipFile.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/io/SaveToZipFile.java
rename to src/main/java/org/docx4j/openpackaging/io/SaveToZipFile.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/packages/Filetype.java b/src/main/java/org/docx4j/openpackaging/packages/Filetype.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/packages/Filetype.java
rename to src/main/java/org/docx4j/openpackaging/packages/Filetype.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/packages/OpcPackage.java b/src/main/java/org/docx4j/openpackaging/packages/OpcPackage.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/packages/OpcPackage.java
rename to src/main/java/org/docx4j/openpackaging/packages/OpcPackage.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java b/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java
rename to src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/packages/filter.xslt b/src/main/java/org/docx4j/openpackaging/packages/filter.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/packages/filter.xslt
rename to src/main/java/org/docx4j/openpackaging/packages/filter.xslt
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/packages/html2wordml.xslt b/src/main/java/org/docx4j/openpackaging/packages/html2wordml.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/packages/html2wordml.xslt
rename to src/main/java/org/docx4j/openpackaging/packages/html2wordml.xslt
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/ActiveXControlXmlPart.java b/src/main/java/org/docx4j/openpackaging/parts/ActiveXControlXmlPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/ActiveXControlXmlPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/ActiveXControlXmlPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/CustomXmlDataStoragePart.java b/src/main/java/org/docx4j/openpackaging/parts/CustomXmlDataStoragePart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/CustomXmlDataStoragePart.java
rename to src/main/java/org/docx4j/openpackaging/parts/CustomXmlDataStoragePart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/CustomXmlDataStoragePropertiesPart.java b/src/main/java/org/docx4j/openpackaging/parts/CustomXmlDataStoragePropertiesPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/CustomXmlDataStoragePropertiesPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/CustomXmlDataStoragePropertiesPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DefaultXmlPart.java b/src/main/java/org/docx4j/openpackaging/parts/DefaultXmlPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DefaultXmlPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/DefaultXmlPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DocPropsCorePart.java b/src/main/java/org/docx4j/openpackaging/parts/DocPropsCorePart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DocPropsCorePart.java
rename to src/main/java/org/docx4j/openpackaging/parts/DocPropsCorePart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DocPropsCustomPart.java b/src/main/java/org/docx4j/openpackaging/parts/DocPropsCustomPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DocPropsCustomPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/DocPropsCustomPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DocPropsExtendedPart.java b/src/main/java/org/docx4j/openpackaging/parts/DocPropsExtendedPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DocPropsExtendedPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/DocPropsExtendedPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/Chart.java b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/Chart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/Chart.java
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/Chart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/CreateDocxWithSmartArt.java b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/CreateDocxWithSmartArt.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/CreateDocxWithSmartArt.java
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/CreateDocxWithSmartArt.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/CreatePptxWithSmartArt.java b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/CreatePptxWithSmartArt.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/CreatePptxWithSmartArt.java
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/CreatePptxWithSmartArt.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/CreateWithSmartArtAbstract.java b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/CreateWithSmartArtAbstract.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/CreateWithSmartArtAbstract.java
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/CreateWithSmartArtAbstract.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/CxnLst2GraphML.xslt b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/CxnLst2GraphML.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/CxnLst2GraphML.xslt
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/CxnLst2GraphML.xslt
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramColorsPart.java b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramColorsPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramColorsPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramColorsPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDataPart.java b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDataPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDataPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDataPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDataUnflatten.java b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDataUnflatten.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDataUnflatten.java
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDataUnflatten.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDrawingPart.java b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDrawingPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDrawingPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramDrawingPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutHeaderPart.java b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutHeaderPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutHeaderPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutHeaderPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutMeta.xslt b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutMeta.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutMeta.xslt
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutMeta.xslt
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutPart.java b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutTree4AlgHier.xslt b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutTree4AlgHier.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutTree4AlgHier.xslt
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutTree4AlgHier.xslt
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramStylePart.java b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramStylePart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramStylePart.java
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramStylePart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/Drawing.java b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/Drawing.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/Drawing.java
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/Drawing.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/GenerateIds.xslt b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/GenerateIds.xslt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/GenerateIds.xslt
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/GenerateIds.xslt
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/JaxbDmlPart.java b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/JaxbDmlPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/JaxbDmlPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/JaxbDmlPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/colorsDef-accent1_2.xml b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/colorsDef-accent1_2.xml
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/colorsDef-accent1_2.xml
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/colorsDef-accent1_2.xml
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/quickStyle-3d8.xml b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/quickStyle-3d8.xml
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/quickStyle-3d8.xml
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/quickStyle-3d8.xml
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/quickStyle-simple1.xml b/src/main/java/org/docx4j/openpackaging/parts/DrawingML/quickStyle-simple1.xml
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/quickStyle-simple1.xml
rename to src/main/java/org/docx4j/openpackaging/parts/DrawingML/quickStyle-simple1.xml
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/ExternalTarget.java b/src/main/java/org/docx4j/openpackaging/parts/ExternalTarget.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/ExternalTarget.java
rename to src/main/java/org/docx4j/openpackaging/parts/ExternalTarget.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/JaxbXmlPart.java b/src/main/java/org/docx4j/openpackaging/parts/JaxbXmlPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/JaxbXmlPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/JaxbXmlPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/Part.java b/src/main/java/org/docx4j/openpackaging/parts/Part.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/Part.java
rename to src/main/java/org/docx4j/openpackaging/parts/Part.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/PartName.java b/src/main/java/org/docx4j/openpackaging/parts/PartName.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/PartName.java
rename to src/main/java/org/docx4j/openpackaging/parts/PartName.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/Parts.java b/src/main/java/org/docx4j/openpackaging/parts/Parts.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/Parts.java
rename to src/main/java/org/docx4j/openpackaging/parts/Parts.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/ThemePart.java b/src/main/java/org/docx4j/openpackaging/parts/ThemePart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/ThemePart.java
rename to src/main/java/org/docx4j/openpackaging/parts/ThemePart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/VMLBinaryPart.java b/src/main/java/org/docx4j/openpackaging/parts/VMLBinaryPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/VMLBinaryPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/VMLBinaryPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/VMLPart.java b/src/main/java/org/docx4j/openpackaging/parts/VMLPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/VMLPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/VMLPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/AlternativeFormatInputPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/AlternativeFormatInputPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/AlternativeFormatInputPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/AlternativeFormatInputPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BibliographyPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BibliographyPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BibliographyPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BibliographyPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPartAbstractImage.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPartAbstractImage.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPartAbstractImage.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPartAbstractImage.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/CommentsPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/CommentsPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/CommentsPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/CommentsPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/DocumentPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/DocumentPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/DocumentPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/DocumentPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/DocumentSettingsPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/DocumentSettingsPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/DocumentSettingsPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/DocumentSettingsPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/EmbeddedPackagePart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/EmbeddedPackagePart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/EmbeddedPackagePart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/EmbeddedPackagePart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/EndnotesPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/EndnotesPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/EndnotesPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/EndnotesPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FontTablePart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FontTablePart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FontTablePart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FontTablePart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FooterPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FooterPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FooterPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FooterPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FootnotesPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FootnotesPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FootnotesPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/FootnotesPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/GlossaryDocumentPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/GlossaryDocumentPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/GlossaryDocumentPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/GlossaryDocumentPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/HeaderPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/HeaderPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/HeaderPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/HeaderPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageBmpPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageBmpPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageBmpPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageBmpPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageEpsPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageEpsPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageEpsPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageEpsPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageGifPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageGifPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageGifPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageGifPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageJpegPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageJpegPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageJpegPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageJpegPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImagePngPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImagePngPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImagePngPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImagePngPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageTiffPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageTiffPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageTiffPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageTiffPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/KnownStyles.xml b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/KnownStyles.xml
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/KnownStyles.xml
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/KnownStyles.xml
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MainDocumentPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MainDocumentPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MainDocumentPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MainDocumentPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MetafileEmfPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MetafileEmfPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MetafileEmfPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MetafileEmfPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MetafilePart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MetafilePart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MetafilePart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MetafilePart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MetafileWmfPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MetafileWmfPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MetafileWmfPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MetafileWmfPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/NumberingDefinitionsPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/NumberingDefinitionsPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/NumberingDefinitionsPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/NumberingDefinitionsPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ObfuscatedFontPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ObfuscatedFontPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ObfuscatedFontPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/ObfuscatedFontPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/OleObjectBinaryPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/OleObjectBinaryPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/OleObjectBinaryPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/OleObjectBinaryPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/StyleDefinitionsPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/StyleDefinitionsPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/StyleDefinitionsPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/StyleDefinitionsPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VCL.xcu b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VCL.xcu
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VCL.xcu
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VCL.xcu
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VbaDataPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VbaDataPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VbaDataPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VbaDataPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VbaProjectBinaryPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VbaProjectBinaryPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VbaProjectBinaryPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/VbaProjectBinaryPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/WebSettingsPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/WebSettingsPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/WebSettingsPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/WebSettingsPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/fontTable.xml b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/fontTable.xml
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/fontTable.xml
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/fontTable.xml
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/numbering.xml b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/numbering.xml
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/numbering.xml
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/numbering.xml
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/styles.xml b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/styles.xml
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/styles.xml
rename to src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/styles.xml
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/XmlPart.java b/src/main/java/org/docx4j/openpackaging/parts/XmlPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/XmlPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/XmlPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/digitalsignature/XmlSignaturePart.java b/src/main/java/org/docx4j/openpackaging/parts/digitalsignature/XmlSignaturePart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/digitalsignature/XmlSignaturePart.java
rename to src/main/java/org/docx4j/openpackaging/parts/digitalsignature/XmlSignaturePart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/opendope/ComponentsPart.java b/src/main/java/org/docx4j/openpackaging/parts/opendope/ComponentsPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/opendope/ComponentsPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/opendope/ComponentsPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/opendope/ConditionsPart.java b/src/main/java/org/docx4j/openpackaging/parts/opendope/ConditionsPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/opendope/ConditionsPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/opendope/ConditionsPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/opendope/JaxbCustomXmlDataStoragePart.java b/src/main/java/org/docx4j/openpackaging/parts/opendope/JaxbCustomXmlDataStoragePart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/opendope/JaxbCustomXmlDataStoragePart.java
rename to src/main/java/org/docx4j/openpackaging/parts/opendope/JaxbCustomXmlDataStoragePart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/opendope/QuestionsPart.java b/src/main/java/org/docx4j/openpackaging/parts/opendope/QuestionsPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/opendope/QuestionsPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/opendope/QuestionsPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/opendope/XPathsPart.java b/src/main/java/org/docx4j/openpackaging/parts/opendope/XPathsPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/opendope/XPathsPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/opendope/XPathsPart.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/AlteredParts.java b/src/main/java/org/docx4j/openpackaging/parts/relationships/AlteredParts.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/AlteredParts.java
rename to src/main/java/org/docx4j/openpackaging/parts/relationships/AlteredParts.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/Namespaces.java b/src/main/java/org/docx4j/openpackaging/parts/relationships/Namespaces.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/Namespaces.java
rename to src/main/java/org/docx4j/openpackaging/parts/relationships/Namespaces.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/Patcher.java b/src/main/java/org/docx4j/openpackaging/parts/relationships/Patcher.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/Patcher.java
rename to src/main/java/org/docx4j/openpackaging/parts/relationships/Patcher.java
diff --git a/docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/RelationshipsPart.java b/src/main/java/org/docx4j/openpackaging/parts/relationships/RelationshipsPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/RelationshipsPart.java
rename to src/main/java/org/docx4j/openpackaging/parts/relationships/RelationshipsPart.java
diff --git a/docx4j/src/main/java/org/docx4j/relationships/ObjectFactory.java b/src/main/java/org/docx4j/relationships/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/relationships/ObjectFactory.java
rename to src/main/java/org/docx4j/relationships/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/relationships/Relationship.java b/src/main/java/org/docx4j/relationships/Relationship.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/relationships/Relationship.java
rename to src/main/java/org/docx4j/relationships/Relationship.java
diff --git a/docx4j/src/main/java/org/docx4j/relationships/Relationships.java b/src/main/java/org/docx4j/relationships/Relationships.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/relationships/Relationships.java
rename to src/main/java/org/docx4j/relationships/Relationships.java
diff --git a/docx4j/src/main/java/org/docx4j/relationships/package-info.java b/src/main/java/org/docx4j/relationships/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/relationships/package-info.java
rename to src/main/java/org/docx4j/relationships/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/AbstractSample.java b/src/main/java/org/docx4j/samples/AbstractSample.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/AbstractSample.java
rename to src/main/java/org/docx4j/samples/AbstractSample.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/AddImage.java b/src/main/java/org/docx4j/samples/AddImage.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/AddImage.java
rename to src/main/java/org/docx4j/samples/AddImage.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/AddTOC.java b/src/main/java/org/docx4j/samples/AddTOC.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/AddTOC.java
rename to src/main/java/org/docx4j/samples/AddTOC.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/AltChunk.java b/src/main/java/org/docx4j/samples/AltChunk.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/AltChunk.java
rename to src/main/java/org/docx4j/samples/AltChunk.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/AltChunkHtml.java b/src/main/java/org/docx4j/samples/AltChunkHtml.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/AltChunkHtml.java
rename to src/main/java/org/docx4j/samples/AltChunkHtml.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/AltChunkProcessingExtension.java b/src/main/java/org/docx4j/samples/AltChunkProcessingExtension.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/AltChunkProcessingExtension.java
rename to src/main/java/org/docx4j/samples/AltChunkProcessingExtension.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/BookmarkAdd.java b/src/main/java/org/docx4j/samples/BookmarkAdd.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/BookmarkAdd.java
rename to src/main/java/org/docx4j/samples/BookmarkAdd.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/CommentsSample.java b/src/main/java/org/docx4j/samples/CommentsSample.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/CommentsSample.java
rename to src/main/java/org/docx4j/samples/CommentsSample.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/CompareDocuments.java b/src/main/java/org/docx4j/samples/CompareDocuments.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/CompareDocuments.java
rename to src/main/java/org/docx4j/samples/CompareDocuments.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/CompareDocumentsUsingDriver.java b/src/main/java/org/docx4j/samples/CompareDocumentsUsingDriver.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/CompareDocumentsUsingDriver.java
rename to src/main/java/org/docx4j/samples/CompareDocumentsUsingDriver.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/ContentControlBindingExtensions.java b/src/main/java/org/docx4j/samples/ContentControlBindingExtensions.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/ContentControlBindingExtensions.java
rename to src/main/java/org/docx4j/samples/ContentControlBindingExtensions.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/ConvertEmbeddedImageToLinked.java b/src/main/java/org/docx4j/samples/ConvertEmbeddedImageToLinked.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/ConvertEmbeddedImageToLinked.java
rename to src/main/java/org/docx4j/samples/ConvertEmbeddedImageToLinked.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/CopyPart.java b/src/main/java/org/docx4j/samples/CopyPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/CopyPart.java
rename to src/main/java/org/docx4j/samples/CopyPart.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/CreateDocxWithCustomXml.java b/src/main/java/org/docx4j/samples/CreateDocxWithCustomXml.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/CreateDocxWithCustomXml.java
rename to src/main/java/org/docx4j/samples/CreateDocxWithCustomXml.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/CreateHtml.java b/src/main/java/org/docx4j/samples/CreateHtml.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/CreateHtml.java
rename to src/main/java/org/docx4j/samples/CreateHtml.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/CreatePdf.java b/src/main/java/org/docx4j/samples/CreatePdf.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/CreatePdf.java
rename to src/main/java/org/docx4j/samples/CreatePdf.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/CreateWordprocessingMLDocument.java b/src/main/java/org/docx4j/samples/CreateWordprocessingMLDocument.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/CreateWordprocessingMLDocument.java
rename to src/main/java/org/docx4j/samples/CreateWordprocessingMLDocument.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/CreateXmlCss.java b/src/main/java/org/docx4j/samples/CreateXmlCss.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/CreateXmlCss.java
rename to src/main/java/org/docx4j/samples/CreateXmlCss.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/CustomXmlBinding.java b/src/main/java/org/docx4j/samples/CustomXmlBinding.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/CustomXmlBinding.java
rename to src/main/java/org/docx4j/samples/CustomXmlBinding.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/CustomXmlInfo.java b/src/main/java/org/docx4j/samples/CustomXmlInfo.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/CustomXmlInfo.java
rename to src/main/java/org/docx4j/samples/CustomXmlInfo.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/DisplayMainDocumentPartXml.java b/src/main/java/org/docx4j/samples/DisplayMainDocumentPartXml.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/DisplayMainDocumentPartXml.java
rename to src/main/java/org/docx4j/samples/DisplayMainDocumentPartXml.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/DocProps.java b/src/main/java/org/docx4j/samples/DocProps.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/DocProps.java
rename to src/main/java/org/docx4j/samples/DocProps.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/ExportInPackageFormat.java b/src/main/java/org/docx4j/samples/ExportInPackageFormat.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/ExportInPackageFormat.java
rename to src/main/java/org/docx4j/samples/ExportInPackageFormat.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/Filter.java b/src/main/java/org/docx4j/samples/Filter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/Filter.java
rename to src/main/java/org/docx4j/samples/Filter.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/HeaderFooterCreate.java b/src/main/java/org/docx4j/samples/HeaderFooterCreate.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/HeaderFooterCreate.java
rename to src/main/java/org/docx4j/samples/HeaderFooterCreate.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/HeaderFooterList.java b/src/main/java/org/docx4j/samples/HeaderFooterList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/HeaderFooterList.java
rename to src/main/java/org/docx4j/samples/HeaderFooterList.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/HyperlinkTest.java b/src/main/java/org/docx4j/samples/HyperlinkTest.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/HyperlinkTest.java
rename to src/main/java/org/docx4j/samples/HyperlinkTest.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/ImportForeignPart.java b/src/main/java/org/docx4j/samples/ImportForeignPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/ImportForeignPart.java
rename to src/main/java/org/docx4j/samples/ImportForeignPart.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/ImportFromPackageFormat.java b/src/main/java/org/docx4j/samples/ImportFromPackageFormat.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/ImportFromPackageFormat.java
rename to src/main/java/org/docx4j/samples/ImportFromPackageFormat.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/MergeDocx.java b/src/main/java/org/docx4j/samples/MergeDocx.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/MergeDocx.java
rename to src/main/java/org/docx4j/samples/MergeDocx.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/NumberingRestart.java b/src/main/java/org/docx4j/samples/NumberingRestart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/NumberingRestart.java
rename to src/main/java/org/docx4j/samples/NumberingRestart.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/OpenAndSaveRoundTripTest.java b/src/main/java/org/docx4j/samples/OpenAndSaveRoundTripTest.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/OpenAndSaveRoundTripTest.java
rename to src/main/java/org/docx4j/samples/OpenAndSaveRoundTripTest.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/OpenMainDocumentAndTraverse.java b/src/main/java/org/docx4j/samples/OpenMainDocumentAndTraverse.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/OpenMainDocumentAndTraverse.java
rename to src/main/java/org/docx4j/samples/OpenMainDocumentAndTraverse.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/PartsList.java b/src/main/java/org/docx4j/samples/PartsList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/PartsList.java
rename to src/main/java/org/docx4j/samples/PartsList.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/StripParts.java b/src/main/java/org/docx4j/samples/StripParts.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/StripParts.java
rename to src/main/java/org/docx4j/samples/StripParts.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/SubDocument.java b/src/main/java/org/docx4j/samples/SubDocument.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/SubDocument.java
rename to src/main/java/org/docx4j/samples/SubDocument.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/TemplateAttach.java b/src/main/java/org/docx4j/samples/TemplateAttach.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/TemplateAttach.java
rename to src/main/java/org/docx4j/samples/TemplateAttach.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/UnmarshallFromTemplate.java b/src/main/java/org/docx4j/samples/UnmarshallFromTemplate.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/UnmarshallFromTemplate.java
rename to src/main/java/org/docx4j/samples/UnmarshallFromTemplate.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/XHTMLImportDocument.java b/src/main/java/org/docx4j/samples/XHTMLImportDocument.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/XHTMLImportDocument.java
rename to src/main/java/org/docx4j/samples/XHTMLImportDocument.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/XHTMLImportFragment.java b/src/main/java/org/docx4j/samples/XHTMLImportFragment.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/XHTMLImportFragment.java
rename to src/main/java/org/docx4j/samples/XHTMLImportFragment.java
diff --git a/docx4j/src/main/java/org/docx4j/samples/XPathQuery.java b/src/main/java/org/docx4j/samples/XPathQuery.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/samples/XPathQuery.java
rename to src/main/java/org/docx4j/samples/XPathQuery.java
diff --git a/docx4j/src/main/java/org/docx4j/sharedtypes/ObjectFactory.java b/src/main/java/org/docx4j/sharedtypes/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/sharedtypes/ObjectFactory.java
rename to src/main/java/org/docx4j/sharedtypes/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/sharedtypes/STCalendarType.java b/src/main/java/org/docx4j/sharedtypes/STCalendarType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/sharedtypes/STCalendarType.java
rename to src/main/java/org/docx4j/sharedtypes/STCalendarType.java
diff --git a/docx4j/src/main/java/org/docx4j/sharedtypes/STConformanceClass.java b/src/main/java/org/docx4j/sharedtypes/STConformanceClass.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/sharedtypes/STConformanceClass.java
rename to src/main/java/org/docx4j/sharedtypes/STConformanceClass.java
diff --git a/docx4j/src/main/java/org/docx4j/sharedtypes/STVerticalAlignRun.java b/src/main/java/org/docx4j/sharedtypes/STVerticalAlignRun.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/sharedtypes/STVerticalAlignRun.java
rename to src/main/java/org/docx4j/sharedtypes/STVerticalAlignRun.java
diff --git a/docx4j/src/main/java/org/docx4j/sharedtypes/STXAlign.java b/src/main/java/org/docx4j/sharedtypes/STXAlign.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/sharedtypes/STXAlign.java
rename to src/main/java/org/docx4j/sharedtypes/STXAlign.java
diff --git a/docx4j/src/main/java/org/docx4j/sharedtypes/STYAlign.java b/src/main/java/org/docx4j/sharedtypes/STYAlign.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/sharedtypes/STYAlign.java
rename to src/main/java/org/docx4j/sharedtypes/STYAlign.java
diff --git a/docx4j/src/main/java/org/docx4j/utils/AbstractTraversalUtilVisitorCallback.java b/src/main/java/org/docx4j/utils/AbstractTraversalUtilVisitorCallback.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/utils/AbstractTraversalUtilVisitorCallback.java
rename to src/main/java/org/docx4j/utils/AbstractTraversalUtilVisitorCallback.java
diff --git a/docx4j/src/main/java/org/docx4j/utils/BufferUtil.java b/src/main/java/org/docx4j/utils/BufferUtil.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/utils/BufferUtil.java
rename to src/main/java/org/docx4j/utils/BufferUtil.java
diff --git a/docx4j/src/main/java/org/docx4j/utils/CompoundTraversalUtilVisitorCallback.java b/src/main/java/org/docx4j/utils/CompoundTraversalUtilVisitorCallback.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/utils/CompoundTraversalUtilVisitorCallback.java
rename to src/main/java/org/docx4j/utils/CompoundTraversalUtilVisitorCallback.java
diff --git a/docx4j/src/main/java/org/docx4j/utils/JarCheck.java b/src/main/java/org/docx4j/utils/JarCheck.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/utils/JarCheck.java
rename to src/main/java/org/docx4j/utils/JarCheck.java
diff --git a/docx4j/src/main/java/org/docx4j/utils/Log4jConfigurator.java b/src/main/java/org/docx4j/utils/Log4jConfigurator.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/utils/Log4jConfigurator.java
rename to src/main/java/org/docx4j/utils/Log4jConfigurator.java
diff --git a/docx4j/src/main/java/org/docx4j/utils/ResourceUtils.java b/src/main/java/org/docx4j/utils/ResourceUtils.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/utils/ResourceUtils.java
rename to src/main/java/org/docx4j/utils/ResourceUtils.java
diff --git a/docx4j/src/main/java/org/docx4j/utils/SingleTraversalUtilVisitorCallback.java b/src/main/java/org/docx4j/utils/SingleTraversalUtilVisitorCallback.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/utils/SingleTraversalUtilVisitorCallback.java
rename to src/main/java/org/docx4j/utils/SingleTraversalUtilVisitorCallback.java
diff --git a/docx4j/src/main/java/org/docx4j/utils/TraversalUtilVisitor.java b/src/main/java/org/docx4j/utils/TraversalUtilVisitor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/utils/TraversalUtilVisitor.java
rename to src/main/java/org/docx4j/utils/TraversalUtilVisitor.java
diff --git a/docx4j/src/main/java/org/docx4j/utils/XPathAwareCloner.java b/src/main/java/org/docx4j/utils/XPathAwareCloner.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/utils/XPathAwareCloner.java
rename to src/main/java/org/docx4j/utils/XPathAwareCloner.java
diff --git a/docx4j/src/main/java/org/docx4j/utils/XSLTUtils.java b/src/main/java/org/docx4j/utils/XSLTUtils.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/utils/XSLTUtils.java
rename to src/main/java/org/docx4j/utils/XSLTUtils.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTArc.java b/src/main/java/org/docx4j/vml/CTArc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTArc.java
rename to src/main/java/org/docx4j/vml/CTArc.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTBackground.java b/src/main/java/org/docx4j/vml/CTBackground.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTBackground.java
rename to src/main/java/org/docx4j/vml/CTBackground.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTCurve.java b/src/main/java/org/docx4j/vml/CTCurve.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTCurve.java
rename to src/main/java/org/docx4j/vml/CTCurve.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTF.java b/src/main/java/org/docx4j/vml/CTF.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTF.java
rename to src/main/java/org/docx4j/vml/CTF.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTFill.java b/src/main/java/org/docx4j/vml/CTFill.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTFill.java
rename to src/main/java/org/docx4j/vml/CTFill.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTFormulas.java b/src/main/java/org/docx4j/vml/CTFormulas.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTFormulas.java
rename to src/main/java/org/docx4j/vml/CTFormulas.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTGroup.java b/src/main/java/org/docx4j/vml/CTGroup.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTGroup.java
rename to src/main/java/org/docx4j/vml/CTGroup.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTH.java b/src/main/java/org/docx4j/vml/CTH.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTH.java
rename to src/main/java/org/docx4j/vml/CTH.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTHandles.java b/src/main/java/org/docx4j/vml/CTHandles.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTHandles.java
rename to src/main/java/org/docx4j/vml/CTHandles.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTImage.java b/src/main/java/org/docx4j/vml/CTImage.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTImage.java
rename to src/main/java/org/docx4j/vml/CTImage.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTImageData.java b/src/main/java/org/docx4j/vml/CTImageData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTImageData.java
rename to src/main/java/org/docx4j/vml/CTImageData.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTLine.java b/src/main/java/org/docx4j/vml/CTLine.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTLine.java
rename to src/main/java/org/docx4j/vml/CTLine.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTOval.java b/src/main/java/org/docx4j/vml/CTOval.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTOval.java
rename to src/main/java/org/docx4j/vml/CTOval.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTPath.java b/src/main/java/org/docx4j/vml/CTPath.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTPath.java
rename to src/main/java/org/docx4j/vml/CTPath.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTPolyLine.java b/src/main/java/org/docx4j/vml/CTPolyLine.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTPolyLine.java
rename to src/main/java/org/docx4j/vml/CTPolyLine.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTRect.java b/src/main/java/org/docx4j/vml/CTRect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTRect.java
rename to src/main/java/org/docx4j/vml/CTRect.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTRoundRect.java b/src/main/java/org/docx4j/vml/CTRoundRect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTRoundRect.java
rename to src/main/java/org/docx4j/vml/CTRoundRect.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTShadow.java b/src/main/java/org/docx4j/vml/CTShadow.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTShadow.java
rename to src/main/java/org/docx4j/vml/CTShadow.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTShape.java b/src/main/java/org/docx4j/vml/CTShape.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTShape.java
rename to src/main/java/org/docx4j/vml/CTShape.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTShapetype.java b/src/main/java/org/docx4j/vml/CTShapetype.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTShapetype.java
rename to src/main/java/org/docx4j/vml/CTShapetype.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTStroke.java b/src/main/java/org/docx4j/vml/CTStroke.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTStroke.java
rename to src/main/java/org/docx4j/vml/CTStroke.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTTextPath.java b/src/main/java/org/docx4j/vml/CTTextPath.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTTextPath.java
rename to src/main/java/org/docx4j/vml/CTTextPath.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/CTTextbox.java b/src/main/java/org/docx4j/vml/CTTextbox.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/CTTextbox.java
rename to src/main/java/org/docx4j/vml/CTTextbox.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/ObjectFactory.java b/src/main/java/org/docx4j/vml/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/ObjectFactory.java
rename to src/main/java/org/docx4j/vml/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/STEditAs.java b/src/main/java/org/docx4j/vml/STEditAs.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/STEditAs.java
rename to src/main/java/org/docx4j/vml/STEditAs.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/STExt.java b/src/main/java/org/docx4j/vml/STExt.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/STExt.java
rename to src/main/java/org/docx4j/vml/STExt.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/STFillMethod.java b/src/main/java/org/docx4j/vml/STFillMethod.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/STFillMethod.java
rename to src/main/java/org/docx4j/vml/STFillMethod.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/STFillType.java b/src/main/java/org/docx4j/vml/STFillType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/STFillType.java
rename to src/main/java/org/docx4j/vml/STFillType.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/STImageAspect.java b/src/main/java/org/docx4j/vml/STImageAspect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/STImageAspect.java
rename to src/main/java/org/docx4j/vml/STImageAspect.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/STShadowType.java b/src/main/java/org/docx4j/vml/STShadowType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/STShadowType.java
rename to src/main/java/org/docx4j/vml/STShadowType.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/STStrokeArrowLength.java b/src/main/java/org/docx4j/vml/STStrokeArrowLength.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/STStrokeArrowLength.java
rename to src/main/java/org/docx4j/vml/STStrokeArrowLength.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/STStrokeArrowType.java b/src/main/java/org/docx4j/vml/STStrokeArrowType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/STStrokeArrowType.java
rename to src/main/java/org/docx4j/vml/STStrokeArrowType.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/STStrokeArrowWidth.java b/src/main/java/org/docx4j/vml/STStrokeArrowWidth.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/STStrokeArrowWidth.java
rename to src/main/java/org/docx4j/vml/STStrokeArrowWidth.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/STStrokeEndCap.java b/src/main/java/org/docx4j/vml/STStrokeEndCap.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/STStrokeEndCap.java
rename to src/main/java/org/docx4j/vml/STStrokeEndCap.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/STStrokeJoinStyle.java b/src/main/java/org/docx4j/vml/STStrokeJoinStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/STStrokeJoinStyle.java
rename to src/main/java/org/docx4j/vml/STStrokeJoinStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/STStrokeLineStyle.java b/src/main/java/org/docx4j/vml/STStrokeLineStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/STStrokeLineStyle.java
rename to src/main/java/org/docx4j/vml/STStrokeLineStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/STTrueFalse.java b/src/main/java/org/docx4j/vml/STTrueFalse.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/STTrueFalse.java
rename to src/main/java/org/docx4j/vml/STTrueFalse.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTCallout.java b/src/main/java/org/docx4j/vml/officedrawing/CTCallout.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTCallout.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTCallout.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTClipPath.java b/src/main/java/org/docx4j/vml/officedrawing/CTClipPath.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTClipPath.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTClipPath.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTColorMenu.java b/src/main/java/org/docx4j/vml/officedrawing/CTColorMenu.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTColorMenu.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTColorMenu.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTColorMru.java b/src/main/java/org/docx4j/vml/officedrawing/CTColorMru.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTColorMru.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTColorMru.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTComplex.java b/src/main/java/org/docx4j/vml/officedrawing/CTComplex.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTComplex.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTComplex.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTDiagram.java b/src/main/java/org/docx4j/vml/officedrawing/CTDiagram.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTDiagram.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTDiagram.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTEntry.java b/src/main/java/org/docx4j/vml/officedrawing/CTEntry.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTEntry.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTEntry.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTExtrusion.java b/src/main/java/org/docx4j/vml/officedrawing/CTExtrusion.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTExtrusion.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTExtrusion.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTFill.java b/src/main/java/org/docx4j/vml/officedrawing/CTFill.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTFill.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTFill.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTIdMap.java b/src/main/java/org/docx4j/vml/officedrawing/CTIdMap.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTIdMap.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTIdMap.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTInk.java b/src/main/java/org/docx4j/vml/officedrawing/CTInk.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTInk.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTInk.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTLock.java b/src/main/java/org/docx4j/vml/officedrawing/CTLock.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTLock.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTLock.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTOLEObject.java b/src/main/java/org/docx4j/vml/officedrawing/CTOLEObject.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTOLEObject.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTOLEObject.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTProxy.java b/src/main/java/org/docx4j/vml/officedrawing/CTProxy.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTProxy.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTProxy.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTR.java b/src/main/java/org/docx4j/vml/officedrawing/CTR.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTR.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTR.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTRegroupTable.java b/src/main/java/org/docx4j/vml/officedrawing/CTRegroupTable.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTRegroupTable.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTRegroupTable.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTRelation.java b/src/main/java/org/docx4j/vml/officedrawing/CTRelation.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTRelation.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTRelation.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTRelationTable.java b/src/main/java/org/docx4j/vml/officedrawing/CTRelationTable.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTRelationTable.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTRelationTable.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTRules.java b/src/main/java/org/docx4j/vml/officedrawing/CTRules.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTRules.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTRules.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTShapeDefaults.java b/src/main/java/org/docx4j/vml/officedrawing/CTShapeDefaults.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTShapeDefaults.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTShapeDefaults.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTShapeLayout.java b/src/main/java/org/docx4j/vml/officedrawing/CTShapeLayout.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTShapeLayout.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTShapeLayout.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTSignatureLine.java b/src/main/java/org/docx4j/vml/officedrawing/CTSignatureLine.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTSignatureLine.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTSignatureLine.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTSkew.java b/src/main/java/org/docx4j/vml/officedrawing/CTSkew.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTSkew.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTSkew.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/CTStrokeChild.java b/src/main/java/org/docx4j/vml/officedrawing/CTStrokeChild.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/CTStrokeChild.java
rename to src/main/java/org/docx4j/vml/officedrawing/CTStrokeChild.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/ObjectFactory.java b/src/main/java/org/docx4j/vml/officedrawing/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/ObjectFactory.java
rename to src/main/java/org/docx4j/vml/officedrawing/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STBWMode.java b/src/main/java/org/docx4j/vml/officedrawing/STBWMode.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STBWMode.java
rename to src/main/java/org/docx4j/vml/officedrawing/STBWMode.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STCalloutPlacement.java b/src/main/java/org/docx4j/vml/officedrawing/STCalloutPlacement.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STCalloutPlacement.java
rename to src/main/java/org/docx4j/vml/officedrawing/STCalloutPlacement.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STColorMode.java b/src/main/java/org/docx4j/vml/officedrawing/STColorMode.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STColorMode.java
rename to src/main/java/org/docx4j/vml/officedrawing/STColorMode.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STConnectType.java b/src/main/java/org/docx4j/vml/officedrawing/STConnectType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STConnectType.java
rename to src/main/java/org/docx4j/vml/officedrawing/STConnectType.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STConnectorType.java b/src/main/java/org/docx4j/vml/officedrawing/STConnectorType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STConnectorType.java
rename to src/main/java/org/docx4j/vml/officedrawing/STConnectorType.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STExtrusionPlane.java b/src/main/java/org/docx4j/vml/officedrawing/STExtrusionPlane.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STExtrusionPlane.java
rename to src/main/java/org/docx4j/vml/officedrawing/STExtrusionPlane.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STExtrusionRender.java b/src/main/java/org/docx4j/vml/officedrawing/STExtrusionRender.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STExtrusionRender.java
rename to src/main/java/org/docx4j/vml/officedrawing/STExtrusionRender.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STExtrusionType.java b/src/main/java/org/docx4j/vml/officedrawing/STExtrusionType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STExtrusionType.java
rename to src/main/java/org/docx4j/vml/officedrawing/STExtrusionType.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STFillType.java b/src/main/java/org/docx4j/vml/officedrawing/STFillType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STFillType.java
rename to src/main/java/org/docx4j/vml/officedrawing/STFillType.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STHow.java b/src/main/java/org/docx4j/vml/officedrawing/STHow.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STHow.java
rename to src/main/java/org/docx4j/vml/officedrawing/STHow.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STHrAlign.java b/src/main/java/org/docx4j/vml/officedrawing/STHrAlign.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STHrAlign.java
rename to src/main/java/org/docx4j/vml/officedrawing/STHrAlign.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STInsetMode.java b/src/main/java/org/docx4j/vml/officedrawing/STInsetMode.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STInsetMode.java
rename to src/main/java/org/docx4j/vml/officedrawing/STInsetMode.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STOLEDrawAspect.java b/src/main/java/org/docx4j/vml/officedrawing/STOLEDrawAspect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STOLEDrawAspect.java
rename to src/main/java/org/docx4j/vml/officedrawing/STOLEDrawAspect.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STOLELinkType.java b/src/main/java/org/docx4j/vml/officedrawing/STOLELinkType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STOLELinkType.java
rename to src/main/java/org/docx4j/vml/officedrawing/STOLELinkType.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STOLEType.java b/src/main/java/org/docx4j/vml/officedrawing/STOLEType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STOLEType.java
rename to src/main/java/org/docx4j/vml/officedrawing/STOLEType.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STOLEUpdateMode.java b/src/main/java/org/docx4j/vml/officedrawing/STOLEUpdateMode.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STOLEUpdateMode.java
rename to src/main/java/org/docx4j/vml/officedrawing/STOLEUpdateMode.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STRType.java b/src/main/java/org/docx4j/vml/officedrawing/STRType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STRType.java
rename to src/main/java/org/docx4j/vml/officedrawing/STRType.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/STTrueFalse.java b/src/main/java/org/docx4j/vml/officedrawing/STTrueFalse.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/STTrueFalse.java
rename to src/main/java/org/docx4j/vml/officedrawing/STTrueFalse.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/officedrawing/package-info.java b/src/main/java/org/docx4j/vml/officedrawing/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/officedrawing/package-info.java
rename to src/main/java/org/docx4j/vml/officedrawing/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/package-info.java b/src/main/java/org/docx4j/vml/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/package-info.java
rename to src/main/java/org/docx4j/vml/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/presentationDrawing/CTEmpty.java b/src/main/java/org/docx4j/vml/presentationDrawing/CTEmpty.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/presentationDrawing/CTEmpty.java
rename to src/main/java/org/docx4j/vml/presentationDrawing/CTEmpty.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/presentationDrawing/CTRel.java b/src/main/java/org/docx4j/vml/presentationDrawing/CTRel.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/presentationDrawing/CTRel.java
rename to src/main/java/org/docx4j/vml/presentationDrawing/CTRel.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/presentationDrawing/ObjectFactory.java b/src/main/java/org/docx4j/vml/presentationDrawing/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/presentationDrawing/ObjectFactory.java
rename to src/main/java/org/docx4j/vml/presentationDrawing/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/presentationDrawing/header.txt b/src/main/java/org/docx4j/vml/presentationDrawing/header.txt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/presentationDrawing/header.txt
rename to src/main/java/org/docx4j/vml/presentationDrawing/header.txt
diff --git a/docx4j/src/main/java/org/docx4j/vml/presentationDrawing/package-info.java b/src/main/java/org/docx4j/vml/presentationDrawing/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/presentationDrawing/package-info.java
rename to src/main/java/org/docx4j/vml/presentationDrawing/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/presentationDrawing/script b/src/main/java/org/docx4j/vml/presentationDrawing/script
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/presentationDrawing/script
rename to src/main/java/org/docx4j/vml/presentationDrawing/script
diff --git a/docx4j/src/main/java/org/docx4j/vml/root/ObjectFactory.java b/src/main/java/org/docx4j/vml/root/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/root/ObjectFactory.java
rename to src/main/java/org/docx4j/vml/root/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/root/Xml.java b/src/main/java/org/docx4j/vml/root/Xml.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/root/Xml.java
rename to src/main/java/org/docx4j/vml/root/Xml.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/root/header.txt b/src/main/java/org/docx4j/vml/root/header.txt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/root/header.txt
rename to src/main/java/org/docx4j/vml/root/header.txt
diff --git a/docx4j/src/main/java/org/docx4j/vml/root/script b/src/main/java/org/docx4j/vml/root/script
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/root/script
rename to src/main/java/org/docx4j/vml/root/script
diff --git a/docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/CTClientData.java b/src/main/java/org/docx4j/vml/spreadsheetDrawing/CTClientData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/CTClientData.java
rename to src/main/java/org/docx4j/vml/spreadsheetDrawing/CTClientData.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/ObjectFactory.java b/src/main/java/org/docx4j/vml/spreadsheetDrawing/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/ObjectFactory.java
rename to src/main/java/org/docx4j/vml/spreadsheetDrawing/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/STCF.java b/src/main/java/org/docx4j/vml/spreadsheetDrawing/STCF.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/STCF.java
rename to src/main/java/org/docx4j/vml/spreadsheetDrawing/STCF.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/STObjectType.java b/src/main/java/org/docx4j/vml/spreadsheetDrawing/STObjectType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/STObjectType.java
rename to src/main/java/org/docx4j/vml/spreadsheetDrawing/STObjectType.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/header.txt b/src/main/java/org/docx4j/vml/spreadsheetDrawing/header.txt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/header.txt
rename to src/main/java/org/docx4j/vml/spreadsheetDrawing/header.txt
diff --git a/docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/package-info.java b/src/main/java/org/docx4j/vml/spreadsheetDrawing/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/package-info.java
rename to src/main/java/org/docx4j/vml/spreadsheetDrawing/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/script b/src/main/java/org/docx4j/vml/spreadsheetDrawing/script
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/spreadsheetDrawing/script
rename to src/main/java/org/docx4j/vml/spreadsheetDrawing/script
diff --git a/docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/CTAnchorLock.java b/src/main/java/org/docx4j/vml/wordprocessingDrawing/CTAnchorLock.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/CTAnchorLock.java
rename to src/main/java/org/docx4j/vml/wordprocessingDrawing/CTAnchorLock.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/CTBorder.java b/src/main/java/org/docx4j/vml/wordprocessingDrawing/CTBorder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/CTBorder.java
rename to src/main/java/org/docx4j/vml/wordprocessingDrawing/CTBorder.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/CTWrap.java b/src/main/java/org/docx4j/vml/wordprocessingDrawing/CTWrap.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/CTWrap.java
rename to src/main/java/org/docx4j/vml/wordprocessingDrawing/CTWrap.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/ObjectFactory.java b/src/main/java/org/docx4j/vml/wordprocessingDrawing/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/ObjectFactory.java
rename to src/main/java/org/docx4j/vml/wordprocessingDrawing/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/STBorderShadow.java b/src/main/java/org/docx4j/vml/wordprocessingDrawing/STBorderShadow.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/STBorderShadow.java
rename to src/main/java/org/docx4j/vml/wordprocessingDrawing/STBorderShadow.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/STBorderType.java b/src/main/java/org/docx4j/vml/wordprocessingDrawing/STBorderType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/STBorderType.java
rename to src/main/java/org/docx4j/vml/wordprocessingDrawing/STBorderType.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/STHorizontalAnchor.java b/src/main/java/org/docx4j/vml/wordprocessingDrawing/STHorizontalAnchor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/STHorizontalAnchor.java
rename to src/main/java/org/docx4j/vml/wordprocessingDrawing/STHorizontalAnchor.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/STVerticalAnchor.java b/src/main/java/org/docx4j/vml/wordprocessingDrawing/STVerticalAnchor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/STVerticalAnchor.java
rename to src/main/java/org/docx4j/vml/wordprocessingDrawing/STVerticalAnchor.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/STWrapSide.java b/src/main/java/org/docx4j/vml/wordprocessingDrawing/STWrapSide.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/STWrapSide.java
rename to src/main/java/org/docx4j/vml/wordprocessingDrawing/STWrapSide.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/STWrapType.java b/src/main/java/org/docx4j/vml/wordprocessingDrawing/STWrapType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/STWrapType.java
rename to src/main/java/org/docx4j/vml/wordprocessingDrawing/STWrapType.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/header.txt b/src/main/java/org/docx4j/vml/wordprocessingDrawing/header.txt
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/header.txt
rename to src/main/java/org/docx4j/vml/wordprocessingDrawing/header.txt
diff --git a/docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/package-info.java b/src/main/java/org/docx4j/vml/wordprocessingDrawing/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/package-info.java
rename to src/main/java/org/docx4j/vml/wordprocessingDrawing/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/script b/src/main/java/org/docx4j/vml/wordprocessingDrawing/script
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/vml/wordprocessingDrawing/script
rename to src/main/java/org/docx4j/vml/wordprocessingDrawing/script
diff --git a/docx4j/src/main/java/org/docx4j/wml/BigIntegerAdapter.java b/src/main/java/org/docx4j/wml/BigIntegerAdapter.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/BigIntegerAdapter.java
rename to src/main/java/org/docx4j/wml/BigIntegerAdapter.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Body.java b/src/main/java/org/docx4j/wml/Body.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Body.java
rename to src/main/java/org/docx4j/wml/Body.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/BooleanDefaultFalse.java b/src/main/java/org/docx4j/wml/BooleanDefaultFalse.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/BooleanDefaultFalse.java
rename to src/main/java/org/docx4j/wml/BooleanDefaultFalse.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/BooleanDefaultTrue.java b/src/main/java/org/docx4j/wml/BooleanDefaultTrue.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/BooleanDefaultTrue.java
rename to src/main/java/org/docx4j/wml/BooleanDefaultTrue.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Br.java b/src/main/java/org/docx4j/wml/Br.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Br.java
rename to src/main/java/org/docx4j/wml/Br.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTAltChunk.java b/src/main/java/org/docx4j/wml/CTAltChunk.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTAltChunk.java
rename to src/main/java/org/docx4j/wml/CTAltChunk.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTAltChunkPr.java b/src/main/java/org/docx4j/wml/CTAltChunkPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTAltChunkPr.java
rename to src/main/java/org/docx4j/wml/CTAltChunkPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTAttr.java b/src/main/java/org/docx4j/wml/CTAttr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTAttr.java
rename to src/main/java/org/docx4j/wml/CTAttr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTAutoCaption.java b/src/main/java/org/docx4j/wml/CTAutoCaption.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTAutoCaption.java
rename to src/main/java/org/docx4j/wml/CTAutoCaption.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTAutoCaptions.java b/src/main/java/org/docx4j/wml/CTAutoCaptions.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTAutoCaptions.java
rename to src/main/java/org/docx4j/wml/CTAutoCaptions.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTBackground.java b/src/main/java/org/docx4j/wml/CTBackground.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTBackground.java
rename to src/main/java/org/docx4j/wml/CTBackground.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTBookmark.java b/src/main/java/org/docx4j/wml/CTBookmark.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTBookmark.java
rename to src/main/java/org/docx4j/wml/CTBookmark.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTBookmarkRange.java b/src/main/java/org/docx4j/wml/CTBookmarkRange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTBookmarkRange.java
rename to src/main/java/org/docx4j/wml/CTBookmarkRange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTBorder.java b/src/main/java/org/docx4j/wml/CTBorder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTBorder.java
rename to src/main/java/org/docx4j/wml/CTBorder.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCalendarType.java b/src/main/java/org/docx4j/wml/CTCalendarType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCalendarType.java
rename to src/main/java/org/docx4j/wml/CTCalendarType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCaption.java b/src/main/java/org/docx4j/wml/CTCaption.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCaption.java
rename to src/main/java/org/docx4j/wml/CTCaption.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCaptions.java b/src/main/java/org/docx4j/wml/CTCaptions.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCaptions.java
rename to src/main/java/org/docx4j/wml/CTCaptions.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCellMergeTrackChange.java b/src/main/java/org/docx4j/wml/CTCellMergeTrackChange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCellMergeTrackChange.java
rename to src/main/java/org/docx4j/wml/CTCellMergeTrackChange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCharacterSpacing.java b/src/main/java/org/docx4j/wml/CTCharacterSpacing.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCharacterSpacing.java
rename to src/main/java/org/docx4j/wml/CTCharacterSpacing.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCnf.java b/src/main/java/org/docx4j/wml/CTCnf.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCnf.java
rename to src/main/java/org/docx4j/wml/CTCnf.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTColorSchemeMapping.java b/src/main/java/org/docx4j/wml/CTColorSchemeMapping.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTColorSchemeMapping.java
rename to src/main/java/org/docx4j/wml/CTColorSchemeMapping.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTColumn.java b/src/main/java/org/docx4j/wml/CTColumn.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTColumn.java
rename to src/main/java/org/docx4j/wml/CTColumn.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTColumns.java b/src/main/java/org/docx4j/wml/CTColumns.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTColumns.java
rename to src/main/java/org/docx4j/wml/CTColumns.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCompat.java b/src/main/java/org/docx4j/wml/CTCompat.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCompat.java
rename to src/main/java/org/docx4j/wml/CTCompat.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCompatSetting.java b/src/main/java/org/docx4j/wml/CTCompatSetting.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCompatSetting.java
rename to src/main/java/org/docx4j/wml/CTCompatSetting.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTControl.java b/src/main/java/org/docx4j/wml/CTControl.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTControl.java
rename to src/main/java/org/docx4j/wml/CTControl.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCustomXmlBlock.java b/src/main/java/org/docx4j/wml/CTCustomXmlBlock.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCustomXmlBlock.java
rename to src/main/java/org/docx4j/wml/CTCustomXmlBlock.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCustomXmlCell.java b/src/main/java/org/docx4j/wml/CTCustomXmlCell.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCustomXmlCell.java
rename to src/main/java/org/docx4j/wml/CTCustomXmlCell.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCustomXmlElement.java b/src/main/java/org/docx4j/wml/CTCustomXmlElement.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCustomXmlElement.java
rename to src/main/java/org/docx4j/wml/CTCustomXmlElement.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCustomXmlPr.java b/src/main/java/org/docx4j/wml/CTCustomXmlPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCustomXmlPr.java
rename to src/main/java/org/docx4j/wml/CTCustomXmlPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCustomXmlRow.java b/src/main/java/org/docx4j/wml/CTCustomXmlRow.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCustomXmlRow.java
rename to src/main/java/org/docx4j/wml/CTCustomXmlRow.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTCustomXmlRun.java b/src/main/java/org/docx4j/wml/CTCustomXmlRun.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTCustomXmlRun.java
rename to src/main/java/org/docx4j/wml/CTCustomXmlRun.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDataBinding.java b/src/main/java/org/docx4j/wml/CTDataBinding.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDataBinding.java
rename to src/main/java/org/docx4j/wml/CTDataBinding.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDiv.java b/src/main/java/org/docx4j/wml/CTDiv.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDiv.java
rename to src/main/java/org/docx4j/wml/CTDiv.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDivBdr.java b/src/main/java/org/docx4j/wml/CTDivBdr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDivBdr.java
rename to src/main/java/org/docx4j/wml/CTDivBdr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDivs.java b/src/main/java/org/docx4j/wml/CTDivs.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDivs.java
rename to src/main/java/org/docx4j/wml/CTDivs.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocGrid.java b/src/main/java/org/docx4j/wml/CTDocGrid.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocGrid.java
rename to src/main/java/org/docx4j/wml/CTDocGrid.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocPart.java b/src/main/java/org/docx4j/wml/CTDocPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocPart.java
rename to src/main/java/org/docx4j/wml/CTDocPart.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocPartBehavior.java b/src/main/java/org/docx4j/wml/CTDocPartBehavior.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocPartBehavior.java
rename to src/main/java/org/docx4j/wml/CTDocPartBehavior.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocPartBehaviors.java b/src/main/java/org/docx4j/wml/CTDocPartBehaviors.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocPartBehaviors.java
rename to src/main/java/org/docx4j/wml/CTDocPartBehaviors.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocPartCategory.java b/src/main/java/org/docx4j/wml/CTDocPartCategory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocPartCategory.java
rename to src/main/java/org/docx4j/wml/CTDocPartCategory.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocPartGallery.java b/src/main/java/org/docx4j/wml/CTDocPartGallery.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocPartGallery.java
rename to src/main/java/org/docx4j/wml/CTDocPartGallery.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocPartName.java b/src/main/java/org/docx4j/wml/CTDocPartName.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocPartName.java
rename to src/main/java/org/docx4j/wml/CTDocPartName.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocPartPr.java b/src/main/java/org/docx4j/wml/CTDocPartPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocPartPr.java
rename to src/main/java/org/docx4j/wml/CTDocPartPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocPartType.java b/src/main/java/org/docx4j/wml/CTDocPartType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocPartType.java
rename to src/main/java/org/docx4j/wml/CTDocPartType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocPartTypes.java b/src/main/java/org/docx4j/wml/CTDocPartTypes.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocPartTypes.java
rename to src/main/java/org/docx4j/wml/CTDocPartTypes.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocParts.java b/src/main/java/org/docx4j/wml/CTDocParts.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocParts.java
rename to src/main/java/org/docx4j/wml/CTDocParts.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocProtect.java b/src/main/java/org/docx4j/wml/CTDocProtect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocProtect.java
rename to src/main/java/org/docx4j/wml/CTDocProtect.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocRsids.java b/src/main/java/org/docx4j/wml/CTDocRsids.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocRsids.java
rename to src/main/java/org/docx4j/wml/CTDocRsids.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocType.java b/src/main/java/org/docx4j/wml/CTDocType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocType.java
rename to src/main/java/org/docx4j/wml/CTDocType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocVar.java b/src/main/java/org/docx4j/wml/CTDocVar.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocVar.java
rename to src/main/java/org/docx4j/wml/CTDocVar.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTDocVars.java b/src/main/java/org/docx4j/wml/CTDocVars.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTDocVars.java
rename to src/main/java/org/docx4j/wml/CTDocVars.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTEastAsianLayout.java b/src/main/java/org/docx4j/wml/CTEastAsianLayout.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTEastAsianLayout.java
rename to src/main/java/org/docx4j/wml/CTEastAsianLayout.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTEdnDocProps.java b/src/main/java/org/docx4j/wml/CTEdnDocProps.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTEdnDocProps.java
rename to src/main/java/org/docx4j/wml/CTEdnDocProps.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTEdnPos.java b/src/main/java/org/docx4j/wml/CTEdnPos.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTEdnPos.java
rename to src/main/java/org/docx4j/wml/CTEdnPos.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTEdnProps.java b/src/main/java/org/docx4j/wml/CTEdnProps.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTEdnProps.java
rename to src/main/java/org/docx4j/wml/CTEdnProps.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTEm.java b/src/main/java/org/docx4j/wml/CTEm.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTEm.java
rename to src/main/java/org/docx4j/wml/CTEm.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTEmpty.java b/src/main/java/org/docx4j/wml/CTEmpty.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTEmpty.java
rename to src/main/java/org/docx4j/wml/CTEmpty.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTEndnotes.java b/src/main/java/org/docx4j/wml/CTEndnotes.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTEndnotes.java
rename to src/main/java/org/docx4j/wml/CTEndnotes.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFFCheckBox.java b/src/main/java/org/docx4j/wml/CTFFCheckBox.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFFCheckBox.java
rename to src/main/java/org/docx4j/wml/CTFFCheckBox.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFFDDList.java b/src/main/java/org/docx4j/wml/CTFFDDList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFFDDList.java
rename to src/main/java/org/docx4j/wml/CTFFDDList.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFFData.java b/src/main/java/org/docx4j/wml/CTFFData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFFData.java
rename to src/main/java/org/docx4j/wml/CTFFData.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFFHelpText.java b/src/main/java/org/docx4j/wml/CTFFHelpText.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFFHelpText.java
rename to src/main/java/org/docx4j/wml/CTFFHelpText.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFFName.java b/src/main/java/org/docx4j/wml/CTFFName.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFFName.java
rename to src/main/java/org/docx4j/wml/CTFFName.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFFStatusText.java b/src/main/java/org/docx4j/wml/CTFFStatusText.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFFStatusText.java
rename to src/main/java/org/docx4j/wml/CTFFStatusText.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFFTextInput.java b/src/main/java/org/docx4j/wml/CTFFTextInput.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFFTextInput.java
rename to src/main/java/org/docx4j/wml/CTFFTextInput.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFFTextType.java b/src/main/java/org/docx4j/wml/CTFFTextType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFFTextType.java
rename to src/main/java/org/docx4j/wml/CTFFTextType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFitText.java b/src/main/java/org/docx4j/wml/CTFitText.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFitText.java
rename to src/main/java/org/docx4j/wml/CTFitText.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFootnotes.java b/src/main/java/org/docx4j/wml/CTFootnotes.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFootnotes.java
rename to src/main/java/org/docx4j/wml/CTFootnotes.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFrame.java b/src/main/java/org/docx4j/wml/CTFrame.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFrame.java
rename to src/main/java/org/docx4j/wml/CTFrame.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFrameLayout.java b/src/main/java/org/docx4j/wml/CTFrameLayout.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFrameLayout.java
rename to src/main/java/org/docx4j/wml/CTFrameLayout.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFramePr.java b/src/main/java/org/docx4j/wml/CTFramePr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFramePr.java
rename to src/main/java/org/docx4j/wml/CTFramePr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFrameScrollbar.java b/src/main/java/org/docx4j/wml/CTFrameScrollbar.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFrameScrollbar.java
rename to src/main/java/org/docx4j/wml/CTFrameScrollbar.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFrameset.java b/src/main/java/org/docx4j/wml/CTFrameset.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFrameset.java
rename to src/main/java/org/docx4j/wml/CTFrameset.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFramesetSplitbar.java b/src/main/java/org/docx4j/wml/CTFramesetSplitbar.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFramesetSplitbar.java
rename to src/main/java/org/docx4j/wml/CTFramesetSplitbar.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFtnDocProps.java b/src/main/java/org/docx4j/wml/CTFtnDocProps.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFtnDocProps.java
rename to src/main/java/org/docx4j/wml/CTFtnDocProps.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFtnEdn.java b/src/main/java/org/docx4j/wml/CTFtnEdn.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFtnEdn.java
rename to src/main/java/org/docx4j/wml/CTFtnEdn.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFtnEdnRef.java b/src/main/java/org/docx4j/wml/CTFtnEdnRef.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFtnEdnRef.java
rename to src/main/java/org/docx4j/wml/CTFtnEdnRef.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFtnEdnSepRef.java b/src/main/java/org/docx4j/wml/CTFtnEdnSepRef.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFtnEdnSepRef.java
rename to src/main/java/org/docx4j/wml/CTFtnEdnSepRef.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFtnPos.java b/src/main/java/org/docx4j/wml/CTFtnPos.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFtnPos.java
rename to src/main/java/org/docx4j/wml/CTFtnPos.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTFtnProps.java b/src/main/java/org/docx4j/wml/CTFtnProps.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTFtnProps.java
rename to src/main/java/org/docx4j/wml/CTFtnProps.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTGuid.java b/src/main/java/org/docx4j/wml/CTGuid.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTGuid.java
rename to src/main/java/org/docx4j/wml/CTGuid.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTHeight.java b/src/main/java/org/docx4j/wml/CTHeight.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTHeight.java
rename to src/main/java/org/docx4j/wml/CTHeight.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTKinsoku.java b/src/main/java/org/docx4j/wml/CTKinsoku.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTKinsoku.java
rename to src/main/java/org/docx4j/wml/CTKinsoku.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTLang.java b/src/main/java/org/docx4j/wml/CTLang.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTLang.java
rename to src/main/java/org/docx4j/wml/CTLang.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTLanguage.java b/src/main/java/org/docx4j/wml/CTLanguage.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTLanguage.java
rename to src/main/java/org/docx4j/wml/CTLanguage.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTLineNumber.java b/src/main/java/org/docx4j/wml/CTLineNumber.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTLineNumber.java
rename to src/main/java/org/docx4j/wml/CTLineNumber.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTLock.java b/src/main/java/org/docx4j/wml/CTLock.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTLock.java
rename to src/main/java/org/docx4j/wml/CTLock.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTLongHexNumber.java b/src/main/java/org/docx4j/wml/CTLongHexNumber.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTLongHexNumber.java
rename to src/main/java/org/docx4j/wml/CTLongHexNumber.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTMacroName.java b/src/main/java/org/docx4j/wml/CTMacroName.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTMacroName.java
rename to src/main/java/org/docx4j/wml/CTMacroName.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTMailMerge.java b/src/main/java/org/docx4j/wml/CTMailMerge.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTMailMerge.java
rename to src/main/java/org/docx4j/wml/CTMailMerge.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTMailMergeDataType.java b/src/main/java/org/docx4j/wml/CTMailMergeDataType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTMailMergeDataType.java
rename to src/main/java/org/docx4j/wml/CTMailMergeDataType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTMailMergeDest.java b/src/main/java/org/docx4j/wml/CTMailMergeDest.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTMailMergeDest.java
rename to src/main/java/org/docx4j/wml/CTMailMergeDest.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTMailMergeDocType.java b/src/main/java/org/docx4j/wml/CTMailMergeDocType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTMailMergeDocType.java
rename to src/main/java/org/docx4j/wml/CTMailMergeDocType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTMailMergeOdsoFMDFieldType.java b/src/main/java/org/docx4j/wml/CTMailMergeOdsoFMDFieldType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTMailMergeOdsoFMDFieldType.java
rename to src/main/java/org/docx4j/wml/CTMailMergeOdsoFMDFieldType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTMailMergeSourceType.java b/src/main/java/org/docx4j/wml/CTMailMergeSourceType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTMailMergeSourceType.java
rename to src/main/java/org/docx4j/wml/CTMailMergeSourceType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTMarkup.java b/src/main/java/org/docx4j/wml/CTMarkup.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTMarkup.java
rename to src/main/java/org/docx4j/wml/CTMarkup.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTMarkupRange.java b/src/main/java/org/docx4j/wml/CTMarkupRange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTMarkupRange.java
rename to src/main/java/org/docx4j/wml/CTMarkupRange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTMoveBookmark.java b/src/main/java/org/docx4j/wml/CTMoveBookmark.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTMoveBookmark.java
rename to src/main/java/org/docx4j/wml/CTMoveBookmark.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTNumRestart.java b/src/main/java/org/docx4j/wml/CTNumRestart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTNumRestart.java
rename to src/main/java/org/docx4j/wml/CTNumRestart.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTObject.java b/src/main/java/org/docx4j/wml/CTObject.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTObject.java
rename to src/main/java/org/docx4j/wml/CTObject.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTOdso.java b/src/main/java/org/docx4j/wml/CTOdso.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTOdso.java
rename to src/main/java/org/docx4j/wml/CTOdso.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTOdsoFieldMapData.java b/src/main/java/org/docx4j/wml/CTOdsoFieldMapData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTOdsoFieldMapData.java
rename to src/main/java/org/docx4j/wml/CTOdsoFieldMapData.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTPPrChange.java b/src/main/java/org/docx4j/wml/CTPPrChange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTPPrChange.java
rename to src/main/java/org/docx4j/wml/CTPPrChange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTPPrDefault.java b/src/main/java/org/docx4j/wml/CTPPrDefault.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTPPrDefault.java
rename to src/main/java/org/docx4j/wml/CTPPrDefault.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTPageNumber.java b/src/main/java/org/docx4j/wml/CTPageNumber.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTPageNumber.java
rename to src/main/java/org/docx4j/wml/CTPageNumber.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTPaperSource.java b/src/main/java/org/docx4j/wml/CTPaperSource.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTPaperSource.java
rename to src/main/java/org/docx4j/wml/CTPaperSource.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTParaRPrOriginal.java b/src/main/java/org/docx4j/wml/CTParaRPrOriginal.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTParaRPrOriginal.java
rename to src/main/java/org/docx4j/wml/CTParaRPrOriginal.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTPerm.java b/src/main/java/org/docx4j/wml/CTPerm.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTPerm.java
rename to src/main/java/org/docx4j/wml/CTPerm.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTPictureBase.java b/src/main/java/org/docx4j/wml/CTPictureBase.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTPictureBase.java
rename to src/main/java/org/docx4j/wml/CTPictureBase.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTPixelsMeasure.java b/src/main/java/org/docx4j/wml/CTPixelsMeasure.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTPixelsMeasure.java
rename to src/main/java/org/docx4j/wml/CTPixelsMeasure.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTPlaceholder.java b/src/main/java/org/docx4j/wml/CTPlaceholder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTPlaceholder.java
rename to src/main/java/org/docx4j/wml/CTPlaceholder.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTProof.java b/src/main/java/org/docx4j/wml/CTProof.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTProof.java
rename to src/main/java/org/docx4j/wml/CTProof.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTRPrChange.java b/src/main/java/org/docx4j/wml/CTRPrChange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTRPrChange.java
rename to src/main/java/org/docx4j/wml/CTRPrChange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTRPrDefault.java b/src/main/java/org/docx4j/wml/CTRPrDefault.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTRPrDefault.java
rename to src/main/java/org/docx4j/wml/CTRPrDefault.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTReadingModeInkLockDown.java b/src/main/java/org/docx4j/wml/CTReadingModeInkLockDown.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTReadingModeInkLockDown.java
rename to src/main/java/org/docx4j/wml/CTReadingModeInkLockDown.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTRecipientData.java b/src/main/java/org/docx4j/wml/CTRecipientData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTRecipientData.java
rename to src/main/java/org/docx4j/wml/CTRecipientData.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTRecipients.java b/src/main/java/org/docx4j/wml/CTRecipients.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTRecipients.java
rename to src/main/java/org/docx4j/wml/CTRecipients.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTRel.java b/src/main/java/org/docx4j/wml/CTRel.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTRel.java
rename to src/main/java/org/docx4j/wml/CTRel.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTRuby.java b/src/main/java/org/docx4j/wml/CTRuby.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTRuby.java
rename to src/main/java/org/docx4j/wml/CTRuby.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTRubyAlign.java b/src/main/java/org/docx4j/wml/CTRubyAlign.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTRubyAlign.java
rename to src/main/java/org/docx4j/wml/CTRubyAlign.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTRubyContent.java b/src/main/java/org/docx4j/wml/CTRubyContent.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTRubyContent.java
rename to src/main/java/org/docx4j/wml/CTRubyContent.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTRubyPr.java b/src/main/java/org/docx4j/wml/CTRubyPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTRubyPr.java
rename to src/main/java/org/docx4j/wml/CTRubyPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSaveThroughXslt.java b/src/main/java/org/docx4j/wml/CTSaveThroughXslt.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSaveThroughXslt.java
rename to src/main/java/org/docx4j/wml/CTSaveThroughXslt.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSdtCell.java b/src/main/java/org/docx4j/wml/CTSdtCell.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSdtCell.java
rename to src/main/java/org/docx4j/wml/CTSdtCell.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSdtComboBox.java b/src/main/java/org/docx4j/wml/CTSdtComboBox.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSdtComboBox.java
rename to src/main/java/org/docx4j/wml/CTSdtComboBox.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSdtContentCell.java b/src/main/java/org/docx4j/wml/CTSdtContentCell.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSdtContentCell.java
rename to src/main/java/org/docx4j/wml/CTSdtContentCell.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSdtContentRow.java b/src/main/java/org/docx4j/wml/CTSdtContentRow.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSdtContentRow.java
rename to src/main/java/org/docx4j/wml/CTSdtContentRow.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSdtContentRun.java b/src/main/java/org/docx4j/wml/CTSdtContentRun.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSdtContentRun.java
rename to src/main/java/org/docx4j/wml/CTSdtContentRun.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSdtDate.java b/src/main/java/org/docx4j/wml/CTSdtDate.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSdtDate.java
rename to src/main/java/org/docx4j/wml/CTSdtDate.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSdtDateMappingType.java b/src/main/java/org/docx4j/wml/CTSdtDateMappingType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSdtDateMappingType.java
rename to src/main/java/org/docx4j/wml/CTSdtDateMappingType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSdtDocPart.java b/src/main/java/org/docx4j/wml/CTSdtDocPart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSdtDocPart.java
rename to src/main/java/org/docx4j/wml/CTSdtDocPart.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSdtDropDownList.java b/src/main/java/org/docx4j/wml/CTSdtDropDownList.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSdtDropDownList.java
rename to src/main/java/org/docx4j/wml/CTSdtDropDownList.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSdtEndPr.java b/src/main/java/org/docx4j/wml/CTSdtEndPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSdtEndPr.java
rename to src/main/java/org/docx4j/wml/CTSdtEndPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSdtListItem.java b/src/main/java/org/docx4j/wml/CTSdtListItem.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSdtListItem.java
rename to src/main/java/org/docx4j/wml/CTSdtListItem.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSdtRow.java b/src/main/java/org/docx4j/wml/CTSdtRow.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSdtRow.java
rename to src/main/java/org/docx4j/wml/CTSdtRow.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSdtText.java b/src/main/java/org/docx4j/wml/CTSdtText.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSdtText.java
rename to src/main/java/org/docx4j/wml/CTSdtText.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSectPrChange.java b/src/main/java/org/docx4j/wml/CTSectPrChange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSectPrChange.java
rename to src/main/java/org/docx4j/wml/CTSectPrChange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSettings.java b/src/main/java/org/docx4j/wml/CTSettings.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSettings.java
rename to src/main/java/org/docx4j/wml/CTSettings.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTShapeDefaults.java b/src/main/java/org/docx4j/wml/CTShapeDefaults.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTShapeDefaults.java
rename to src/main/java/org/docx4j/wml/CTShapeDefaults.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTShd.java b/src/main/java/org/docx4j/wml/CTShd.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTShd.java
rename to src/main/java/org/docx4j/wml/CTShd.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTShortHexNumber.java b/src/main/java/org/docx4j/wml/CTShortHexNumber.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTShortHexNumber.java
rename to src/main/java/org/docx4j/wml/CTShortHexNumber.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSignedHpsMeasure.java b/src/main/java/org/docx4j/wml/CTSignedHpsMeasure.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSignedHpsMeasure.java
rename to src/main/java/org/docx4j/wml/CTSignedHpsMeasure.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSignedTwipsMeasure.java b/src/main/java/org/docx4j/wml/CTSignedTwipsMeasure.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSignedTwipsMeasure.java
rename to src/main/java/org/docx4j/wml/CTSignedTwipsMeasure.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSimpleField.java b/src/main/java/org/docx4j/wml/CTSimpleField.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSimpleField.java
rename to src/main/java/org/docx4j/wml/CTSimpleField.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSmartTagPr.java b/src/main/java/org/docx4j/wml/CTSmartTagPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSmartTagPr.java
rename to src/main/java/org/docx4j/wml/CTSmartTagPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSmartTagRun.java b/src/main/java/org/docx4j/wml/CTSmartTagRun.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSmartTagRun.java
rename to src/main/java/org/docx4j/wml/CTSmartTagRun.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTSmartTagType.java b/src/main/java/org/docx4j/wml/CTSmartTagType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTSmartTagType.java
rename to src/main/java/org/docx4j/wml/CTSmartTagType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTabStop.java b/src/main/java/org/docx4j/wml/CTTabStop.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTabStop.java
rename to src/main/java/org/docx4j/wml/CTTabStop.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTargetScreenSz.java b/src/main/java/org/docx4j/wml/CTTargetScreenSz.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTargetScreenSz.java
rename to src/main/java/org/docx4j/wml/CTTargetScreenSz.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTblCellMar.java b/src/main/java/org/docx4j/wml/CTTblCellMar.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTblCellMar.java
rename to src/main/java/org/docx4j/wml/CTTblCellMar.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTblGridChange.java b/src/main/java/org/docx4j/wml/CTTblGridChange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTblGridChange.java
rename to src/main/java/org/docx4j/wml/CTTblGridChange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTblLayoutType.java b/src/main/java/org/docx4j/wml/CTTblLayoutType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTblLayoutType.java
rename to src/main/java/org/docx4j/wml/CTTblLayoutType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTblOverlap.java b/src/main/java/org/docx4j/wml/CTTblOverlap.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTblOverlap.java
rename to src/main/java/org/docx4j/wml/CTTblOverlap.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTblPPr.java b/src/main/java/org/docx4j/wml/CTTblPPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTblPPr.java
rename to src/main/java/org/docx4j/wml/CTTblPPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTblPrBase.java b/src/main/java/org/docx4j/wml/CTTblPrBase.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTblPrBase.java
rename to src/main/java/org/docx4j/wml/CTTblPrBase.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTblPrChange.java b/src/main/java/org/docx4j/wml/CTTblPrChange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTblPrChange.java
rename to src/main/java/org/docx4j/wml/CTTblPrChange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTblPrEx.java b/src/main/java/org/docx4j/wml/CTTblPrEx.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTblPrEx.java
rename to src/main/java/org/docx4j/wml/CTTblPrEx.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTblPrExBase.java b/src/main/java/org/docx4j/wml/CTTblPrExBase.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTblPrExBase.java
rename to src/main/java/org/docx4j/wml/CTTblPrExBase.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTblPrExChange.java b/src/main/java/org/docx4j/wml/CTTblPrExChange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTblPrExChange.java
rename to src/main/java/org/docx4j/wml/CTTblPrExChange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTblStylePr.java b/src/main/java/org/docx4j/wml/CTTblStylePr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTblStylePr.java
rename to src/main/java/org/docx4j/wml/CTTblStylePr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTcPrChange.java b/src/main/java/org/docx4j/wml/CTTcPrChange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTcPrChange.java
rename to src/main/java/org/docx4j/wml/CTTcPrChange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTextEffect.java b/src/main/java/org/docx4j/wml/CTTextEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTextEffect.java
rename to src/main/java/org/docx4j/wml/CTTextEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTextScale.java b/src/main/java/org/docx4j/wml/CTTextScale.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTextScale.java
rename to src/main/java/org/docx4j/wml/CTTextScale.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTextboxTightWrap.java b/src/main/java/org/docx4j/wml/CTTextboxTightWrap.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTextboxTightWrap.java
rename to src/main/java/org/docx4j/wml/CTTextboxTightWrap.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTrPrBase.java b/src/main/java/org/docx4j/wml/CTTrPrBase.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTrPrBase.java
rename to src/main/java/org/docx4j/wml/CTTrPrBase.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTrPrChange.java b/src/main/java/org/docx4j/wml/CTTrPrChange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTrPrChange.java
rename to src/main/java/org/docx4j/wml/CTTrPrChange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTrackChange.java b/src/main/java/org/docx4j/wml/CTTrackChange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTrackChange.java
rename to src/main/java/org/docx4j/wml/CTTrackChange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTrackChangeNumbering.java b/src/main/java/org/docx4j/wml/CTTrackChangeNumbering.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTrackChangeNumbering.java
rename to src/main/java/org/docx4j/wml/CTTrackChangeNumbering.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTrackChangeRange.java b/src/main/java/org/docx4j/wml/CTTrackChangeRange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTrackChangeRange.java
rename to src/main/java/org/docx4j/wml/CTTrackChangeRange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTrackChangesView.java b/src/main/java/org/docx4j/wml/CTTrackChangesView.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTrackChangesView.java
rename to src/main/java/org/docx4j/wml/CTTrackChangesView.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTwipsMeasure.java b/src/main/java/org/docx4j/wml/CTTwipsMeasure.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTwipsMeasure.java
rename to src/main/java/org/docx4j/wml/CTTwipsMeasure.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTTxbxContent.java b/src/main/java/org/docx4j/wml/CTTxbxContent.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTTxbxContent.java
rename to src/main/java/org/docx4j/wml/CTTxbxContent.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTUcharHexNumber.java b/src/main/java/org/docx4j/wml/CTUcharHexNumber.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTUcharHexNumber.java
rename to src/main/java/org/docx4j/wml/CTUcharHexNumber.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTVerticalAlignRun.java b/src/main/java/org/docx4j/wml/CTVerticalAlignRun.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTVerticalAlignRun.java
rename to src/main/java/org/docx4j/wml/CTVerticalAlignRun.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTVerticalJc.java b/src/main/java/org/docx4j/wml/CTVerticalJc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTVerticalJc.java
rename to src/main/java/org/docx4j/wml/CTVerticalJc.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTView.java b/src/main/java/org/docx4j/wml/CTView.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTView.java
rename to src/main/java/org/docx4j/wml/CTView.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTWebSettings.java b/src/main/java/org/docx4j/wml/CTWebSettings.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTWebSettings.java
rename to src/main/java/org/docx4j/wml/CTWebSettings.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTWriteProtection.java b/src/main/java/org/docx4j/wml/CTWriteProtection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTWriteProtection.java
rename to src/main/java/org/docx4j/wml/CTWriteProtection.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTWritingStyle.java b/src/main/java/org/docx4j/wml/CTWritingStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTWritingStyle.java
rename to src/main/java/org/docx4j/wml/CTWritingStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CTZoom.java b/src/main/java/org/docx4j/wml/CTZoom.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CTZoom.java
rename to src/main/java/org/docx4j/wml/CTZoom.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Color.java b/src/main/java/org/docx4j/wml/Color.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Color.java
rename to src/main/java/org/docx4j/wml/Color.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CommentRangeEnd.java b/src/main/java/org/docx4j/wml/CommentRangeEnd.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CommentRangeEnd.java
rename to src/main/java/org/docx4j/wml/CommentRangeEnd.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/CommentRangeStart.java b/src/main/java/org/docx4j/wml/CommentRangeStart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/CommentRangeStart.java
rename to src/main/java/org/docx4j/wml/CommentRangeStart.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Comments.java b/src/main/java/org/docx4j/wml/Comments.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Comments.java
rename to src/main/java/org/docx4j/wml/Comments.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/ContentAccessor.java b/src/main/java/org/docx4j/wml/ContentAccessor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/ContentAccessor.java
rename to src/main/java/org/docx4j/wml/ContentAccessor.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/DelText.java b/src/main/java/org/docx4j/wml/DelText.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/DelText.java
rename to src/main/java/org/docx4j/wml/DelText.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/DocDefaults.java b/src/main/java/org/docx4j/wml/DocDefaults.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/DocDefaults.java
rename to src/main/java/org/docx4j/wml/DocDefaults.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Document.java b/src/main/java/org/docx4j/wml/Document.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Document.java
rename to src/main/java/org/docx4j/wml/Document.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Drawing.java b/src/main/java/org/docx4j/wml/Drawing.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Drawing.java
rename to src/main/java/org/docx4j/wml/Drawing.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/FldChar.java b/src/main/java/org/docx4j/wml/FldChar.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/FldChar.java
rename to src/main/java/org/docx4j/wml/FldChar.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/FontFamily.java b/src/main/java/org/docx4j/wml/FontFamily.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/FontFamily.java
rename to src/main/java/org/docx4j/wml/FontFamily.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/FontPanose.java b/src/main/java/org/docx4j/wml/FontPanose.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/FontPanose.java
rename to src/main/java/org/docx4j/wml/FontPanose.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/FontPitch.java b/src/main/java/org/docx4j/wml/FontPitch.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/FontPitch.java
rename to src/main/java/org/docx4j/wml/FontPitch.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/FontRel.java b/src/main/java/org/docx4j/wml/FontRel.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/FontRel.java
rename to src/main/java/org/docx4j/wml/FontRel.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/FontSig.java b/src/main/java/org/docx4j/wml/FontSig.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/FontSig.java
rename to src/main/java/org/docx4j/wml/FontSig.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Fonts.java b/src/main/java/org/docx4j/wml/Fonts.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Fonts.java
rename to src/main/java/org/docx4j/wml/Fonts.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/FooterReference.java b/src/main/java/org/docx4j/wml/FooterReference.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/FooterReference.java
rename to src/main/java/org/docx4j/wml/FooterReference.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Ftr.java b/src/main/java/org/docx4j/wml/Ftr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Ftr.java
rename to src/main/java/org/docx4j/wml/Ftr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/GlossaryDocument.java b/src/main/java/org/docx4j/wml/GlossaryDocument.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/GlossaryDocument.java
rename to src/main/java/org/docx4j/wml/GlossaryDocument.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Hdr.java b/src/main/java/org/docx4j/wml/Hdr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Hdr.java
rename to src/main/java/org/docx4j/wml/Hdr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/HdrFtrRef.java b/src/main/java/org/docx4j/wml/HdrFtrRef.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/HdrFtrRef.java
rename to src/main/java/org/docx4j/wml/HdrFtrRef.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/HeaderReference.java b/src/main/java/org/docx4j/wml/HeaderReference.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/HeaderReference.java
rename to src/main/java/org/docx4j/wml/HeaderReference.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Highlight.java b/src/main/java/org/docx4j/wml/Highlight.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Highlight.java
rename to src/main/java/org/docx4j/wml/Highlight.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/HpsMeasure.java b/src/main/java/org/docx4j/wml/HpsMeasure.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/HpsMeasure.java
rename to src/main/java/org/docx4j/wml/HpsMeasure.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Id.java b/src/main/java/org/docx4j/wml/Id.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Id.java
rename to src/main/java/org/docx4j/wml/Id.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Jc.java b/src/main/java/org/docx4j/wml/Jc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Jc.java
rename to src/main/java/org/docx4j/wml/Jc.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/JcEnumeration.java b/src/main/java/org/docx4j/wml/JcEnumeration.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/JcEnumeration.java
rename to src/main/java/org/docx4j/wml/JcEnumeration.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Lvl.java b/src/main/java/org/docx4j/wml/Lvl.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Lvl.java
rename to src/main/java/org/docx4j/wml/Lvl.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/NumFmt.java b/src/main/java/org/docx4j/wml/NumFmt.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/NumFmt.java
rename to src/main/java/org/docx4j/wml/NumFmt.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/NumberFormat.java b/src/main/java/org/docx4j/wml/NumberFormat.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/NumberFormat.java
rename to src/main/java/org/docx4j/wml/NumberFormat.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Numbering.java b/src/main/java/org/docx4j/wml/Numbering.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Numbering.java
rename to src/main/java/org/docx4j/wml/Numbering.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/ObjectFactory.java b/src/main/java/org/docx4j/wml/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/ObjectFactory.java
rename to src/main/java/org/docx4j/wml/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/P.java b/src/main/java/org/docx4j/wml/P.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/P.java
rename to src/main/java/org/docx4j/wml/P.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/PPr.java b/src/main/java/org/docx4j/wml/PPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/PPr.java
rename to src/main/java/org/docx4j/wml/PPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/PPrBase.java b/src/main/java/org/docx4j/wml/PPrBase.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/PPrBase.java
rename to src/main/java/org/docx4j/wml/PPrBase.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/ParaRPr.java b/src/main/java/org/docx4j/wml/ParaRPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/ParaRPr.java
rename to src/main/java/org/docx4j/wml/ParaRPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/ParaRPrChange.java b/src/main/java/org/docx4j/wml/ParaRPrChange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/ParaRPrChange.java
rename to src/main/java/org/docx4j/wml/ParaRPrChange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Pict.java b/src/main/java/org/docx4j/wml/Pict.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Pict.java
rename to src/main/java/org/docx4j/wml/Pict.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/ProofErr.java b/src/main/java/org/docx4j/wml/ProofErr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/ProofErr.java
rename to src/main/java/org/docx4j/wml/ProofErr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/R.java b/src/main/java/org/docx4j/wml/R.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/R.java
rename to src/main/java/org/docx4j/wml/R.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/RFonts.java b/src/main/java/org/docx4j/wml/RFonts.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/RFonts.java
rename to src/main/java/org/docx4j/wml/RFonts.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/RPr.java b/src/main/java/org/docx4j/wml/RPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/RPr.java
rename to src/main/java/org/docx4j/wml/RPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/RStyle.java b/src/main/java/org/docx4j/wml/RStyle.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/RStyle.java
rename to src/main/java/org/docx4j/wml/RStyle.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/RangePermissionStart.java b/src/main/java/org/docx4j/wml/RangePermissionStart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/RangePermissionStart.java
rename to src/main/java/org/docx4j/wml/RangePermissionStart.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/RunDel.java b/src/main/java/org/docx4j/wml/RunDel.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/RunDel.java
rename to src/main/java/org/docx4j/wml/RunDel.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/RunIns.java b/src/main/java/org/docx4j/wml/RunIns.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/RunIns.java
rename to src/main/java/org/docx4j/wml/RunIns.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/RunTrackChange.java b/src/main/java/org/docx4j/wml/RunTrackChange.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/RunTrackChange.java
rename to src/main/java/org/docx4j/wml/RunTrackChange.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STAlgClass.java b/src/main/java/org/docx4j/wml/STAlgClass.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STAlgClass.java
rename to src/main/java/org/docx4j/wml/STAlgClass.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STAlgType.java b/src/main/java/org/docx4j/wml/STAlgType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STAlgType.java
rename to src/main/java/org/docx4j/wml/STAlgType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STAnnotationVMerge.java b/src/main/java/org/docx4j/wml/STAnnotationVMerge.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STAnnotationVMerge.java
rename to src/main/java/org/docx4j/wml/STAnnotationVMerge.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STBorder.java b/src/main/java/org/docx4j/wml/STBorder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STBorder.java
rename to src/main/java/org/docx4j/wml/STBorder.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STBrClear.java b/src/main/java/org/docx4j/wml/STBrClear.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STBrClear.java
rename to src/main/java/org/docx4j/wml/STBrClear.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STBrType.java b/src/main/java/org/docx4j/wml/STBrType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STBrType.java
rename to src/main/java/org/docx4j/wml/STBrType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STCalendarType.java b/src/main/java/org/docx4j/wml/STCalendarType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STCalendarType.java
rename to src/main/java/org/docx4j/wml/STCalendarType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STCaptionPos.java b/src/main/java/org/docx4j/wml/STCaptionPos.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STCaptionPos.java
rename to src/main/java/org/docx4j/wml/STCaptionPos.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STChapterSep.java b/src/main/java/org/docx4j/wml/STChapterSep.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STChapterSep.java
rename to src/main/java/org/docx4j/wml/STChapterSep.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STCharacterSpacing.java b/src/main/java/org/docx4j/wml/STCharacterSpacing.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STCharacterSpacing.java
rename to src/main/java/org/docx4j/wml/STCharacterSpacing.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STColorSchemeIndex.java b/src/main/java/org/docx4j/wml/STColorSchemeIndex.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STColorSchemeIndex.java
rename to src/main/java/org/docx4j/wml/STColorSchemeIndex.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STCombineBrackets.java b/src/main/java/org/docx4j/wml/STCombineBrackets.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STCombineBrackets.java
rename to src/main/java/org/docx4j/wml/STCombineBrackets.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STCryptProv.java b/src/main/java/org/docx4j/wml/STCryptProv.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STCryptProv.java
rename to src/main/java/org/docx4j/wml/STCryptProv.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STDisplacedByCustomXml.java b/src/main/java/org/docx4j/wml/STDisplacedByCustomXml.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STDisplacedByCustomXml.java
rename to src/main/java/org/docx4j/wml/STDisplacedByCustomXml.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STDocGrid.java b/src/main/java/org/docx4j/wml/STDocGrid.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STDocGrid.java
rename to src/main/java/org/docx4j/wml/STDocGrid.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STDocPartBehavior.java b/src/main/java/org/docx4j/wml/STDocPartBehavior.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STDocPartBehavior.java
rename to src/main/java/org/docx4j/wml/STDocPartBehavior.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STDocPartGallery.java b/src/main/java/org/docx4j/wml/STDocPartGallery.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STDocPartGallery.java
rename to src/main/java/org/docx4j/wml/STDocPartGallery.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STDocPartType.java b/src/main/java/org/docx4j/wml/STDocPartType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STDocPartType.java
rename to src/main/java/org/docx4j/wml/STDocPartType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STDocProtect.java b/src/main/java/org/docx4j/wml/STDocProtect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STDocProtect.java
rename to src/main/java/org/docx4j/wml/STDocProtect.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STDocType.java b/src/main/java/org/docx4j/wml/STDocType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STDocType.java
rename to src/main/java/org/docx4j/wml/STDocType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STDropCap.java b/src/main/java/org/docx4j/wml/STDropCap.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STDropCap.java
rename to src/main/java/org/docx4j/wml/STDropCap.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STEdnPos.java b/src/main/java/org/docx4j/wml/STEdnPos.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STEdnPos.java
rename to src/main/java/org/docx4j/wml/STEdnPos.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STEm.java b/src/main/java/org/docx4j/wml/STEm.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STEm.java
rename to src/main/java/org/docx4j/wml/STEm.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STFFTextType.java b/src/main/java/org/docx4j/wml/STFFTextType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STFFTextType.java
rename to src/main/java/org/docx4j/wml/STFFTextType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STFldCharType.java b/src/main/java/org/docx4j/wml/STFldCharType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STFldCharType.java
rename to src/main/java/org/docx4j/wml/STFldCharType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STFrameLayout.java b/src/main/java/org/docx4j/wml/STFrameLayout.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STFrameLayout.java
rename to src/main/java/org/docx4j/wml/STFrameLayout.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STFrameScrollbar.java b/src/main/java/org/docx4j/wml/STFrameScrollbar.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STFrameScrollbar.java
rename to src/main/java/org/docx4j/wml/STFrameScrollbar.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STFtnEdn.java b/src/main/java/org/docx4j/wml/STFtnEdn.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STFtnEdn.java
rename to src/main/java/org/docx4j/wml/STFtnEdn.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STFtnPos.java b/src/main/java/org/docx4j/wml/STFtnPos.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STFtnPos.java
rename to src/main/java/org/docx4j/wml/STFtnPos.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STHAnchor.java b/src/main/java/org/docx4j/wml/STHAnchor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STHAnchor.java
rename to src/main/java/org/docx4j/wml/STHAnchor.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STHeightRule.java b/src/main/java/org/docx4j/wml/STHeightRule.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STHeightRule.java
rename to src/main/java/org/docx4j/wml/STHeightRule.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STHexColorAuto.java b/src/main/java/org/docx4j/wml/STHexColorAuto.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STHexColorAuto.java
rename to src/main/java/org/docx4j/wml/STHexColorAuto.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STHint.java b/src/main/java/org/docx4j/wml/STHint.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STHint.java
rename to src/main/java/org/docx4j/wml/STHint.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STInfoTextType.java b/src/main/java/org/docx4j/wml/STInfoTextType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STInfoTextType.java
rename to src/main/java/org/docx4j/wml/STInfoTextType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STLineNumberRestart.java b/src/main/java/org/docx4j/wml/STLineNumberRestart.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STLineNumberRestart.java
rename to src/main/java/org/docx4j/wml/STLineNumberRestart.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STLineSpacingRule.java b/src/main/java/org/docx4j/wml/STLineSpacingRule.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STLineSpacingRule.java
rename to src/main/java/org/docx4j/wml/STLineSpacingRule.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STLock.java b/src/main/java/org/docx4j/wml/STLock.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STLock.java
rename to src/main/java/org/docx4j/wml/STLock.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STMailMergeDataType.java b/src/main/java/org/docx4j/wml/STMailMergeDataType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STMailMergeDataType.java
rename to src/main/java/org/docx4j/wml/STMailMergeDataType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STMailMergeDest.java b/src/main/java/org/docx4j/wml/STMailMergeDest.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STMailMergeDest.java
rename to src/main/java/org/docx4j/wml/STMailMergeDest.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STMailMergeDocType.java b/src/main/java/org/docx4j/wml/STMailMergeDocType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STMailMergeDocType.java
rename to src/main/java/org/docx4j/wml/STMailMergeDocType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STMailMergeOdsoFMDFieldType.java b/src/main/java/org/docx4j/wml/STMailMergeOdsoFMDFieldType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STMailMergeOdsoFMDFieldType.java
rename to src/main/java/org/docx4j/wml/STMailMergeOdsoFMDFieldType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STMailMergeSourceType.java b/src/main/java/org/docx4j/wml/STMailMergeSourceType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STMailMergeSourceType.java
rename to src/main/java/org/docx4j/wml/STMailMergeSourceType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STPTabAlignment.java b/src/main/java/org/docx4j/wml/STPTabAlignment.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STPTabAlignment.java
rename to src/main/java/org/docx4j/wml/STPTabAlignment.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STPTabLeader.java b/src/main/java/org/docx4j/wml/STPTabLeader.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STPTabLeader.java
rename to src/main/java/org/docx4j/wml/STPTabLeader.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STPTabRelativeTo.java b/src/main/java/org/docx4j/wml/STPTabRelativeTo.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STPTabRelativeTo.java
rename to src/main/java/org/docx4j/wml/STPTabRelativeTo.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STPageBorderDisplay.java b/src/main/java/org/docx4j/wml/STPageBorderDisplay.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STPageBorderDisplay.java
rename to src/main/java/org/docx4j/wml/STPageBorderDisplay.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STPageBorderOffset.java b/src/main/java/org/docx4j/wml/STPageBorderOffset.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STPageBorderOffset.java
rename to src/main/java/org/docx4j/wml/STPageBorderOffset.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STPageBorderZOrder.java b/src/main/java/org/docx4j/wml/STPageBorderZOrder.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STPageBorderZOrder.java
rename to src/main/java/org/docx4j/wml/STPageBorderZOrder.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STPageOrientation.java b/src/main/java/org/docx4j/wml/STPageOrientation.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STPageOrientation.java
rename to src/main/java/org/docx4j/wml/STPageOrientation.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STPitch.java b/src/main/java/org/docx4j/wml/STPitch.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STPitch.java
rename to src/main/java/org/docx4j/wml/STPitch.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STProof.java b/src/main/java/org/docx4j/wml/STProof.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STProof.java
rename to src/main/java/org/docx4j/wml/STProof.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STRestartNumber.java b/src/main/java/org/docx4j/wml/STRestartNumber.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STRestartNumber.java
rename to src/main/java/org/docx4j/wml/STRestartNumber.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STRubyAlign.java b/src/main/java/org/docx4j/wml/STRubyAlign.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STRubyAlign.java
rename to src/main/java/org/docx4j/wml/STRubyAlign.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STSdtDateMappingType.java b/src/main/java/org/docx4j/wml/STSdtDateMappingType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STSdtDateMappingType.java
rename to src/main/java/org/docx4j/wml/STSdtDateMappingType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STShd.java b/src/main/java/org/docx4j/wml/STShd.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STShd.java
rename to src/main/java/org/docx4j/wml/STShd.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STTabJc.java b/src/main/java/org/docx4j/wml/STTabJc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STTabJc.java
rename to src/main/java/org/docx4j/wml/STTabJc.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STTabTlc.java b/src/main/java/org/docx4j/wml/STTabTlc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STTabTlc.java
rename to src/main/java/org/docx4j/wml/STTabTlc.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STTblLayoutType.java b/src/main/java/org/docx4j/wml/STTblLayoutType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STTblLayoutType.java
rename to src/main/java/org/docx4j/wml/STTblLayoutType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STTblOverlap.java b/src/main/java/org/docx4j/wml/STTblOverlap.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STTblOverlap.java
rename to src/main/java/org/docx4j/wml/STTblOverlap.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STTblStyleOverrideType.java b/src/main/java/org/docx4j/wml/STTblStyleOverrideType.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STTblStyleOverrideType.java
rename to src/main/java/org/docx4j/wml/STTblStyleOverrideType.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STTextEffect.java b/src/main/java/org/docx4j/wml/STTextEffect.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STTextEffect.java
rename to src/main/java/org/docx4j/wml/STTextEffect.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STTextboxTightWrap.java b/src/main/java/org/docx4j/wml/STTextboxTightWrap.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STTextboxTightWrap.java
rename to src/main/java/org/docx4j/wml/STTextboxTightWrap.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STTheme.java b/src/main/java/org/docx4j/wml/STTheme.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STTheme.java
rename to src/main/java/org/docx4j/wml/STTheme.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STThemeColor.java b/src/main/java/org/docx4j/wml/STThemeColor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STThemeColor.java
rename to src/main/java/org/docx4j/wml/STThemeColor.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STVAnchor.java b/src/main/java/org/docx4j/wml/STVAnchor.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STVAnchor.java
rename to src/main/java/org/docx4j/wml/STVAnchor.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STVerticalAlignRun.java b/src/main/java/org/docx4j/wml/STVerticalAlignRun.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STVerticalAlignRun.java
rename to src/main/java/org/docx4j/wml/STVerticalAlignRun.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STVerticalJc.java b/src/main/java/org/docx4j/wml/STVerticalJc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STVerticalJc.java
rename to src/main/java/org/docx4j/wml/STVerticalJc.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STView.java b/src/main/java/org/docx4j/wml/STView.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STView.java
rename to src/main/java/org/docx4j/wml/STView.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STWrap.java b/src/main/java/org/docx4j/wml/STWrap.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STWrap.java
rename to src/main/java/org/docx4j/wml/STWrap.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STXAlign.java b/src/main/java/org/docx4j/wml/STXAlign.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STXAlign.java
rename to src/main/java/org/docx4j/wml/STXAlign.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STYAlign.java b/src/main/java/org/docx4j/wml/STYAlign.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STYAlign.java
rename to src/main/java/org/docx4j/wml/STYAlign.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/STZoom.java b/src/main/java/org/docx4j/wml/STZoom.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/STZoom.java
rename to src/main/java/org/docx4j/wml/STZoom.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/SdtBlock.java b/src/main/java/org/docx4j/wml/SdtBlock.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/SdtBlock.java
rename to src/main/java/org/docx4j/wml/SdtBlock.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/SdtContentBlock.java b/src/main/java/org/docx4j/wml/SdtContentBlock.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/SdtContentBlock.java
rename to src/main/java/org/docx4j/wml/SdtContentBlock.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/SdtElement.java b/src/main/java/org/docx4j/wml/SdtElement.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/SdtElement.java
rename to src/main/java/org/docx4j/wml/SdtElement.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/SdtPr.java b/src/main/java/org/docx4j/wml/SdtPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/SdtPr.java
rename to src/main/java/org/docx4j/wml/SdtPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/SdtRun.java b/src/main/java/org/docx4j/wml/SdtRun.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/SdtRun.java
rename to src/main/java/org/docx4j/wml/SdtRun.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/SectPr.java b/src/main/java/org/docx4j/wml/SectPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/SectPr.java
rename to src/main/java/org/docx4j/wml/SectPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/SectPrBase.java b/src/main/java/org/docx4j/wml/SectPrBase.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/SectPrBase.java
rename to src/main/java/org/docx4j/wml/SectPrBase.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Style.java b/src/main/java/org/docx4j/wml/Style.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Style.java
rename to src/main/java/org/docx4j/wml/Style.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Styles.java b/src/main/java/org/docx4j/wml/Styles.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Styles.java
rename to src/main/java/org/docx4j/wml/Styles.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Tabs.java b/src/main/java/org/docx4j/wml/Tabs.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Tabs.java
rename to src/main/java/org/docx4j/wml/Tabs.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Tag.java b/src/main/java/org/docx4j/wml/Tag.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Tag.java
rename to src/main/java/org/docx4j/wml/Tag.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Tbl.java b/src/main/java/org/docx4j/wml/Tbl.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Tbl.java
rename to src/main/java/org/docx4j/wml/Tbl.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/TblBorders.java b/src/main/java/org/docx4j/wml/TblBorders.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/TblBorders.java
rename to src/main/java/org/docx4j/wml/TblBorders.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/TblGrid.java b/src/main/java/org/docx4j/wml/TblGrid.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/TblGrid.java
rename to src/main/java/org/docx4j/wml/TblGrid.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/TblGridBase.java b/src/main/java/org/docx4j/wml/TblGridBase.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/TblGridBase.java
rename to src/main/java/org/docx4j/wml/TblGridBase.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/TblGridCol.java b/src/main/java/org/docx4j/wml/TblGridCol.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/TblGridCol.java
rename to src/main/java/org/docx4j/wml/TblGridCol.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/TblPr.java b/src/main/java/org/docx4j/wml/TblPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/TblPr.java
rename to src/main/java/org/docx4j/wml/TblPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/TblWidth.java b/src/main/java/org/docx4j/wml/TblWidth.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/TblWidth.java
rename to src/main/java/org/docx4j/wml/TblWidth.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Tc.java b/src/main/java/org/docx4j/wml/Tc.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Tc.java
rename to src/main/java/org/docx4j/wml/Tc.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/TcMar.java b/src/main/java/org/docx4j/wml/TcMar.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/TcMar.java
rename to src/main/java/org/docx4j/wml/TcMar.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/TcPr.java b/src/main/java/org/docx4j/wml/TcPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/TcPr.java
rename to src/main/java/org/docx4j/wml/TcPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/TcPrInner.java b/src/main/java/org/docx4j/wml/TcPrInner.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/TcPrInner.java
rename to src/main/java/org/docx4j/wml/TcPrInner.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Text.java b/src/main/java/org/docx4j/wml/Text.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Text.java
rename to src/main/java/org/docx4j/wml/Text.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/TextDirection.java b/src/main/java/org/docx4j/wml/TextDirection.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/TextDirection.java
rename to src/main/java/org/docx4j/wml/TextDirection.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/Tr.java b/src/main/java/org/docx4j/wml/Tr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/Tr.java
rename to src/main/java/org/docx4j/wml/Tr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/TrPr.java b/src/main/java/org/docx4j/wml/TrPr.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/TrPr.java
rename to src/main/java/org/docx4j/wml/TrPr.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/U.java b/src/main/java/org/docx4j/wml/U.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/U.java
rename to src/main/java/org/docx4j/wml/U.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/UnderlineEnumeration.java b/src/main/java/org/docx4j/wml/UnderlineEnumeration.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/UnderlineEnumeration.java
rename to src/main/java/org/docx4j/wml/UnderlineEnumeration.java
diff --git a/docx4j/src/main/java/org/docx4j/wml/package-info.java b/src/main/java/org/docx4j/wml/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/wml/package-info.java
rename to src/main/java/org/docx4j/wml/package-info.java
diff --git a/docx4j/src/main/java/org/docx4j/xmlPackage/ObjectFactory.java b/src/main/java/org/docx4j/xmlPackage/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/xmlPackage/ObjectFactory.java
rename to src/main/java/org/docx4j/xmlPackage/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/docx4j/xmlPackage/Package.java b/src/main/java/org/docx4j/xmlPackage/Package.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/xmlPackage/Package.java
rename to src/main/java/org/docx4j/xmlPackage/Package.java
diff --git a/docx4j/src/main/java/org/docx4j/xmlPackage/Part.java b/src/main/java/org/docx4j/xmlPackage/Part.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/xmlPackage/Part.java
rename to src/main/java/org/docx4j/xmlPackage/Part.java
diff --git a/docx4j/src/main/java/org/docx4j/xmlPackage/XmlData.java b/src/main/java/org/docx4j/xmlPackage/XmlData.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/xmlPackage/XmlData.java
rename to src/main/java/org/docx4j/xmlPackage/XmlData.java
diff --git a/docx4j/src/main/java/org/docx4j/xmlPackage/package-info.java b/src/main/java/org/docx4j/xmlPackage/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/docx4j/xmlPackage/package-info.java
rename to src/main/java/org/docx4j/xmlPackage/package-info.java
diff --git a/docx4j/src/main/java/org/jvnet/jaxb2_commons/ppp/Child.java b/src/main/java/org/jvnet/jaxb2_commons/ppp/Child.java
similarity index 100%
rename from docx4j/src/main/java/org/jvnet/jaxb2_commons/ppp/Child.java
rename to src/main/java/org/jvnet/jaxb2_commons/ppp/Child.java
diff --git a/docx4j/src/main/java/org/jvnet/jaxb2_commons/ppp/ParentPointerPlugin.xjc b/src/main/java/org/jvnet/jaxb2_commons/ppp/ParentPointerPlugin.xjc
similarity index 100%
rename from docx4j/src/main/java/org/jvnet/jaxb2_commons/ppp/ParentPointerPlugin.xjc
rename to src/main/java/org/jvnet/jaxb2_commons/ppp/ParentPointerPlugin.xjc
diff --git a/docx4j/src/main/java/org/jvnet/jaxb2_commons/ppp/ParentTrackingArrayList.java b/src/main/java/org/jvnet/jaxb2_commons/ppp/ParentTrackingArrayList.java
similarity index 100%
rename from docx4j/src/main/java/org/jvnet/jaxb2_commons/ppp/ParentTrackingArrayList.java
rename to src/main/java/org/jvnet/jaxb2_commons/ppp/ParentTrackingArrayList.java
diff --git a/docx4j/src/main/java/org/merlin/io/DOMSerializerEngine.java b/src/main/java/org/merlin/io/DOMSerializerEngine.java
similarity index 100%
rename from docx4j/src/main/java/org/merlin/io/DOMSerializerEngine.java
rename to src/main/java/org/merlin/io/DOMSerializerEngine.java
diff --git a/docx4j/src/main/java/org/merlin/io/IOStreamEngine.java b/src/main/java/org/merlin/io/IOStreamEngine.java
similarity index 100%
rename from docx4j/src/main/java/org/merlin/io/IOStreamEngine.java
rename to src/main/java/org/merlin/io/IOStreamEngine.java
diff --git a/docx4j/src/main/java/org/merlin/io/OutputEngine.java b/src/main/java/org/merlin/io/OutputEngine.java
similarity index 100%
rename from docx4j/src/main/java/org/merlin/io/OutputEngine.java
rename to src/main/java/org/merlin/io/OutputEngine.java
diff --git a/docx4j/src/main/java/org/merlin/io/OutputEngineInputStream.java b/src/main/java/org/merlin/io/OutputEngineInputStream.java
similarity index 100%
rename from docx4j/src/main/java/org/merlin/io/OutputEngineInputStream.java
rename to src/main/java/org/merlin/io/OutputEngineInputStream.java
diff --git a/docx4j/src/main/java/org/merlin/io/ReaderWriterEngine.java b/src/main/java/org/merlin/io/ReaderWriterEngine.java
similarity index 100%
rename from docx4j/src/main/java/org/merlin/io/ReaderWriterEngine.java
rename to src/main/java/org/merlin/io/ReaderWriterEngine.java
diff --git a/docx4j/src/main/java/org/merlin/io/Streams.java b/src/main/java/org/merlin/io/Streams.java
similarity index 100%
rename from docx4j/src/main/java/org/merlin/io/Streams.java
rename to src/main/java/org/merlin/io/Streams.java
diff --git a/docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/Image.java b/src/main/java/org/opendope/SmartArt/dataHierarchy/Image.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/Image.java
rename to src/main/java/org/opendope/SmartArt/dataHierarchy/Image.java
diff --git a/docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/ImageRef.java b/src/main/java/org/opendope/SmartArt/dataHierarchy/ImageRef.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/ImageRef.java
rename to src/main/java/org/opendope/SmartArt/dataHierarchy/ImageRef.java
diff --git a/docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/List.java b/src/main/java/org/opendope/SmartArt/dataHierarchy/List.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/List.java
rename to src/main/java/org/opendope/SmartArt/dataHierarchy/List.java
diff --git a/docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/ListItem.java b/src/main/java/org/opendope/SmartArt/dataHierarchy/ListItem.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/ListItem.java
rename to src/main/java/org/opendope/SmartArt/dataHierarchy/ListItem.java
diff --git a/docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/ObjectFactory.java b/src/main/java/org/opendope/SmartArt/dataHierarchy/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/ObjectFactory.java
rename to src/main/java/org/opendope/SmartArt/dataHierarchy/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/SibTransBody.java b/src/main/java/org/opendope/SmartArt/dataHierarchy/SibTransBody.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/SibTransBody.java
rename to src/main/java/org/opendope/SmartArt/dataHierarchy/SibTransBody.java
diff --git a/docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/SmartArtDataHierarchy.java b/src/main/java/org/opendope/SmartArt/dataHierarchy/SmartArtDataHierarchy.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/SmartArtDataHierarchy.java
rename to src/main/java/org/opendope/SmartArt/dataHierarchy/SmartArtDataHierarchy.java
diff --git a/docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/TextBody.java b/src/main/java/org/opendope/SmartArt/dataHierarchy/TextBody.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/TextBody.java
rename to src/main/java/org/opendope/SmartArt/dataHierarchy/TextBody.java
diff --git a/docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/package-info.java b/src/main/java/org/opendope/SmartArt/dataHierarchy/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/SmartArt/dataHierarchy/package-info.java
rename to src/main/java/org/opendope/SmartArt/dataHierarchy/package-info.java
diff --git a/docx4j/src/main/java/org/opendope/components/Components.java b/src/main/java/org/opendope/components/Components.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/components/Components.java
rename to src/main/java/org/opendope/components/Components.java
diff --git a/docx4j/src/main/java/org/opendope/components/ObjectFactory.java b/src/main/java/org/opendope/components/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/components/ObjectFactory.java
rename to src/main/java/org/opendope/components/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/opendope/components/package-info.java b/src/main/java/org/opendope/components/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/components/package-info.java
rename to src/main/java/org/opendope/components/package-info.java
diff --git a/docx4j/src/main/java/org/opendope/conditions/And.java b/src/main/java/org/opendope/conditions/And.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/conditions/And.java
rename to src/main/java/org/opendope/conditions/And.java
diff --git a/docx4j/src/main/java/org/opendope/conditions/Condition.java b/src/main/java/org/opendope/conditions/Condition.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/conditions/Condition.java
rename to src/main/java/org/opendope/conditions/Condition.java
diff --git a/docx4j/src/main/java/org/opendope/conditions/Conditionref.java b/src/main/java/org/opendope/conditions/Conditionref.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/conditions/Conditionref.java
rename to src/main/java/org/opendope/conditions/Conditionref.java
diff --git a/docx4j/src/main/java/org/opendope/conditions/Conditions.java b/src/main/java/org/opendope/conditions/Conditions.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/conditions/Conditions.java
rename to src/main/java/org/opendope/conditions/Conditions.java
diff --git a/docx4j/src/main/java/org/opendope/conditions/Not.java b/src/main/java/org/opendope/conditions/Not.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/conditions/Not.java
rename to src/main/java/org/opendope/conditions/Not.java
diff --git a/docx4j/src/main/java/org/opendope/conditions/ObjectFactory.java b/src/main/java/org/opendope/conditions/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/conditions/ObjectFactory.java
rename to src/main/java/org/opendope/conditions/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/opendope/conditions/Or.java b/src/main/java/org/opendope/conditions/Or.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/conditions/Or.java
rename to src/main/java/org/opendope/conditions/Or.java
diff --git a/docx4j/src/main/java/org/opendope/conditions/Xpathref.java b/src/main/java/org/opendope/conditions/Xpathref.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/conditions/Xpathref.java
rename to src/main/java/org/opendope/conditions/Xpathref.java
diff --git a/docx4j/src/main/java/org/opendope/conditions/package-info.java b/src/main/java/org/opendope/conditions/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/conditions/package-info.java
rename to src/main/java/org/opendope/conditions/package-info.java
diff --git a/docx4j/src/main/java/org/opendope/questions/ObjectFactory.java b/src/main/java/org/opendope/questions/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/questions/ObjectFactory.java
rename to src/main/java/org/opendope/questions/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/opendope/questions/Question.java b/src/main/java/org/opendope/questions/Question.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/questions/Question.java
rename to src/main/java/org/opendope/questions/Question.java
diff --git a/docx4j/src/main/java/org/opendope/questions/Questionnaire.java b/src/main/java/org/opendope/questions/Questionnaire.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/questions/Questionnaire.java
rename to src/main/java/org/opendope/questions/Questionnaire.java
diff --git a/docx4j/src/main/java/org/opendope/questions/Response.java b/src/main/java/org/opendope/questions/Response.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/questions/Response.java
rename to src/main/java/org/opendope/questions/Response.java
diff --git a/docx4j/src/main/java/org/opendope/questions/package-info.java b/src/main/java/org/opendope/questions/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/questions/package-info.java
rename to src/main/java/org/opendope/questions/package-info.java
diff --git a/docx4j/src/main/java/org/opendope/xpaths/ObjectFactory.java b/src/main/java/org/opendope/xpaths/ObjectFactory.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/xpaths/ObjectFactory.java
rename to src/main/java/org/opendope/xpaths/ObjectFactory.java
diff --git a/docx4j/src/main/java/org/opendope/xpaths/Xpaths.java b/src/main/java/org/opendope/xpaths/Xpaths.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/xpaths/Xpaths.java
rename to src/main/java/org/opendope/xpaths/Xpaths.java
diff --git a/docx4j/src/main/java/org/opendope/xpaths/package-info.java b/src/main/java/org/opendope/xpaths/package-info.java
similarity index 100%
rename from docx4j/src/main/java/org/opendope/xpaths/package-info.java
rename to src/main/java/org/opendope/xpaths/package-info.java
diff --git a/docx4j/src/main/javascript/javeline_xpath.js b/src/main/javascript/javeline_xpath.js
similarity index 100%
rename from docx4j/src/main/javascript/javeline_xpath.js
rename to src/main/javascript/javeline_xpath.js
diff --git a/docx4j/src/main/javascript/wml_fix.js b/src/main/javascript/wml_fix.js
similarity index 100%
rename from docx4j/src/main/javascript/wml_fix.js
rename to src/main/javascript/wml_fix.js
diff --git a/docx4j/src/main/resources/XhtmlNamespaceHandler.css b/src/main/resources/XhtmlNamespaceHandler.css
similarity index 100%
rename from docx4j/src/main/resources/XhtmlNamespaceHandler.css
rename to src/main/resources/XhtmlNamespaceHandler.css
diff --git a/docx4j/src/main/resources/docx4j.properties b/src/main/resources/docx4j.properties
similarity index 100%
rename from docx4j/src/main/resources/docx4j.properties
rename to src/main/resources/docx4j.properties
diff --git a/docx4j/src/main/resources/log4j.dtd b/src/main/resources/log4j.dtd
similarity index 100%
rename from docx4j/src/main/resources/log4j.dtd
rename to src/main/resources/log4j.dtd
diff --git a/docx4j/src/main/resources/log4j.xml b/src/main/resources/log4j.xml
similarity index 100%
rename from docx4j/src/main/resources/log4j.xml
rename to src/main/resources/log4j.xml
diff --git a/docx4j/src/main/resources/xhtmlrenderer.conf b/src/main/resources/xhtmlrenderer.conf
similarity index 100%
rename from docx4j/src/main/resources/xhtmlrenderer.conf
rename to src/main/resources/xhtmlrenderer.conf
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/packages/PresentationMLPackage.java b/src/pptx4j/java/org/docx4j/openpackaging/packages/PresentationMLPackage.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/packages/PresentationMLPackage.java
rename to src/pptx4j/java/org/docx4j/openpackaging/packages/PresentationMLPackage.java
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/HandoutMasterPart.java b/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/HandoutMasterPart.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/HandoutMasterPart.java
rename to src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/HandoutMasterPart.java
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/JaxbPmlPart.java b/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/JaxbPmlPart.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/JaxbPmlPart.java
rename to src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/JaxbPmlPart.java
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/MainPresentationPart.java b/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/MainPresentationPart.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/MainPresentationPart.java
rename to src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/MainPresentationPart.java
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/NotesMasterPart.java b/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/NotesMasterPart.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/NotesMasterPart.java
rename to src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/NotesMasterPart.java
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/NotesSlidePart.java b/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/NotesSlidePart.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/NotesSlidePart.java
rename to src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/NotesSlidePart.java
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/PresentationPropertiesPart.java b/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/PresentationPropertiesPart.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/PresentationPropertiesPart.java
rename to src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/PresentationPropertiesPart.java
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/SlideLayoutPart.java b/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/SlideLayoutPart.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/SlideLayoutPart.java
rename to src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/SlideLayoutPart.java
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/SlideMasterPart.java b/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/SlideMasterPart.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/SlideMasterPart.java
rename to src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/SlideMasterPart.java
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/SlidePart.java b/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/SlidePart.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/SlidePart.java
rename to src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/SlidePart.java
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/TableStylesPart.java b/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/TableStylesPart.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/TableStylesPart.java
rename to src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/TableStylesPart.java
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/TagsPart.java b/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/TagsPart.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/TagsPart.java
rename to src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/TagsPart.java
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/ViewPropertiesPart.java b/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/ViewPropertiesPart.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/ViewPropertiesPart.java
rename to src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/ViewPropertiesPart.java
diff --git a/docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/theme.xml b/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/theme.xml
similarity index 100%
rename from docx4j/src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/theme.xml
rename to src/pptx4j/java/org/docx4j/openpackaging/parts/PresentationML/theme.xml
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/Box.java b/src/pptx4j/java/org/pptx4j/Box.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/Box.java
rename to src/pptx4j/java/org/pptx4j/Box.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/Point.java b/src/pptx4j/java/org/pptx4j/Point.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/Point.java
rename to src/pptx4j/java/org/pptx4j/Point.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/convert/out/svginhtml/PictureExporter.java b/src/pptx4j/java/org/pptx4j/convert/out/svginhtml/PictureExporter.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/convert/out/svginhtml/PictureExporter.java
rename to src/pptx4j/java/org/pptx4j/convert/out/svginhtml/PictureExporter.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/convert/out/svginhtml/SvgExporter.java b/src/pptx4j/java/org/pptx4j/convert/out/svginhtml/SvgExporter.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/convert/out/svginhtml/SvgExporter.java
rename to src/pptx4j/java/org/pptx4j/convert/out/svginhtml/SvgExporter.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/convert/out/svginhtml/pptx2svginhtml.xslt b/src/pptx4j/java/org/pptx4j/convert/out/svginhtml/pptx2svginhtml.xslt
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/convert/out/svginhtml/pptx2svginhtml.xslt
rename to src/pptx4j/java/org/pptx4j/convert/out/svginhtml/pptx2svginhtml.xslt
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/jaxb/Context.java b/src/pptx4j/java/org/pptx4j/jaxb/Context.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/jaxb/Context.java
rename to src/pptx4j/java/org/pptx4j/jaxb/Context.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/model/ResolvedLayout.java b/src/pptx4j/java/org/pptx4j/model/ResolvedLayout.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/model/ResolvedLayout.java
rename to src/pptx4j/java/org/pptx4j/model/ResolvedLayout.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/model/ShapeWrapper.java b/src/pptx4j/java/org/pptx4j/model/ShapeWrapper.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/model/ShapeWrapper.java
rename to src/pptx4j/java/org/pptx4j/model/ShapeWrapper.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/model/SlideSizesWellKnown.java b/src/pptx4j/java/org/pptx4j/model/SlideSizesWellKnown.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/model/SlideSizesWellKnown.java
rename to src/pptx4j/java/org/pptx4j/model/SlideSizesWellKnown.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/model/TextStyles.java b/src/pptx4j/java/org/pptx4j/model/TextStyles.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/model/TextStyles.java
rename to src/pptx4j/java/org/pptx4j/model/TextStyles.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTBackground.java b/src/pptx4j/java/org/pptx4j/pml/CTBackground.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTBackground.java
rename to src/pptx4j/java/org/pptx4j/pml/CTBackground.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTBackgroundProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTBackgroundProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTBackgroundProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTBackgroundProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTBuildList.java b/src/pptx4j/java/org/pptx4j/pml/CTBuildList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTBuildList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTBuildList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTComment.java b/src/pptx4j/java/org/pptx4j/pml/CTComment.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTComment.java
rename to src/pptx4j/java/org/pptx4j/pml/CTComment.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTCommentAuthor.java b/src/pptx4j/java/org/pptx4j/pml/CTCommentAuthor.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTCommentAuthor.java
rename to src/pptx4j/java/org/pptx4j/pml/CTCommentAuthor.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTCommentAuthorList.java b/src/pptx4j/java/org/pptx4j/pml/CTCommentAuthorList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTCommentAuthorList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTCommentAuthorList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTCommentList.java b/src/pptx4j/java/org/pptx4j/pml/CTCommentList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTCommentList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTCommentList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTCommonSlideViewProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTCommonSlideViewProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTCommonSlideViewProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTCommonSlideViewProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTCommonViewProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTCommonViewProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTCommonViewProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTCommonViewProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTControl.java b/src/pptx4j/java/org/pptx4j/pml/CTControl.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTControl.java
rename to src/pptx4j/java/org/pptx4j/pml/CTControl.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTControlList.java b/src/pptx4j/java/org/pptx4j/pml/CTControlList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTControlList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTControlList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTCornerDirectionTransition.java b/src/pptx4j/java/org/pptx4j/pml/CTCornerDirectionTransition.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTCornerDirectionTransition.java
rename to src/pptx4j/java/org/pptx4j/pml/CTCornerDirectionTransition.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTCustomShow.java b/src/pptx4j/java/org/pptx4j/pml/CTCustomShow.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTCustomShow.java
rename to src/pptx4j/java/org/pptx4j/pml/CTCustomShow.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTCustomShowId.java b/src/pptx4j/java/org/pptx4j/pml/CTCustomShowId.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTCustomShowId.java
rename to src/pptx4j/java/org/pptx4j/pml/CTCustomShowId.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTCustomShowList.java b/src/pptx4j/java/org/pptx4j/pml/CTCustomShowList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTCustomShowList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTCustomShowList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTCustomerData.java b/src/pptx4j/java/org/pptx4j/pml/CTCustomerData.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTCustomerData.java
rename to src/pptx4j/java/org/pptx4j/pml/CTCustomerData.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTCustomerDataList.java b/src/pptx4j/java/org/pptx4j/pml/CTCustomerDataList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTCustomerDataList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTCustomerDataList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTEightDirectionTransition.java b/src/pptx4j/java/org/pptx4j/pml/CTEightDirectionTransition.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTEightDirectionTransition.java
rename to src/pptx4j/java/org/pptx4j/pml/CTEightDirectionTransition.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTEmbeddedFontDataId.java b/src/pptx4j/java/org/pptx4j/pml/CTEmbeddedFontDataId.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTEmbeddedFontDataId.java
rename to src/pptx4j/java/org/pptx4j/pml/CTEmbeddedFontDataId.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTEmbeddedFontList.java b/src/pptx4j/java/org/pptx4j/pml/CTEmbeddedFontList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTEmbeddedFontList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTEmbeddedFontList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTEmbeddedFontListEntry.java b/src/pptx4j/java/org/pptx4j/pml/CTEmbeddedFontListEntry.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTEmbeddedFontListEntry.java
rename to src/pptx4j/java/org/pptx4j/pml/CTEmbeddedFontListEntry.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTEmpty.java b/src/pptx4j/java/org/pptx4j/pml/CTEmpty.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTEmpty.java
rename to src/pptx4j/java/org/pptx4j/pml/CTEmpty.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTExtension.java b/src/pptx4j/java/org/pptx4j/pml/CTExtension.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTExtension.java
rename to src/pptx4j/java/org/pptx4j/pml/CTExtension.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTExtensionList.java b/src/pptx4j/java/org/pptx4j/pml/CTExtensionList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTExtensionList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTExtensionList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTExtensionListModify.java b/src/pptx4j/java/org/pptx4j/pml/CTExtensionListModify.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTExtensionListModify.java
rename to src/pptx4j/java/org/pptx4j/pml/CTExtensionListModify.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTGraphicalObjectFrame.java b/src/pptx4j/java/org/pptx4j/pml/CTGraphicalObjectFrame.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTGraphicalObjectFrame.java
rename to src/pptx4j/java/org/pptx4j/pml/CTGraphicalObjectFrame.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTGraphicalObjectFrameNonVisual.java b/src/pptx4j/java/org/pptx4j/pml/CTGraphicalObjectFrameNonVisual.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTGraphicalObjectFrameNonVisual.java
rename to src/pptx4j/java/org/pptx4j/pml/CTGraphicalObjectFrameNonVisual.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTGuide.java b/src/pptx4j/java/org/pptx4j/pml/CTGuide.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTGuide.java
rename to src/pptx4j/java/org/pptx4j/pml/CTGuide.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTGuideList.java b/src/pptx4j/java/org/pptx4j/pml/CTGuideList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTGuideList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTGuideList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTHandoutMasterIdList.java b/src/pptx4j/java/org/pptx4j/pml/CTHandoutMasterIdList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTHandoutMasterIdList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTHandoutMasterIdList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTHandoutMasterIdListEntry.java b/src/pptx4j/java/org/pptx4j/pml/CTHandoutMasterIdListEntry.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTHandoutMasterIdListEntry.java
rename to src/pptx4j/java/org/pptx4j/pml/CTHandoutMasterIdListEntry.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTHeaderFooter.java b/src/pptx4j/java/org/pptx4j/pml/CTHeaderFooter.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTHeaderFooter.java
rename to src/pptx4j/java/org/pptx4j/pml/CTHeaderFooter.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTHtmlPublishProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTHtmlPublishProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTHtmlPublishProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTHtmlPublishProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTInOutTransition.java b/src/pptx4j/java/org/pptx4j/pml/CTInOutTransition.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTInOutTransition.java
rename to src/pptx4j/java/org/pptx4j/pml/CTInOutTransition.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTIndexRange.java b/src/pptx4j/java/org/pptx4j/pml/CTIndexRange.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTIndexRange.java
rename to src/pptx4j/java/org/pptx4j/pml/CTIndexRange.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTKinsoku.java b/src/pptx4j/java/org/pptx4j/pml/CTKinsoku.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTKinsoku.java
rename to src/pptx4j/java/org/pptx4j/pml/CTKinsoku.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTModifyVerifier.java b/src/pptx4j/java/org/pptx4j/pml/CTModifyVerifier.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTModifyVerifier.java
rename to src/pptx4j/java/org/pptx4j/pml/CTModifyVerifier.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTNormalViewPortion.java b/src/pptx4j/java/org/pptx4j/pml/CTNormalViewPortion.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTNormalViewPortion.java
rename to src/pptx4j/java/org/pptx4j/pml/CTNormalViewPortion.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTNormalViewProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTNormalViewProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTNormalViewProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTNormalViewProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTNotesMasterIdList.java b/src/pptx4j/java/org/pptx4j/pml/CTNotesMasterIdList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTNotesMasterIdList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTNotesMasterIdList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTNotesMasterIdListEntry.java b/src/pptx4j/java/org/pptx4j/pml/CTNotesMasterIdListEntry.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTNotesMasterIdListEntry.java
rename to src/pptx4j/java/org/pptx4j/pml/CTNotesMasterIdListEntry.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTNotesTextViewProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTNotesTextViewProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTNotesTextViewProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTNotesTextViewProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTNotesViewProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTNotesViewProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTNotesViewProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTNotesViewProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTOleObject.java b/src/pptx4j/java/org/pptx4j/pml/CTOleObject.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTOleObject.java
rename to src/pptx4j/java/org/pptx4j/pml/CTOleObject.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTOleObjectEmbed.java b/src/pptx4j/java/org/pptx4j/pml/CTOleObjectEmbed.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTOleObjectEmbed.java
rename to src/pptx4j/java/org/pptx4j/pml/CTOleObjectEmbed.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTOleObjectLink.java b/src/pptx4j/java/org/pptx4j/pml/CTOleObjectLink.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTOleObjectLink.java
rename to src/pptx4j/java/org/pptx4j/pml/CTOleObjectLink.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTOptionalBlackTransition.java b/src/pptx4j/java/org/pptx4j/pml/CTOptionalBlackTransition.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTOptionalBlackTransition.java
rename to src/pptx4j/java/org/pptx4j/pml/CTOptionalBlackTransition.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTOrientationTransition.java b/src/pptx4j/java/org/pptx4j/pml/CTOrientationTransition.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTOrientationTransition.java
rename to src/pptx4j/java/org/pptx4j/pml/CTOrientationTransition.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTOutlineViewProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTOutlineViewProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTOutlineViewProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTOutlineViewProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTOutlineViewSlideEntry.java b/src/pptx4j/java/org/pptx4j/pml/CTOutlineViewSlideEntry.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTOutlineViewSlideEntry.java
rename to src/pptx4j/java/org/pptx4j/pml/CTOutlineViewSlideEntry.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTOutlineViewSlideList.java b/src/pptx4j/java/org/pptx4j/pml/CTOutlineViewSlideList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTOutlineViewSlideList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTOutlineViewSlideList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTPhotoAlbum.java b/src/pptx4j/java/org/pptx4j/pml/CTPhotoAlbum.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTPhotoAlbum.java
rename to src/pptx4j/java/org/pptx4j/pml/CTPhotoAlbum.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTPlaceholder.java b/src/pptx4j/java/org/pptx4j/pml/CTPlaceholder.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTPlaceholder.java
rename to src/pptx4j/java/org/pptx4j/pml/CTPlaceholder.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTPrintProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTPrintProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTPrintProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTPrintProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTShowInfoBrowse.java b/src/pptx4j/java/org/pptx4j/pml/CTShowInfoBrowse.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTShowInfoBrowse.java
rename to src/pptx4j/java/org/pptx4j/pml/CTShowInfoBrowse.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTShowInfoKiosk.java b/src/pptx4j/java/org/pptx4j/pml/CTShowInfoKiosk.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTShowInfoKiosk.java
rename to src/pptx4j/java/org/pptx4j/pml/CTShowInfoKiosk.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTShowProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTShowProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTShowProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTShowProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTSideDirectionTransition.java b/src/pptx4j/java/org/pptx4j/pml/CTSideDirectionTransition.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTSideDirectionTransition.java
rename to src/pptx4j/java/org/pptx4j/pml/CTSideDirectionTransition.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideMasterTextStyles.java b/src/pptx4j/java/org/pptx4j/pml/CTSlideMasterTextStyles.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideMasterTextStyles.java
rename to src/pptx4j/java/org/pptx4j/pml/CTSlideMasterTextStyles.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideRelationshipList.java b/src/pptx4j/java/org/pptx4j/pml/CTSlideRelationshipList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideRelationshipList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTSlideRelationshipList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideRelationshipListEntry.java b/src/pptx4j/java/org/pptx4j/pml/CTSlideRelationshipListEntry.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideRelationshipListEntry.java
rename to src/pptx4j/java/org/pptx4j/pml/CTSlideRelationshipListEntry.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideSorterViewProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTSlideSorterViewProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideSorterViewProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTSlideSorterViewProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideSyncProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTSlideSyncProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideSyncProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTSlideSyncProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideTiming.java b/src/pptx4j/java/org/pptx4j/pml/CTSlideTiming.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideTiming.java
rename to src/pptx4j/java/org/pptx4j/pml/CTSlideTiming.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideTransition.java b/src/pptx4j/java/org/pptx4j/pml/CTSlideTransition.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideTransition.java
rename to src/pptx4j/java/org/pptx4j/pml/CTSlideTransition.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideViewProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTSlideViewProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTSlideViewProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTSlideViewProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTSmartTags.java b/src/pptx4j/java/org/pptx4j/pml/CTSmartTags.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTSmartTags.java
rename to src/pptx4j/java/org/pptx4j/pml/CTSmartTags.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTSplitTransition.java b/src/pptx4j/java/org/pptx4j/pml/CTSplitTransition.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTSplitTransition.java
rename to src/pptx4j/java/org/pptx4j/pml/CTSplitTransition.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTStringTag.java b/src/pptx4j/java/org/pptx4j/pml/CTStringTag.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTStringTag.java
rename to src/pptx4j/java/org/pptx4j/pml/CTStringTag.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariant.java b/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariant.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariant.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariant.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantBooleanVal.java b/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantBooleanVal.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantBooleanVal.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantBooleanVal.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantFloatVal.java b/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantFloatVal.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantFloatVal.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantFloatVal.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantIntegerVal.java b/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantIntegerVal.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantIntegerVal.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantIntegerVal.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantStringVal.java b/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantStringVal.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantStringVal.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLAnimVariantStringVal.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateBehavior.java b/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateBehavior.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateBehavior.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLAnimateBehavior.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateColorBehavior.java b/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateColorBehavior.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateColorBehavior.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLAnimateColorBehavior.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateEffectBehavior.java b/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateEffectBehavior.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateEffectBehavior.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLAnimateEffectBehavior.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateMotionBehavior.java b/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateMotionBehavior.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateMotionBehavior.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLAnimateMotionBehavior.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateRotationBehavior.java b/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateRotationBehavior.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateRotationBehavior.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLAnimateRotationBehavior.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateScaleBehavior.java b/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateScaleBehavior.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLAnimateScaleBehavior.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLAnimateScaleBehavior.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLBehaviorAttributeNameList.java b/src/pptx4j/java/org/pptx4j/pml/CTTLBehaviorAttributeNameList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLBehaviorAttributeNameList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLBehaviorAttributeNameList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLBuildDiagram.java b/src/pptx4j/java/org/pptx4j/pml/CTTLBuildDiagram.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLBuildDiagram.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLBuildDiagram.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLBuildParagraph.java b/src/pptx4j/java/org/pptx4j/pml/CTTLBuildParagraph.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLBuildParagraph.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLBuildParagraph.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLByAnimateColorTransform.java b/src/pptx4j/java/org/pptx4j/pml/CTTLByAnimateColorTransform.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLByAnimateColorTransform.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLByAnimateColorTransform.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLByHslColorTransform.java b/src/pptx4j/java/org/pptx4j/pml/CTTLByHslColorTransform.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLByHslColorTransform.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLByHslColorTransform.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLByRgbColorTransform.java b/src/pptx4j/java/org/pptx4j/pml/CTTLByRgbColorTransform.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLByRgbColorTransform.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLByRgbColorTransform.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLCommandBehavior.java b/src/pptx4j/java/org/pptx4j/pml/CTTLCommandBehavior.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLCommandBehavior.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLCommandBehavior.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLCommonBehaviorData.java b/src/pptx4j/java/org/pptx4j/pml/CTTLCommonBehaviorData.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLCommonBehaviorData.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLCommonBehaviorData.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLCommonMediaNodeData.java b/src/pptx4j/java/org/pptx4j/pml/CTTLCommonMediaNodeData.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLCommonMediaNodeData.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLCommonMediaNodeData.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLCommonTimeNodeData.java b/src/pptx4j/java/org/pptx4j/pml/CTTLCommonTimeNodeData.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLCommonTimeNodeData.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLCommonTimeNodeData.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLGraphicalObjectBuild.java b/src/pptx4j/java/org/pptx4j/pml/CTTLGraphicalObjectBuild.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLGraphicalObjectBuild.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLGraphicalObjectBuild.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLIterateData.java b/src/pptx4j/java/org/pptx4j/pml/CTTLIterateData.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLIterateData.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLIterateData.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLIterateIntervalPercentage.java b/src/pptx4j/java/org/pptx4j/pml/CTTLIterateIntervalPercentage.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLIterateIntervalPercentage.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLIterateIntervalPercentage.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLIterateIntervalTime.java b/src/pptx4j/java/org/pptx4j/pml/CTTLIterateIntervalTime.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLIterateIntervalTime.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLIterateIntervalTime.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLMediaNodeAudio.java b/src/pptx4j/java/org/pptx4j/pml/CTTLMediaNodeAudio.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLMediaNodeAudio.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLMediaNodeAudio.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLMediaNodeVideo.java b/src/pptx4j/java/org/pptx4j/pml/CTTLMediaNodeVideo.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLMediaNodeVideo.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLMediaNodeVideo.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLOleBuildChart.java b/src/pptx4j/java/org/pptx4j/pml/CTTLOleBuildChart.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLOleBuildChart.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLOleBuildChart.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLOleChartTargetElement.java b/src/pptx4j/java/org/pptx4j/pml/CTTLOleChartTargetElement.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLOleChartTargetElement.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLOleChartTargetElement.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLPoint.java b/src/pptx4j/java/org/pptx4j/pml/CTTLPoint.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLPoint.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLPoint.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLSetBehavior.java b/src/pptx4j/java/org/pptx4j/pml/CTTLSetBehavior.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLSetBehavior.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLSetBehavior.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLShapeTargetElement.java b/src/pptx4j/java/org/pptx4j/pml/CTTLShapeTargetElement.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLShapeTargetElement.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLShapeTargetElement.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLSubShapeId.java b/src/pptx4j/java/org/pptx4j/pml/CTTLSubShapeId.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLSubShapeId.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLSubShapeId.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTemplate.java b/src/pptx4j/java/org/pptx4j/pml/CTTLTemplate.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTemplate.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLTemplate.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTemplateList.java b/src/pptx4j/java/org/pptx4j/pml/CTTLTemplateList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTemplateList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLTemplateList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTextTargetElement.java b/src/pptx4j/java/org/pptx4j/pml/CTTLTextTargetElement.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTextTargetElement.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLTextTargetElement.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeAnimateValue.java b/src/pptx4j/java/org/pptx4j/pml/CTTLTimeAnimateValue.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeAnimateValue.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLTimeAnimateValue.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeAnimateValueList.java b/src/pptx4j/java/org/pptx4j/pml/CTTLTimeAnimateValueList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeAnimateValueList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLTimeAnimateValueList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeCondition.java b/src/pptx4j/java/org/pptx4j/pml/CTTLTimeCondition.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeCondition.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLTimeCondition.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeConditionList.java b/src/pptx4j/java/org/pptx4j/pml/CTTLTimeConditionList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeConditionList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLTimeConditionList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeNodeExclusive.java b/src/pptx4j/java/org/pptx4j/pml/CTTLTimeNodeExclusive.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeNodeExclusive.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLTimeNodeExclusive.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeNodeParallel.java b/src/pptx4j/java/org/pptx4j/pml/CTTLTimeNodeParallel.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeNodeParallel.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLTimeNodeParallel.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeNodeSequence.java b/src/pptx4j/java/org/pptx4j/pml/CTTLTimeNodeSequence.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeNodeSequence.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLTimeNodeSequence.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeTargetElement.java b/src/pptx4j/java/org/pptx4j/pml/CTTLTimeTargetElement.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTimeTargetElement.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLTimeTargetElement.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTriggerRuntimeNode.java b/src/pptx4j/java/org/pptx4j/pml/CTTLTriggerRuntimeNode.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTriggerRuntimeNode.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLTriggerRuntimeNode.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTriggerTimeNodeID.java b/src/pptx4j/java/org/pptx4j/pml/CTTLTriggerTimeNodeID.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTLTriggerTimeNodeID.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTLTriggerTimeNodeID.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTagsData.java b/src/pptx4j/java/org/pptx4j/pml/CTTagsData.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTagsData.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTagsData.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTimeNodeList.java b/src/pptx4j/java/org/pptx4j/pml/CTTimeNodeList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTimeNodeList.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTimeNodeList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTransitionSoundAction.java b/src/pptx4j/java/org/pptx4j/pml/CTTransitionSoundAction.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTransitionSoundAction.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTransitionSoundAction.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTTransitionStartSoundAction.java b/src/pptx4j/java/org/pptx4j/pml/CTTransitionStartSoundAction.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTTransitionStartSoundAction.java
rename to src/pptx4j/java/org/pptx4j/pml/CTTransitionStartSoundAction.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTWebProperties.java b/src/pptx4j/java/org/pptx4j/pml/CTWebProperties.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTWebProperties.java
rename to src/pptx4j/java/org/pptx4j/pml/CTWebProperties.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CTWheelTransition.java b/src/pptx4j/java/org/pptx4j/pml/CTWheelTransition.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CTWheelTransition.java
rename to src/pptx4j/java/org/pptx4j/pml/CTWheelTransition.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CommonSlideData.java b/src/pptx4j/java/org/pptx4j/pml/CommonSlideData.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CommonSlideData.java
rename to src/pptx4j/java/org/pptx4j/pml/CommonSlideData.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/CxnSp.java b/src/pptx4j/java/org/pptx4j/pml/CxnSp.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/CxnSp.java
rename to src/pptx4j/java/org/pptx4j/pml/CxnSp.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/GroupShape.java b/src/pptx4j/java/org/pptx4j/pml/GroupShape.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/GroupShape.java
rename to src/pptx4j/java/org/pptx4j/pml/GroupShape.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/HandoutMaster.java b/src/pptx4j/java/org/pptx4j/pml/HandoutMaster.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/HandoutMaster.java
rename to src/pptx4j/java/org/pptx4j/pml/HandoutMaster.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/Notes.java b/src/pptx4j/java/org/pptx4j/pml/Notes.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/Notes.java
rename to src/pptx4j/java/org/pptx4j/pml/Notes.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/NotesMaster.java b/src/pptx4j/java/org/pptx4j/pml/NotesMaster.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/NotesMaster.java
rename to src/pptx4j/java/org/pptx4j/pml/NotesMaster.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/NvPr.java b/src/pptx4j/java/org/pptx4j/pml/NvPr.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/NvPr.java
rename to src/pptx4j/java/org/pptx4j/pml/NvPr.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/ObjectFactory.java b/src/pptx4j/java/org/pptx4j/pml/ObjectFactory.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/ObjectFactory.java
rename to src/pptx4j/java/org/pptx4j/pml/ObjectFactory.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/Pic.java b/src/pptx4j/java/org/pptx4j/pml/Pic.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/Pic.java
rename to src/pptx4j/java/org/pptx4j/pml/Pic.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/Presentation.java b/src/pptx4j/java/org/pptx4j/pml/Presentation.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/Presentation.java
rename to src/pptx4j/java/org/pptx4j/pml/Presentation.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/PresentationPr.java b/src/pptx4j/java/org/pptx4j/pml/PresentationPr.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/PresentationPr.java
rename to src/pptx4j/java/org/pptx4j/pml/PresentationPr.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STAlgClass.java b/src/pptx4j/java/org/pptx4j/pml/STAlgClass.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STAlgClass.java
rename to src/pptx4j/java/org/pptx4j/pml/STAlgClass.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STAlgType.java b/src/pptx4j/java/org/pptx4j/pml/STAlgType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STAlgType.java
rename to src/pptx4j/java/org/pptx4j/pml/STAlgType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STCryptProv.java b/src/pptx4j/java/org/pptx4j/pml/STCryptProv.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STCryptProv.java
rename to src/pptx4j/java/org/pptx4j/pml/STCryptProv.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STDirection.java b/src/pptx4j/java/org/pptx4j/pml/STDirection.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STDirection.java
rename to src/pptx4j/java/org/pptx4j/pml/STDirection.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STHtmlPublishWebBrowserSupport.java b/src/pptx4j/java/org/pptx4j/pml/STHtmlPublishWebBrowserSupport.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STHtmlPublishWebBrowserSupport.java
rename to src/pptx4j/java/org/pptx4j/pml/STHtmlPublishWebBrowserSupport.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STIterateType.java b/src/pptx4j/java/org/pptx4j/pml/STIterateType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STIterateType.java
rename to src/pptx4j/java/org/pptx4j/pml/STIterateType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STOleObjectFollowColorScheme.java b/src/pptx4j/java/org/pptx4j/pml/STOleObjectFollowColorScheme.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STOleObjectFollowColorScheme.java
rename to src/pptx4j/java/org/pptx4j/pml/STOleObjectFollowColorScheme.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STPhotoAlbumFrameShape.java b/src/pptx4j/java/org/pptx4j/pml/STPhotoAlbumFrameShape.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STPhotoAlbumFrameShape.java
rename to src/pptx4j/java/org/pptx4j/pml/STPhotoAlbumFrameShape.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STPlaceholderSize.java b/src/pptx4j/java/org/pptx4j/pml/STPlaceholderSize.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STPlaceholderSize.java
rename to src/pptx4j/java/org/pptx4j/pml/STPlaceholderSize.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STPlaceholderType.java b/src/pptx4j/java/org/pptx4j/pml/STPlaceholderType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STPlaceholderType.java
rename to src/pptx4j/java/org/pptx4j/pml/STPlaceholderType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STPrintColorMode.java b/src/pptx4j/java/org/pptx4j/pml/STPrintColorMode.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STPrintColorMode.java
rename to src/pptx4j/java/org/pptx4j/pml/STPrintColorMode.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STPrintWhat.java b/src/pptx4j/java/org/pptx4j/pml/STPrintWhat.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STPrintWhat.java
rename to src/pptx4j/java/org/pptx4j/pml/STPrintWhat.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STSlideLayoutType.java b/src/pptx4j/java/org/pptx4j/pml/STSlideLayoutType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STSlideLayoutType.java
rename to src/pptx4j/java/org/pptx4j/pml/STSlideLayoutType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STSplitterBarState.java b/src/pptx4j/java/org/pptx4j/pml/STSplitterBarState.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STSplitterBarState.java
rename to src/pptx4j/java/org/pptx4j/pml/STSplitterBarState.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateBehaviorCalcMode.java b/src/pptx4j/java/org/pptx4j/pml/STTLAnimateBehaviorCalcMode.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateBehaviorCalcMode.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLAnimateBehaviorCalcMode.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateBehaviorValueType.java b/src/pptx4j/java/org/pptx4j/pml/STTLAnimateBehaviorValueType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateBehaviorValueType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLAnimateBehaviorValueType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateColorDirection.java b/src/pptx4j/java/org/pptx4j/pml/STTLAnimateColorDirection.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateColorDirection.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLAnimateColorDirection.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateColorSpace.java b/src/pptx4j/java/org/pptx4j/pml/STTLAnimateColorSpace.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateColorSpace.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLAnimateColorSpace.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateEffectTransition.java b/src/pptx4j/java/org/pptx4j/pml/STTLAnimateEffectTransition.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateEffectTransition.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLAnimateEffectTransition.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateMotionBehaviorOrigin.java b/src/pptx4j/java/org/pptx4j/pml/STTLAnimateMotionBehaviorOrigin.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateMotionBehaviorOrigin.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLAnimateMotionBehaviorOrigin.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateMotionPathEditMode.java b/src/pptx4j/java/org/pptx4j/pml/STTLAnimateMotionPathEditMode.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLAnimateMotionPathEditMode.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLAnimateMotionPathEditMode.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLBehaviorAccumulateType.java b/src/pptx4j/java/org/pptx4j/pml/STTLBehaviorAccumulateType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLBehaviorAccumulateType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLBehaviorAccumulateType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLBehaviorAdditiveType.java b/src/pptx4j/java/org/pptx4j/pml/STTLBehaviorAdditiveType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLBehaviorAdditiveType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLBehaviorAdditiveType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLBehaviorOverrideType.java b/src/pptx4j/java/org/pptx4j/pml/STTLBehaviorOverrideType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLBehaviorOverrideType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLBehaviorOverrideType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLBehaviorTransformType.java b/src/pptx4j/java/org/pptx4j/pml/STTLBehaviorTransformType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLBehaviorTransformType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLBehaviorTransformType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLChartSubelementType.java b/src/pptx4j/java/org/pptx4j/pml/STTLChartSubelementType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLChartSubelementType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLChartSubelementType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLCommandType.java b/src/pptx4j/java/org/pptx4j/pml/STTLCommandType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLCommandType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLCommandType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLDiagramBuildType.java b/src/pptx4j/java/org/pptx4j/pml/STTLDiagramBuildType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLDiagramBuildType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLDiagramBuildType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLNextActionType.java b/src/pptx4j/java/org/pptx4j/pml/STTLNextActionType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLNextActionType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLNextActionType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLOleChartBuildType.java b/src/pptx4j/java/org/pptx4j/pml/STTLOleChartBuildType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLOleChartBuildType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLOleChartBuildType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLParaBuildType.java b/src/pptx4j/java/org/pptx4j/pml/STTLParaBuildType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLParaBuildType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLParaBuildType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLPreviousActionType.java b/src/pptx4j/java/org/pptx4j/pml/STTLPreviousActionType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLPreviousActionType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLPreviousActionType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeIndefinite.java b/src/pptx4j/java/org/pptx4j/pml/STTLTimeIndefinite.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeIndefinite.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLTimeIndefinite.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeFillType.java b/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeFillType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeFillType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeFillType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeMasterRelation.java b/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeMasterRelation.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeMasterRelation.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeMasterRelation.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodePresetClassType.java b/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodePresetClassType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodePresetClassType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLTimeNodePresetClassType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeRestartType.java b/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeRestartType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeRestartType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeRestartType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeSyncType.java b/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeSyncType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeSyncType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeSyncType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeType.java b/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLTimeNodeType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTriggerEvent.java b/src/pptx4j/java/org/pptx4j/pml/STTLTriggerEvent.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTriggerEvent.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLTriggerEvent.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTriggerRuntimeNode.java b/src/pptx4j/java/org/pptx4j/pml/STTLTriggerRuntimeNode.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTLTriggerRuntimeNode.java
rename to src/pptx4j/java/org/pptx4j/pml/STTLTriggerRuntimeNode.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTransitionCornerDirectionType.java b/src/pptx4j/java/org/pptx4j/pml/STTransitionCornerDirectionType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTransitionCornerDirectionType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTransitionCornerDirectionType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTransitionInOutDirectionType.java b/src/pptx4j/java/org/pptx4j/pml/STTransitionInOutDirectionType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTransitionInOutDirectionType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTransitionInOutDirectionType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTransitionSideDirectionType.java b/src/pptx4j/java/org/pptx4j/pml/STTransitionSideDirectionType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTransitionSideDirectionType.java
rename to src/pptx4j/java/org/pptx4j/pml/STTransitionSideDirectionType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STTransitionSpeed.java b/src/pptx4j/java/org/pptx4j/pml/STTransitionSpeed.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STTransitionSpeed.java
rename to src/pptx4j/java/org/pptx4j/pml/STTransitionSpeed.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STViewType.java b/src/pptx4j/java/org/pptx4j/pml/STViewType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STViewType.java
rename to src/pptx4j/java/org/pptx4j/pml/STViewType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/STWebColorType.java b/src/pptx4j/java/org/pptx4j/pml/STWebColorType.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/STWebColorType.java
rename to src/pptx4j/java/org/pptx4j/pml/STWebColorType.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/Shape.java b/src/pptx4j/java/org/pptx4j/pml/Shape.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/Shape.java
rename to src/pptx4j/java/org/pptx4j/pml/Shape.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/Sld.java b/src/pptx4j/java/org/pptx4j/pml/Sld.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/Sld.java
rename to src/pptx4j/java/org/pptx4j/pml/Sld.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/SldLayout.java b/src/pptx4j/java/org/pptx4j/pml/SldLayout.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/SldLayout.java
rename to src/pptx4j/java/org/pptx4j/pml/SldLayout.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/SldMaster.java b/src/pptx4j/java/org/pptx4j/pml/SldMaster.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/SldMaster.java
rename to src/pptx4j/java/org/pptx4j/pml/SldMaster.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/SlideLayoutIdList.java b/src/pptx4j/java/org/pptx4j/pml/SlideLayoutIdList.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/SlideLayoutIdList.java
rename to src/pptx4j/java/org/pptx4j/pml/SlideLayoutIdList.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/TagLst.java b/src/pptx4j/java/org/pptx4j/pml/TagLst.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/TagLst.java
rename to src/pptx4j/java/org/pptx4j/pml/TagLst.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/ViewPr.java b/src/pptx4j/java/org/pptx4j/pml/ViewPr.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/ViewPr.java
rename to src/pptx4j/java/org/pptx4j/pml/ViewPr.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/header.txt b/src/pptx4j/java/org/pptx4j/pml/header.txt
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/header.txt
rename to src/pptx4j/java/org/pptx4j/pml/header.txt
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/package-info.java b/src/pptx4j/java/org/pptx4j/pml/package-info.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/package-info.java
rename to src/pptx4j/java/org/pptx4j/pml/package-info.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/pml/script b/src/pptx4j/java/org/pptx4j/pml/script
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/pml/script
rename to src/pptx4j/java/org/pptx4j/pml/script
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/samples/AutoShapes.java b/src/pptx4j/java/org/pptx4j/samples/AutoShapes.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/samples/AutoShapes.java
rename to src/pptx4j/java/org/pptx4j/samples/AutoShapes.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/samples/CreateHelloWorld.java b/src/pptx4j/java/org/pptx4j/samples/CreateHelloWorld.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/samples/CreateHelloWorld.java
rename to src/pptx4j/java/org/pptx4j/samples/CreateHelloWorld.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/samples/ImportFromPackageFormat.java b/src/pptx4j/java/org/pptx4j/samples/ImportFromPackageFormat.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/samples/ImportFromPackageFormat.java
rename to src/pptx4j/java/org/pptx4j/samples/ImportFromPackageFormat.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/samples/InsertPicture.java b/src/pptx4j/java/org/pptx4j/samples/InsertPicture.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/samples/InsertPicture.java
rename to src/pptx4j/java/org/pptx4j/samples/InsertPicture.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/samples/RenderAsSvgInHtml.java b/src/pptx4j/java/org/pptx4j/samples/RenderAsSvgInHtml.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/samples/RenderAsSvgInHtml.java
rename to src/pptx4j/java/org/pptx4j/samples/RenderAsSvgInHtml.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/samples/RoundTripTest.java b/src/pptx4j/java/org/pptx4j/samples/RoundTripTest.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/samples/RoundTripTest.java
rename to src/pptx4j/java/org/pptx4j/samples/RoundTripTest.java
diff --git a/docx4j/src/pptx4j/java/org/pptx4j/samples/TraverseSlide.java b/src/pptx4j/java/org/pptx4j/samples/TraverseSlide.java
similarity index 100%
rename from docx4j/src/pptx4j/java/org/pptx4j/samples/TraverseSlide.java
rename to src/pptx4j/java/org/pptx4j/samples/TraverseSlide.java
diff --git a/docx4j/src/scratchpad/XPathNavigation.java b/src/scratchpad/XPathNavigation.java
similarity index 100%
rename from docx4j/src/scratchpad/XPathNavigation.java
rename to src/scratchpad/XPathNavigation.java
diff --git a/docx4j/src/test/java/org/docx4j/convert/out/pdf/PdfMultipleThreads.java b/src/test/java/org/docx4j/convert/out/pdf/PdfMultipleThreads.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/convert/out/pdf/PdfMultipleThreads.java
rename to src/test/java/org/docx4j/convert/out/pdf/PdfMultipleThreads.java
diff --git a/docx4j/src/test/java/org/docx4j/diff/ParagraphDifferencerTest.java b/src/test/java/org/docx4j/diff/ParagraphDifferencerTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/diff/ParagraphDifferencerTest.java
rename to src/test/java/org/docx4j/diff/ParagraphDifferencerTest.java
diff --git a/docx4j/src/test/java/org/docx4j/diff/t1L b/src/test/java/org/docx4j/diff/t1L
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/diff/t1L
rename to src/test/java/org/docx4j/diff/t1L
diff --git a/docx4j/src/test/java/org/docx4j/diff/t1R b/src/test/java/org/docx4j/diff/t1R
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/diff/t1R
rename to src/test/java/org/docx4j/diff/t1R
diff --git a/docx4j/src/test/java/org/docx4j/diff/t2L b/src/test/java/org/docx4j/diff/t2L
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/diff/t2L
rename to src/test/java/org/docx4j/diff/t2L
diff --git a/docx4j/src/test/java/org/docx4j/diff/t2R b/src/test/java/org/docx4j/diff/t2R
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/diff/t2R
rename to src/test/java/org/docx4j/diff/t2R
diff --git a/docx4j/src/test/java/org/docx4j/diff/t2RR b/src/test/java/org/docx4j/diff/t2RR
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/diff/t2RR
rename to src/test/java/org/docx4j/diff/t2RR
diff --git a/docx4j/src/test/java/org/docx4j/diff/t3L b/src/test/java/org/docx4j/diff/t3L
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/diff/t3L
rename to src/test/java/org/docx4j/diff/t3L
diff --git a/docx4j/src/test/java/org/docx4j/diff/t3R b/src/test/java/org/docx4j/diff/t3R
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/diff/t3R
rename to src/test/java/org/docx4j/diff/t3R
diff --git a/docx4j/src/test/java/org/docx4j/diff/t4 b/src/test/java/org/docx4j/diff/t4
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/diff/t4
rename to src/test/java/org/docx4j/diff/t4
diff --git a/docx4j/src/test/java/org/docx4j/listnumbering/ind/ListNumberIndTest.java b/src/test/java/org/docx4j/listnumbering/ind/ListNumberIndTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/listnumbering/ind/ListNumberIndTest.java
rename to src/test/java/org/docx4j/listnumbering/ind/ListNumberIndTest.java
diff --git a/docx4j/src/test/java/org/docx4j/listnumbering/ind/abstract_nostyle_noppr.xml b/src/test/java/org/docx4j/listnumbering/ind/abstract_nostyle_noppr.xml
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/listnumbering/ind/abstract_nostyle_noppr.xml
rename to src/test/java/org/docx4j/listnumbering/ind/abstract_nostyle_noppr.xml
diff --git a/docx4j/src/test/java/org/docx4j/listnumbering/ind/abstract_nostyle_ppr.xml b/src/test/java/org/docx4j/listnumbering/ind/abstract_nostyle_ppr.xml
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/listnumbering/ind/abstract_nostyle_ppr.xml
rename to src/test/java/org/docx4j/listnumbering/ind/abstract_nostyle_ppr.xml
diff --git a/docx4j/src/test/java/org/docx4j/listnumbering/ind/abstract_style_with.xml b/src/test/java/org/docx4j/listnumbering/ind/abstract_style_with.xml
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/listnumbering/ind/abstract_style_with.xml
rename to src/test/java/org/docx4j/listnumbering/ind/abstract_style_with.xml
diff --git a/docx4j/src/test/java/org/docx4j/listnumbering/ind/abstract_style_without.xml b/src/test/java/org/docx4j/listnumbering/ind/abstract_style_without.xml
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/listnumbering/ind/abstract_style_without.xml
rename to src/test/java/org/docx4j/listnumbering/ind/abstract_style_without.xml
diff --git a/docx4j/src/test/java/org/docx4j/listnumbering/ind/override_nostyle_ppr.xml b/src/test/java/org/docx4j/listnumbering/ind/override_nostyle_ppr.xml
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/listnumbering/ind/override_nostyle_ppr.xml
rename to src/test/java/org/docx4j/listnumbering/ind/override_nostyle_ppr.xml
diff --git a/docx4j/src/test/java/org/docx4j/model/datastorage/EndToEndTest.java b/src/test/java/org/docx4j/model/datastorage/EndToEndTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/model/datastorage/EndToEndTest.java
rename to src/test/java/org/docx4j/model/datastorage/EndToEndTest.java
diff --git a/docx4j/src/test/java/org/docx4j/model/datastorage/JAXBElementInRepeatBugFixTest.java b/src/test/java/org/docx4j/model/datastorage/JAXBElementInRepeatBugFixTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/model/datastorage/JAXBElementInRepeatBugFixTest.java
rename to src/test/java/org/docx4j/model/datastorage/JAXBElementInRepeatBugFixTest.java
diff --git a/docx4j/src/test/java/org/docx4j/model/listnumbering/AbstractNumberingTest.java b/src/test/java/org/docx4j/model/listnumbering/AbstractNumberingTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/model/listnumbering/AbstractNumberingTest.java
rename to src/test/java/org/docx4j/model/listnumbering/AbstractNumberingTest.java
diff --git a/docx4j/src/test/java/org/docx4j/model/listnumbering/IndentationTest.java b/src/test/java/org/docx4j/model/listnumbering/IndentationTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/model/listnumbering/IndentationTest.java
rename to src/test/java/org/docx4j/model/listnumbering/IndentationTest.java
diff --git a/docx4j/src/test/java/org/docx4j/model/listnumbering/IsLglTest.java b/src/test/java/org/docx4j/model/listnumbering/IsLglTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/model/listnumbering/IsLglTest.java
rename to src/test/java/org/docx4j/model/listnumbering/IsLglTest.java
diff --git a/docx4j/src/test/java/org/docx4j/model/listnumbering/NumberingIndents-OUT.docx b/src/test/java/org/docx4j/model/listnumbering/NumberingIndents-OUT.docx
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/model/listnumbering/NumberingIndents-OUT.docx
rename to src/test/java/org/docx4j/model/listnumbering/NumberingIndents-OUT.docx
diff --git a/docx4j/src/test/java/org/docx4j/model/listnumbering/NumberingIndents.docx b/src/test/java/org/docx4j/model/listnumbering/NumberingIndents.docx
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/model/listnumbering/NumberingIndents.docx
rename to src/test/java/org/docx4j/model/listnumbering/NumberingIndents.docx
diff --git a/docx4j/src/test/java/org/docx4j/model/listnumbering/StartOverrideTest.java b/src/test/java/org/docx4j/model/listnumbering/StartOverrideTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/model/listnumbering/StartOverrideTest.java
rename to src/test/java/org/docx4j/model/listnumbering/StartOverrideTest.java
diff --git a/docx4j/src/test/java/org/docx4j/model/listnumbering/article-section-NotIsLgl.docx b/src/test/java/org/docx4j/model/listnumbering/article-section-NotIsLgl.docx
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/model/listnumbering/article-section-NotIsLgl.docx
rename to src/test/java/org/docx4j/model/listnumbering/article-section-NotIsLgl.docx
diff --git a/docx4j/src/test/java/org/docx4j/model/listnumbering/article-section-isLgl.docx b/src/test/java/org/docx4j/model/listnumbering/article-section-isLgl.docx
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/model/listnumbering/article-section-isLgl.docx
rename to src/test/java/org/docx4j/model/listnumbering/article-section-isLgl.docx
diff --git a/docx4j/src/test/java/org/docx4j/model/listnumbering/startOverride.docx b/src/test/java/org/docx4j/model/listnumbering/startOverride.docx
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/model/listnumbering/startOverride.docx
rename to src/test/java/org/docx4j/model/listnumbering/startOverride.docx
diff --git a/docx4j/src/test/java/org/docx4j/openpackaging/URIHelperTest.java b/src/test/java/org/docx4j/openpackaging/URIHelperTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/openpackaging/URIHelperTest.java
rename to src/test/java/org/docx4j/openpackaging/URIHelperTest.java
diff --git a/docx4j/src/test/java/org/docx4j/openpackaging/parts/WordprocessingML/AlternateContentPreprocessorTest.java b/src/test/java/org/docx4j/openpackaging/parts/WordprocessingML/AlternateContentPreprocessorTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/openpackaging/parts/WordprocessingML/AlternateContentPreprocessorTest.java
rename to src/test/java/org/docx4j/openpackaging/parts/WordprocessingML/AlternateContentPreprocessorTest.java
diff --git a/docx4j/src/test/java/org/docx4j/openpackaging/parts/WordprocessingML/CreateImageTest.java b/src/test/java/org/docx4j/openpackaging/parts/WordprocessingML/CreateImageTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/openpackaging/parts/WordprocessingML/CreateImageTest.java
rename to src/test/java/org/docx4j/openpackaging/parts/WordprocessingML/CreateImageTest.java
diff --git a/docx4j/src/test/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageTypeBmpTest.java b/src/test/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageTypeBmpTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageTypeBmpTest.java
rename to src/test/java/org/docx4j/openpackaging/parts/WordprocessingML/ImageTypeBmpTest.java
diff --git a/docx4j/src/test/java/org/docx4j/openpackaging/parts/relationships/AddPartTests.java b/src/test/java/org/docx4j/openpackaging/parts/relationships/AddPartTests.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/openpackaging/parts/relationships/AddPartTests.java
rename to src/test/java/org/docx4j/openpackaging/parts/relationships/AddPartTests.java
diff --git a/docx4j/src/test/java/org/docx4j/openpackaging/parts/relationships/AlteredPartsTest.java b/src/test/java/org/docx4j/openpackaging/parts/relationships/AlteredPartsTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/openpackaging/parts/relationships/AlteredPartsTest.java
rename to src/test/java/org/docx4j/openpackaging/parts/relationships/AlteredPartsTest.java
diff --git a/docx4j/src/test/java/org/docx4j/openpackaging/parts/relationships/PatcherTest.java b/src/test/java/org/docx4j/openpackaging/parts/relationships/PatcherTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/openpackaging/parts/relationships/PatcherTest.java
rename to src/test/java/org/docx4j/openpackaging/parts/relationships/PatcherTest.java
diff --git a/docx4j/src/test/java/org/docx4j/xpathextend/grammar/XPathConfiguration.java b/src/test/java/org/docx4j/xpathextend/grammar/XPathConfiguration.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/xpathextend/grammar/XPathConfiguration.java
rename to src/test/java/org/docx4j/xpathextend/grammar/XPathConfiguration.java
diff --git a/docx4j/src/test/java/org/docx4j/xpathextend/grammar/XPathEnhancerTest.java b/src/test/java/org/docx4j/xpathextend/grammar/XPathEnhancerTest.java
similarity index 100%
rename from docx4j/src/test/java/org/docx4j/xpathextend/grammar/XPathEnhancerTest.java
rename to src/test/java/org/docx4j/xpathextend/grammar/XPathEnhancerTest.java
diff --git a/docx4j/src/test/resources/AlteredParts/comments-one.docx b/src/test/resources/AlteredParts/comments-one.docx
similarity index 100%
rename from docx4j/src/test/resources/AlteredParts/comments-one.docx
rename to src/test/resources/AlteredParts/comments-one.docx
diff --git a/docx4j/src/test/resources/AlteredParts/comments-two.docx b/src/test/resources/AlteredParts/comments-two.docx
similarity index 100%
rename from docx4j/src/test/resources/AlteredParts/comments-two.docx
rename to src/test/resources/AlteredParts/comments-two.docx
diff --git a/docx4j/src/test/resources/AlteredParts/header-section2.docx b/src/test/resources/AlteredParts/header-section2.docx
similarity index 100%
rename from docx4j/src/test/resources/AlteredParts/header-section2.docx
rename to src/test/resources/AlteredParts/header-section2.docx
diff --git a/docx4j/src/test/resources/AlteredParts/header-simple-plus-image.docx b/src/test/resources/AlteredParts/header-simple-plus-image.docx
similarity index 100%
rename from docx4j/src/test/resources/AlteredParts/header-simple-plus-image.docx
rename to src/test/resources/AlteredParts/header-simple-plus-image.docx
diff --git a/docx4j/src/test/resources/AlteredParts/header-simple.docx b/src/test/resources/AlteredParts/header-simple.docx
similarity index 100%
rename from docx4j/src/test/resources/AlteredParts/header-simple.docx
rename to src/test/resources/AlteredParts/header-simple.docx
diff --git a/docx4j/src/test/resources/AlteredParts/hyperlink.docx b/src/test/resources/AlteredParts/hyperlink.docx
similarity index 100%
rename from docx4j/src/test/resources/AlteredParts/hyperlink.docx
rename to src/test/resources/AlteredParts/hyperlink.docx
diff --git a/docx4j/src/test/resources/AlteredParts/image-png1-scaled.docx b/src/test/resources/AlteredParts/image-png1-scaled.docx
similarity index 100%
rename from docx4j/src/test/resources/AlteredParts/image-png1-scaled.docx
rename to src/test/resources/AlteredParts/image-png1-scaled.docx
diff --git a/docx4j/src/test/resources/AlteredParts/image-png1.docx b/src/test/resources/AlteredParts/image-png1.docx
similarity index 100%
rename from docx4j/src/test/resources/AlteredParts/image-png1.docx
rename to src/test/resources/AlteredParts/image-png1.docx
diff --git a/docx4j/src/test/resources/AlteredParts/image-png2.docx b/src/test/resources/AlteredParts/image-png2.docx
similarity index 100%
rename from docx4j/src/test/resources/AlteredParts/image-png2.docx
rename to src/test/resources/AlteredParts/image-png2.docx
diff --git a/docx4j/src/test/resources/AlteredParts/images-jpg then png2.docx b/src/test/resources/AlteredParts/images-jpg then png2.docx
similarity index 100%
rename from docx4j/src/test/resources/AlteredParts/images-jpg then png2.docx
rename to src/test/resources/AlteredParts/images-jpg then png2.docx
diff --git a/docx4j/src/test/resources/AlteredParts/images-png2 then jpg.docx b/src/test/resources/AlteredParts/images-png2 then jpg.docx
similarity index 100%
rename from docx4j/src/test/resources/AlteredParts/images-png2 then jpg.docx
rename to src/test/resources/AlteredParts/images-png2 then jpg.docx
diff --git a/docx4j/src/test/resources/AlteredParts/paragraph-single.docx b/src/test/resources/AlteredParts/paragraph-single.docx
similarity index 100%
rename from docx4j/src/test/resources/AlteredParts/paragraph-single.docx
rename to src/test/resources/AlteredParts/paragraph-single.docx
diff --git a/docx4j/src/test/resources/AlteredParts/paragraph-two.docx b/src/test/resources/AlteredParts/paragraph-two.docx
similarity index 100%
rename from docx4j/src/test/resources/AlteredParts/paragraph-two.docx
rename to src/test/resources/AlteredParts/paragraph-two.docx
diff --git a/docx4j/src/test/resources/NumberingImplicitNumId.docx b/src/test/resources/NumberingImplicitNumId.docx
similarity index 100%
rename from docx4j/src/test/resources/NumberingImplicitNumId.docx
rename to src/test/resources/NumberingImplicitNumId.docx
diff --git a/docx4j/src/test/resources/OpenDoPE/escaped-xhtml.xml b/src/test/resources/OpenDoPE/escaped-xhtml.xml
similarity index 100%
rename from docx4j/src/test/resources/OpenDoPE/escaped-xhtml.xml
rename to src/test/resources/OpenDoPE/escaped-xhtml.xml
diff --git a/docx4j/src/test/resources/OpenDoPE/hyperlinks.docx b/src/test/resources/OpenDoPE/hyperlinks.docx
similarity index 100%
rename from docx4j/src/test/resources/OpenDoPE/hyperlinks.docx
rename to src/test/resources/OpenDoPE/hyperlinks.docx
diff --git a/docx4j/src/test/resources/OpenDoPE/image-in-repeat.xml b/src/test/resources/OpenDoPE/image-in-repeat.xml
similarity index 100%
rename from docx4j/src/test/resources/OpenDoPE/image-in-repeat.xml
rename to src/test/resources/OpenDoPE/image-in-repeat.xml
diff --git a/docx4j/src/test/resources/OpenDoPE/repeat-containing-JAXBElement.docx b/src/test/resources/OpenDoPE/repeat-containing-JAXBElement.docx
similarity index 100%
rename from docx4j/src/test/resources/OpenDoPE/repeat-containing-JAXBElement.docx
rename to src/test/resources/OpenDoPE/repeat-containing-JAXBElement.docx
diff --git a/docx4j/src/test/resources/OpenDoPE/xhtml-in-repeat.xml b/src/test/resources/OpenDoPE/xhtml-in-repeat.xml
similarity index 100%
rename from docx4j/src/test/resources/OpenDoPE/xhtml-in-repeat.xml
rename to src/test/resources/OpenDoPE/xhtml-in-repeat.xml
diff --git a/docx4j/src/test/resources/header-no-rels.docx b/src/test/resources/header-no-rels.docx
similarity index 100%
rename from docx4j/src/test/resources/header-no-rels.docx
rename to src/test/resources/header-no-rels.docx
diff --git a/docx4j/src/test/resources/images/VENUS.BMP b/src/test/resources/images/VENUS.BMP
similarity index 100%
rename from docx4j/src/test/resources/images/VENUS.BMP
rename to src/test/resources/images/VENUS.BMP
diff --git a/docx4j/src/test/resources/images/greentick.png b/src/test/resources/images/greentick.png
similarity index 100%
rename from docx4j/src/test/resources/images/greentick.png
rename to src/test/resources/images/greentick.png
diff --git a/docx4j/src/test/resources/jaxb-binder-issue.docx b/src/test/resources/jaxb-binder-issue.docx
similarity index 100%
rename from docx4j/src/test/resources/jaxb-binder-issue.docx
rename to src/test/resources/jaxb-binder-issue.docx
diff --git a/docx4j/src/test/resources/xhtml/extjs-cleaned-omitDepr.xhtml b/src/test/resources/xhtml/extjs-cleaned-omitDepr.xhtml
similarity index 100%
rename from docx4j/src/test/resources/xhtml/extjs-cleaned-omitDepr.xhtml
rename to src/test/resources/xhtml/extjs-cleaned-omitDepr.xhtml
diff --git a/docx4j/src/test/resources/xhtml/extjs-cleaned-with-font-tag.xhtml b/src/test/resources/xhtml/extjs-cleaned-with-font-tag.xhtml
similarity index 100%
rename from docx4j/src/test/resources/xhtml/extjs-cleaned-with-font-tag.xhtml
rename to src/test/resources/xhtml/extjs-cleaned-with-font-tag.xhtml
diff --git a/docx4j/src/test/resources/xhtml/inheritance-no-dtd.html b/src/test/resources/xhtml/inheritance-no-dtd.html
similarity index 100%
rename from docx4j/src/test/resources/xhtml/inheritance-no-dtd.html
rename to src/test/resources/xhtml/inheritance-no-dtd.html
diff --git a/docx4j/src/test/resources/xhtml/inheritance.docx b/src/test/resources/xhtml/inheritance.docx
similarity index 100%
rename from docx4j/src/test/resources/xhtml/inheritance.docx
rename to src/test/resources/xhtml/inheritance.docx
diff --git a/docx4j/src/test/resources/xhtml/inheritance.html b/src/test/resources/xhtml/inheritance.html
similarity index 100%
rename from docx4j/src/test/resources/xhtml/inheritance.html
rename to src/test/resources/xhtml/inheritance.html
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/packages/SpreadsheetMLPackage.java b/src/xlsx4j/java/org/docx4j/openpackaging/packages/SpreadsheetMLPackage.java
old mode 100755
new mode 100644
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/packages/SpreadsheetMLPackage.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/packages/SpreadsheetMLPackage.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/CalcChain.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/CalcChain.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/CalcChain.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/CalcChain.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/CommentsPart.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/CommentsPart.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/CommentsPart.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/CommentsPart.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/ConnectionsPart.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/ConnectionsPart.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/ConnectionsPart.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/ConnectionsPart.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/JaxbSmlPart.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/JaxbSmlPart.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/JaxbSmlPart.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/JaxbSmlPart.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PivotCacheDefinition.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PivotCacheDefinition.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PivotCacheDefinition.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PivotCacheDefinition.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PivotCacheRecords.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PivotCacheRecords.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PivotCacheRecords.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PivotCacheRecords.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PivotTable.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PivotTable.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PivotTable.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PivotTable.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PrinterSettings.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PrinterSettings.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PrinterSettings.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/PrinterSettings.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/QueryTablePart.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/QueryTablePart.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/QueryTablePart.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/QueryTablePart.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/SharedStrings.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/SharedStrings.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/SharedStrings.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/SharedStrings.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/Styles.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/Styles.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/Styles.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/Styles.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/TablePart.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/TablePart.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/TablePart.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/TablePart.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/WorkbookPart.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/WorkbookPart.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/WorkbookPart.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/WorkbookPart.java
diff --git a/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/WorksheetPart.java b/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/WorksheetPart.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/WorksheetPart.java
rename to src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/WorksheetPart.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/jaxb/Context.java b/src/xlsx4j/java/org/xlsx4j/jaxb/Context.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/jaxb/Context.java
rename to src/xlsx4j/java/org/xlsx4j/jaxb/Context.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/samples/CreateSimpleSpreadsheet.java b/src/xlsx4j/java/org/xlsx4j/samples/CreateSimpleSpreadsheet.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/samples/CreateSimpleSpreadsheet.java
rename to src/xlsx4j/java/org/xlsx4j/samples/CreateSimpleSpreadsheet.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/samples/PartsList.java b/src/xlsx4j/java/org/xlsx4j/samples/PartsList.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/samples/PartsList.java
rename to src/xlsx4j/java/org/xlsx4j/samples/PartsList.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/samples/XlsxRoundTrip.java b/src/xlsx4j/java/org/xlsx4j/samples/XlsxRoundTrip.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/samples/XlsxRoundTrip.java
rename to src/xlsx4j/java/org/xlsx4j/samples/XlsxRoundTrip.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/BookViews.java b/src/xlsx4j/java/org/xlsx4j/sml/BookViews.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/BookViews.java
rename to src/xlsx4j/java/org/xlsx4j/sml/BookViews.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTAuthors.java b/src/xlsx4j/java/org/xlsx4j/sml/CTAuthors.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTAuthors.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTAuthors.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTAutoFilter.java b/src/xlsx4j/java/org/xlsx4j/sml/CTAutoFilter.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTAutoFilter.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTAutoFilter.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTAutoSortScope.java b/src/xlsx4j/java/org/xlsx4j/sml/CTAutoSortScope.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTAutoSortScope.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTAutoSortScope.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBookView.java b/src/xlsx4j/java/org/xlsx4j/sml/CTBookView.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBookView.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTBookView.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBoolean.java b/src/xlsx4j/java/org/xlsx4j/sml/CTBoolean.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBoolean.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTBoolean.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBooleanProperty.java b/src/xlsx4j/java/org/xlsx4j/sml/CTBooleanProperty.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBooleanProperty.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTBooleanProperty.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBorder.java b/src/xlsx4j/java/org/xlsx4j/sml/CTBorder.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBorder.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTBorder.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBorderPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTBorderPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBorderPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTBorderPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBorders.java b/src/xlsx4j/java/org/xlsx4j/sml/CTBorders.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBorders.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTBorders.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBreak.java b/src/xlsx4j/java/org/xlsx4j/sml/CTBreak.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTBreak.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTBreak.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCacheField.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCacheField.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCacheField.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCacheField.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCacheFields.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCacheFields.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCacheFields.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCacheFields.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCacheHierarchies.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCacheHierarchies.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCacheHierarchies.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCacheHierarchies.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCacheHierarchy.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCacheHierarchy.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCacheHierarchy.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCacheHierarchy.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCacheSource.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCacheSource.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCacheSource.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCacheSource.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalcCell.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCalcCell.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalcCell.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCalcCell.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalcChain.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCalcChain.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalcChain.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCalcChain.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalcPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCalcPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalcPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCalcPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedItem.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedItem.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedItem.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedItem.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedItems.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedItems.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedItems.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedItems.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedMember.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedMember.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedMember.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedMember.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedMembers.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedMembers.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedMembers.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCalculatedMembers.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellAlignment.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCellAlignment.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellAlignment.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCellAlignment.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellFormula.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCellFormula.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellFormula.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCellFormula.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellProtection.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCellProtection.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellProtection.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCellProtection.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellSmartTag.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCellSmartTag.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellSmartTag.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCellSmartTag.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellSmartTagPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCellSmartTagPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellSmartTagPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCellSmartTagPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellSmartTags.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCellSmartTags.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellSmartTags.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCellSmartTags.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellStyle.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCellStyle.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellStyle.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCellStyle.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellStyleXfs.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCellStyleXfs.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellStyleXfs.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCellStyleXfs.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellStyles.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCellStyles.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellStyles.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCellStyles.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellWatch.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCellWatch.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellWatch.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCellWatch.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellWatches.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCellWatches.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellWatches.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCellWatches.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellXfs.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCellXfs.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCellXfs.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCellXfs.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCfRule.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCfRule.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCfRule.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCfRule.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCfvo.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCfvo.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCfvo.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCfvo.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartFormat.java b/src/xlsx4j/java/org/xlsx4j/sml/CTChartFormat.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartFormat.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTChartFormat.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartFormats.java b/src/xlsx4j/java/org/xlsx4j/sml/CTChartFormats.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartFormats.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTChartFormats.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheet.java b/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheet.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheet.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTChartsheet.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetProtection.java b/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetProtection.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetProtection.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetProtection.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetView.java b/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetView.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetView.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetView.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetViews.java b/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetViews.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetViews.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTChartsheetViews.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColFields.java b/src/xlsx4j/java/org/xlsx4j/sml/CTColFields.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColFields.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTColFields.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColHierarchiesUsage.java b/src/xlsx4j/java/org/xlsx4j/sml/CTColHierarchiesUsage.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColHierarchiesUsage.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTColHierarchiesUsage.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColItems.java b/src/xlsx4j/java/org/xlsx4j/sml/CTColItems.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColItems.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTColItems.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColor.java b/src/xlsx4j/java/org/xlsx4j/sml/CTColor.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColor.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTColor.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColorFilter.java b/src/xlsx4j/java/org/xlsx4j/sml/CTColorFilter.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColorFilter.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTColorFilter.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColorScale.java b/src/xlsx4j/java/org/xlsx4j/sml/CTColorScale.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColorScale.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTColorScale.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColors.java b/src/xlsx4j/java/org/xlsx4j/sml/CTColors.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTColors.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTColors.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTComment.java b/src/xlsx4j/java/org/xlsx4j/sml/CTComment.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTComment.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTComment.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCommentList.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCommentList.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCommentList.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCommentList.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTComments.java b/src/xlsx4j/java/org/xlsx4j/sml/CTComments.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTComments.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTComments.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTConditionalFormat.java b/src/xlsx4j/java/org/xlsx4j/sml/CTConditionalFormat.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTConditionalFormat.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTConditionalFormat.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTConditionalFormats.java b/src/xlsx4j/java/org/xlsx4j/sml/CTConditionalFormats.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTConditionalFormats.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTConditionalFormats.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTConditionalFormatting.java b/src/xlsx4j/java/org/xlsx4j/sml/CTConditionalFormatting.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTConditionalFormatting.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTConditionalFormatting.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTConnection.java b/src/xlsx4j/java/org/xlsx4j/sml/CTConnection.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTConnection.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTConnection.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTConnections.java b/src/xlsx4j/java/org/xlsx4j/sml/CTConnections.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTConnections.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTConnections.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTConsolidation.java b/src/xlsx4j/java/org/xlsx4j/sml/CTConsolidation.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTConsolidation.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTConsolidation.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTControl.java b/src/xlsx4j/java/org/xlsx4j/sml/CTControl.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTControl.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTControl.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTControls.java b/src/xlsx4j/java/org/xlsx4j/sml/CTControls.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTControls.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTControls.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCsPageSetup.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCsPageSetup.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCsPageSetup.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCsPageSetup.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomChartsheetView.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCustomChartsheetView.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomChartsheetView.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCustomChartsheetView.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomChartsheetViews.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCustomChartsheetViews.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomChartsheetViews.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCustomChartsheetViews.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomFilter.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCustomFilter.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomFilter.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCustomFilter.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomFilters.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCustomFilters.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomFilters.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCustomFilters.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomProperties.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCustomProperties.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomProperties.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCustomProperties.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomProperty.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCustomProperty.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomProperty.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCustomProperty.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomSheetView.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCustomSheetView.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomSheetView.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCustomSheetView.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomSheetViews.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCustomSheetViews.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomSheetViews.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCustomSheetViews.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomWorkbookView.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCustomWorkbookView.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomWorkbookView.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCustomWorkbookView.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomWorkbookViews.java b/src/xlsx4j/java/org/xlsx4j/sml/CTCustomWorkbookViews.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTCustomWorkbookViews.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTCustomWorkbookViews.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataBar.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDataBar.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataBar.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDataBar.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataBinding.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDataBinding.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataBinding.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDataBinding.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataConsolidate.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDataConsolidate.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataConsolidate.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDataConsolidate.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataField.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDataField.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataField.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDataField.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataFields.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDataFields.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataFields.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDataFields.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataRef.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDataRef.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataRef.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDataRef.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataRefs.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDataRefs.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataRefs.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDataRefs.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataValidation.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDataValidation.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataValidation.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDataValidation.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataValidations.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDataValidations.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDataValidations.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDataValidations.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDateGroupItem.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDateGroupItem.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDateGroupItem.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDateGroupItem.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDateTime.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDateTime.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDateTime.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDateTime.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDbPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDbPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDbPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDbPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDdeItem.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDdeItem.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDdeItem.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDdeItem.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDdeItems.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDdeItems.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDdeItems.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDdeItems.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDdeLink.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDdeLink.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDdeLink.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDdeLink.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDdeValue.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDdeValue.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDdeValue.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDdeValue.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDdeValues.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDdeValues.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDdeValues.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDdeValues.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDefinedName.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDefinedName.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDefinedName.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDefinedName.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDeletedField.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDeletedField.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDeletedField.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDeletedField.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDimensions.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDimensions.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDimensions.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDimensions.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDiscretePr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDiscretePr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDiscretePr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDiscretePr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDrawing.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDrawing.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDrawing.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDrawing.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDxf.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDxf.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDxf.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDxf.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDxfs.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDxfs.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDxfs.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDxfs.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDynamicFilter.java b/src/xlsx4j/java/org/xlsx4j/sml/CTDynamicFilter.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTDynamicFilter.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTDynamicFilter.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTError.java b/src/xlsx4j/java/org/xlsx4j/sml/CTError.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTError.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTError.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExtension.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExtension.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExtension.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExtension.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExtensionList.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExtensionList.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExtensionList.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExtensionList.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalBook.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExternalBook.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalBook.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExternalBook.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalCell.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExternalCell.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalCell.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExternalCell.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalDefinedName.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExternalDefinedName.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalDefinedName.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExternalDefinedName.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalDefinedNames.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExternalDefinedNames.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalDefinedNames.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExternalDefinedNames.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalLink.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExternalLink.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalLink.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExternalLink.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalReference.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExternalReference.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalReference.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExternalReference.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalReferences.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExternalReferences.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalReferences.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExternalReferences.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalRow.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExternalRow.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalRow.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExternalRow.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetData.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetData.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetData.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetData.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetDataSet.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetDataSet.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetDataSet.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetDataSet.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetName.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetName.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetName.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetName.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetNames.java b/src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetNames.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetNames.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTExternalSheetNames.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTField.java b/src/xlsx4j/java/org/xlsx4j/sml/CTField.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTField.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTField.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFieldGroup.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFieldGroup.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFieldGroup.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFieldGroup.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFieldUsage.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFieldUsage.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFieldUsage.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFieldUsage.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFieldsUsage.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFieldsUsage.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFieldsUsage.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFieldsUsage.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFileRecoveryPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFileRecoveryPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFileRecoveryPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFileRecoveryPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFileSharing.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFileSharing.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFileSharing.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFileSharing.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFill.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFill.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFill.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFill.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFills.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFills.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFills.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFills.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFilter.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFilter.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFilter.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFilter.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFilterColumn.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFilterColumn.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFilterColumn.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFilterColumn.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFilters.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFilters.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFilters.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFilters.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFont.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFont.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFont.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFont.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFontName.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFontName.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFontName.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFontName.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFontScheme.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFontScheme.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFontScheme.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFontScheme.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFontSize.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFontSize.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFontSize.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFontSize.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFonts.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFonts.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFonts.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFonts.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFormat.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFormat.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFormat.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFormat.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFormats.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFormats.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFormats.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFormats.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFunctionGroup.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFunctionGroup.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFunctionGroup.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFunctionGroup.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFunctionGroups.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFunctionGroups.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFunctionGroups.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFunctionGroups.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFutureMetadata.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFutureMetadata.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFutureMetadata.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFutureMetadata.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFutureMetadataBlock.java b/src/xlsx4j/java/org/xlsx4j/sml/CTFutureMetadataBlock.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTFutureMetadataBlock.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTFutureMetadataBlock.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGradientFill.java b/src/xlsx4j/java/org/xlsx4j/sml/CTGradientFill.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGradientFill.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTGradientFill.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGradientStop.java b/src/xlsx4j/java/org/xlsx4j/sml/CTGradientStop.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGradientStop.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTGradientStop.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGroupItems.java b/src/xlsx4j/java/org/xlsx4j/sml/CTGroupItems.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGroupItems.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTGroupItems.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGroupLevel.java b/src/xlsx4j/java/org/xlsx4j/sml/CTGroupLevel.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGroupLevel.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTGroupLevel.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGroupLevels.java b/src/xlsx4j/java/org/xlsx4j/sml/CTGroupLevels.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGroupLevels.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTGroupLevels.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGroupMember.java b/src/xlsx4j/java/org/xlsx4j/sml/CTGroupMember.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGroupMember.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTGroupMember.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGroupMembers.java b/src/xlsx4j/java/org/xlsx4j/sml/CTGroupMembers.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGroupMembers.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTGroupMembers.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGroups.java b/src/xlsx4j/java/org/xlsx4j/sml/CTGroups.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTGroups.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTGroups.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTHeaderFooter.java b/src/xlsx4j/java/org/xlsx4j/sml/CTHeaderFooter.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTHeaderFooter.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTHeaderFooter.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTHierarchyUsage.java b/src/xlsx4j/java/org/xlsx4j/sml/CTHierarchyUsage.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTHierarchyUsage.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTHierarchyUsage.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTHyperlink.java b/src/xlsx4j/java/org/xlsx4j/sml/CTHyperlink.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTHyperlink.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTHyperlink.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTHyperlinks.java b/src/xlsx4j/java/org/xlsx4j/sml/CTHyperlinks.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTHyperlinks.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTHyperlinks.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTI.java b/src/xlsx4j/java/org/xlsx4j/sml/CTI.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTI.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTI.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIconFilter.java b/src/xlsx4j/java/org/xlsx4j/sml/CTIconFilter.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIconFilter.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTIconFilter.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIconSet.java b/src/xlsx4j/java/org/xlsx4j/sml/CTIconSet.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIconSet.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTIconSet.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIgnoredError.java b/src/xlsx4j/java/org/xlsx4j/sml/CTIgnoredError.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIgnoredError.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTIgnoredError.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIgnoredErrors.java b/src/xlsx4j/java/org/xlsx4j/sml/CTIgnoredErrors.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIgnoredErrors.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTIgnoredErrors.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIndex.java b/src/xlsx4j/java/org/xlsx4j/sml/CTIndex.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIndex.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTIndex.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIndexedColors.java b/src/xlsx4j/java/org/xlsx4j/sml/CTIndexedColors.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIndexedColors.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTIndexedColors.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTInputCells.java b/src/xlsx4j/java/org/xlsx4j/sml/CTInputCells.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTInputCells.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTInputCells.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIntProperty.java b/src/xlsx4j/java/org/xlsx4j/sml/CTIntProperty.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTIntProperty.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTIntProperty.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTItem.java b/src/xlsx4j/java/org/xlsx4j/sml/CTItem.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTItem.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTItem.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTItems.java b/src/xlsx4j/java/org/xlsx4j/sml/CTItems.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTItems.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTItems.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTLegacyDrawing.java b/src/xlsx4j/java/org/xlsx4j/sml/CTLegacyDrawing.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTLegacyDrawing.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTLegacyDrawing.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTLevelGroup.java b/src/xlsx4j/java/org/xlsx4j/sml/CTLevelGroup.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTLevelGroup.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTLevelGroup.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTLocation.java b/src/xlsx4j/java/org/xlsx4j/sml/CTLocation.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTLocation.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTLocation.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMRUColors.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMRUColors.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMRUColors.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMRUColors.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMap.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMap.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMap.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMap.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMapInfo.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMapInfo.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMapInfo.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMapInfo.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMdx.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMdx.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMdx.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMdx.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMdxKPI.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMdxKPI.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMdxKPI.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMdxKPI.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMdxMemeberProp.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMdxMemeberProp.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMdxMemeberProp.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMdxMemeberProp.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMdxMetadata.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMdxMetadata.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMdxMetadata.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMdxMetadata.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMdxSet.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMdxSet.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMdxSet.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMdxSet.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMdxTuple.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMdxTuple.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMdxTuple.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMdxTuple.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMeasureDimensionMap.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMeasureDimensionMap.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMeasureDimensionMap.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMeasureDimensionMap.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMeasureDimensionMaps.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMeasureDimensionMaps.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMeasureDimensionMaps.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMeasureDimensionMaps.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMeasureGroup.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMeasureGroup.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMeasureGroup.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMeasureGroup.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMeasureGroups.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMeasureGroups.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMeasureGroups.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMeasureGroups.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMember.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMember.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMember.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMember.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMemberProperties.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMemberProperties.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMemberProperties.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMemberProperties.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMemberProperty.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMemberProperty.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMemberProperty.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMemberProperty.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMembers.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMembers.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMembers.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMembers.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMergeCell.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMergeCell.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMergeCell.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMergeCell.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMergeCells.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMergeCells.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMergeCells.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMergeCells.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadata.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMetadata.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadata.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMetadata.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataBlock.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataBlock.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataBlock.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMetadataBlock.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataBlocks.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataBlocks.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataBlocks.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMetadataBlocks.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataRecord.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataRecord.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataRecord.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMetadataRecord.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataStringIndex.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataStringIndex.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataStringIndex.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMetadataStringIndex.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataStrings.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataStrings.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataStrings.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMetadataStrings.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataType.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMetadataType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataTypes.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataTypes.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMetadataTypes.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMetadataTypes.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMissing.java b/src/xlsx4j/java/org/xlsx4j/sml/CTMissing.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTMissing.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTMissing.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTNumFmt.java b/src/xlsx4j/java/org/xlsx4j/sml/CTNumFmt.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTNumFmt.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTNumFmt.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTNumFmts.java b/src/xlsx4j/java/org/xlsx4j/sml/CTNumFmts.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTNumFmts.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTNumFmts.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTNumber.java b/src/xlsx4j/java/org/xlsx4j/sml/CTNumber.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTNumber.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTNumber.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOlapPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTOlapPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOlapPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTOlapPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOleItem.java b/src/xlsx4j/java/org/xlsx4j/sml/CTOleItem.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOleItem.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTOleItem.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOleItems.java b/src/xlsx4j/java/org/xlsx4j/sml/CTOleItems.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOleItems.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTOleItems.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOleLink.java b/src/xlsx4j/java/org/xlsx4j/sml/CTOleLink.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOleLink.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTOleLink.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOleObject.java b/src/xlsx4j/java/org/xlsx4j/sml/CTOleObject.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOleObject.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTOleObject.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOleObjects.java b/src/xlsx4j/java/org/xlsx4j/sml/CTOleObjects.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOleObjects.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTOleObjects.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOleSize.java b/src/xlsx4j/java/org/xlsx4j/sml/CTOleSize.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOleSize.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTOleSize.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOutlinePr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTOutlinePr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTOutlinePr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTOutlinePr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPCDKPI.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPCDKPI.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPCDKPI.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPCDKPI.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPCDKPIs.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPCDKPIs.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPCDKPIs.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPCDKPIs.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPCDSCPage.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPCDSCPage.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPCDSCPage.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPCDSCPage.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPCDSDTCEntries.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPCDSDTCEntries.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPCDSDTCEntries.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPCDSDTCEntries.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageBreak.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPageBreak.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageBreak.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPageBreak.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageField.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPageField.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageField.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPageField.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageFields.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPageFields.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageFields.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPageFields.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageItem.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPageItem.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageItem.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPageItem.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageMargins.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPageMargins.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageMargins.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPageMargins.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageSetUpPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPageSetUpPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageSetUpPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPageSetUpPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageSetup.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPageSetup.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPageSetup.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPageSetup.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPages.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPages.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPages.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPages.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPane.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPane.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPane.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPane.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTParameter.java b/src/xlsx4j/java/org/xlsx4j/sml/CTParameter.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTParameter.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTParameter.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTParameters.java b/src/xlsx4j/java/org/xlsx4j/sml/CTParameters.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTParameters.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTParameters.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPatternFill.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPatternFill.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPatternFill.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPatternFill.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPhoneticPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPhoneticPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPhoneticPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPhoneticPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPhoneticRun.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPhoneticRun.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPhoneticRun.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPhoneticRun.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotArea.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotArea.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotArea.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotArea.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotAreaReference.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotAreaReference.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotAreaReference.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotAreaReference.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotAreaReferences.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotAreaReferences.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotAreaReferences.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotAreaReferences.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotAreas.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotAreas.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotAreas.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotAreas.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotCache.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotCache.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotCache.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotCache.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotCacheDefinition.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotCacheDefinition.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotCacheDefinition.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotCacheDefinition.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotCacheRecords.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotCacheRecords.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotCacheRecords.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotCacheRecords.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotCaches.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotCaches.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotCaches.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotCaches.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotDimension.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotDimension.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotDimension.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotDimension.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotField.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotField.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotField.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotField.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotFields.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotFields.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotFields.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotFields.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotFilter.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotFilter.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotFilter.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotFilter.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotFilters.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotFilters.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotFilters.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotFilters.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotHierarchies.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotHierarchies.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotHierarchies.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotHierarchies.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotHierarchy.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotHierarchy.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotHierarchy.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotHierarchy.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotSelection.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotSelection.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotSelection.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotSelection.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotTableDefinition.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotTableDefinition.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotTableDefinition.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotTableDefinition.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotTableStyle.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPivotTableStyle.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPivotTableStyle.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPivotTableStyle.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPrintOptions.java b/src/xlsx4j/java/org/xlsx4j/sml/CTPrintOptions.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTPrintOptions.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTPrintOptions.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTProtectedRange.java b/src/xlsx4j/java/org/xlsx4j/sml/CTProtectedRange.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTProtectedRange.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTProtectedRange.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTProtectedRanges.java b/src/xlsx4j/java/org/xlsx4j/sml/CTProtectedRanges.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTProtectedRanges.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTProtectedRanges.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQuery.java b/src/xlsx4j/java/org/xlsx4j/sml/CTQuery.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQuery.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTQuery.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQueryCache.java b/src/xlsx4j/java/org/xlsx4j/sml/CTQueryCache.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQueryCache.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTQueryCache.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTable.java b/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTable.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTable.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTQueryTable.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableDeletedFields.java b/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableDeletedFields.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableDeletedFields.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableDeletedFields.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableField.java b/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableField.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableField.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableField.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableFields.java b/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableFields.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableFields.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableFields.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableRefresh.java b/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableRefresh.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableRefresh.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTQueryTableRefresh.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRElt.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRElt.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRElt.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRElt.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRPrElt.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRPrElt.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRPrElt.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRPrElt.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRangePr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRangePr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRangePr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRangePr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRangeSet.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRangeSet.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRangeSet.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRangeSet.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRangeSets.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRangeSets.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRangeSets.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRangeSets.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRecord.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRecord.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRecord.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRecord.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTReviewed.java b/src/xlsx4j/java/org/xlsx4j/sml/CTReviewed.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTReviewed.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTReviewed.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTReviewedRevisions.java b/src/xlsx4j/java/org/xlsx4j/sml/CTReviewedRevisions.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTReviewedRevisions.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTReviewedRevisions.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionAutoFormatting.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionAutoFormatting.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionAutoFormatting.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionAutoFormatting.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionCellChange.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionCellChange.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionCellChange.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionCellChange.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionComment.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionComment.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionComment.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionComment.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionConflict.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionConflict.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionConflict.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionConflict.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionCustomView.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionCustomView.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionCustomView.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionCustomView.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionDefinedName.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionDefinedName.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionDefinedName.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionDefinedName.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionFormatting.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionFormatting.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionFormatting.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionFormatting.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionHeader.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionHeader.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionHeader.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionHeader.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionHeaders.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionHeaders.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionHeaders.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionHeaders.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionInsertSheet.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionInsertSheet.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionInsertSheet.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionInsertSheet.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionMove.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionMove.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionMove.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionMove.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionQueryTableField.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionQueryTableField.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionQueryTableField.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionQueryTableField.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionRowColumn.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionRowColumn.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionRowColumn.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionRowColumn.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionSheetRename.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionSheetRename.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisionSheetRename.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisionSheetRename.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisions.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRevisions.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRevisions.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRevisions.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRgbColor.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRgbColor.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRgbColor.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRgbColor.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRowFields.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRowFields.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRowFields.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRowFields.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRowHierarchiesUsage.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRowHierarchiesUsage.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRowHierarchiesUsage.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRowHierarchiesUsage.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRowItems.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRowItems.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRowItems.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRowItems.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRst.java b/src/xlsx4j/java/org/xlsx4j/sml/CTRst.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTRst.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTRst.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTScenario.java b/src/xlsx4j/java/org/xlsx4j/sml/CTScenario.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTScenario.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTScenario.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTScenarios.java b/src/xlsx4j/java/org/xlsx4j/sml/CTScenarios.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTScenarios.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTScenarios.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSchema.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSchema.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSchema.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSchema.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSelection.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSelection.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSelection.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSelection.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTServerFormat.java b/src/xlsx4j/java/org/xlsx4j/sml/CTServerFormat.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTServerFormat.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTServerFormat.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTServerFormats.java b/src/xlsx4j/java/org/xlsx4j/sml/CTServerFormats.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTServerFormats.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTServerFormats.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSet.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSet.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSet.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSet.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSets.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSets.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSets.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSets.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSharedItems.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSharedItems.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSharedItems.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSharedItems.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSharedUser.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSharedUser.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSharedUser.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSharedUser.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetBackgroundPicture.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSheetBackgroundPicture.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetBackgroundPicture.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSheetBackgroundPicture.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetCalcPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSheetCalcPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetCalcPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSheetCalcPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetDimension.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSheetDimension.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetDimension.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSheetDimension.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetFormatPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSheetFormatPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetFormatPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSheetFormatPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetId.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSheetId.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetId.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSheetId.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetIdMap.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSheetIdMap.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetIdMap.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSheetIdMap.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSheetPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSheetPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetProtection.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSheetProtection.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSheetProtection.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSheetProtection.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSingleXmlCell.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSingleXmlCell.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSingleXmlCell.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSingleXmlCell.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSingleXmlCells.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSingleXmlCells.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSingleXmlCells.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSingleXmlCells.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSmartTagPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSmartTagPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSmartTagPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSmartTagPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSmartTagType.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSmartTagType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSmartTagType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSmartTagType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSmartTagTypes.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSmartTagTypes.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSmartTagTypes.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSmartTagTypes.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSmartTags.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSmartTags.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSmartTags.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSmartTags.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSortCondition.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSortCondition.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSortCondition.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSortCondition.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSortState.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSortState.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSortState.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSortState.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSst.java b/src/xlsx4j/java/org/xlsx4j/sml/CTSst.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTSst.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTSst.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTString.java b/src/xlsx4j/java/org/xlsx4j/sml/CTString.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTString.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTString.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTStylesheet.java b/src/xlsx4j/java/org/xlsx4j/sml/CTStylesheet.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTStylesheet.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTStylesheet.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTable.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTable.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTable.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTable.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableColumn.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTableColumn.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableColumn.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTableColumn.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableColumns.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTableColumns.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableColumns.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTableColumns.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableFormula.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTableFormula.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableFormula.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTableFormula.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableMissing.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTableMissing.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableMissing.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTableMissing.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTablePart.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTablePart.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTablePart.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTablePart.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableParts.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTableParts.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableParts.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTableParts.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableStyle.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTableStyle.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableStyle.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTableStyle.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableStyleElement.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTableStyleElement.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableStyleElement.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTableStyleElement.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableStyleInfo.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTableStyleInfo.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableStyleInfo.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTableStyleInfo.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableStyles.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTableStyles.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTableStyles.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTableStyles.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTables.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTables.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTables.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTables.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTextField.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTextField.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTextField.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTextField.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTextFields.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTextFields.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTextFields.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTextFields.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTextPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTextPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTextPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTextPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTop10.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTop10.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTop10.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTop10.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTuple.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTuple.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTuple.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTuple.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTupleCache.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTupleCache.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTupleCache.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTupleCache.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTuples.java b/src/xlsx4j/java/org/xlsx4j/sml/CTTuples.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTTuples.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTTuples.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTUnderlineProperty.java b/src/xlsx4j/java/org/xlsx4j/sml/CTUnderlineProperty.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTUnderlineProperty.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTUnderlineProperty.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTUndoInfo.java b/src/xlsx4j/java/org/xlsx4j/sml/CTUndoInfo.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTUndoInfo.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTUndoInfo.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTUsers.java b/src/xlsx4j/java/org/xlsx4j/sml/CTUsers.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTUsers.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTUsers.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTVerticalAlignFontProperty.java b/src/xlsx4j/java/org/xlsx4j/sml/CTVerticalAlignFontProperty.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTVerticalAlignFontProperty.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTVerticalAlignFontProperty.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTVolMain.java b/src/xlsx4j/java/org/xlsx4j/sml/CTVolMain.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTVolMain.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTVolMain.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTVolTopic.java b/src/xlsx4j/java/org/xlsx4j/sml/CTVolTopic.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTVolTopic.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTVolTopic.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTVolTopicRef.java b/src/xlsx4j/java/org/xlsx4j/sml/CTVolTopicRef.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTVolTopicRef.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTVolTopicRef.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTVolType.java b/src/xlsx4j/java/org/xlsx4j/sml/CTVolType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTVolType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTVolType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTVolTypes.java b/src/xlsx4j/java/org/xlsx4j/sml/CTVolTypes.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTVolTypes.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTVolTypes.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWebPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTWebPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWebPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTWebPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishItem.java b/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishItem.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishItem.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishItem.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishItems.java b/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishItems.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishItems.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishItems.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishObject.java b/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishObject.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishObject.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishObject.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishObjects.java b/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishObjects.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishObjects.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishObjects.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishing.java b/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishing.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishing.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTWebPublishing.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWorkbookProtection.java b/src/xlsx4j/java/org/xlsx4j/sml/CTWorkbookProtection.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWorkbookProtection.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTWorkbookProtection.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWorksheetSource.java b/src/xlsx4j/java/org/xlsx4j/sml/CTWorksheetSource.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTWorksheetSource.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTWorksheetSource.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTX.java b/src/xlsx4j/java/org/xlsx4j/sml/CTX.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTX.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTX.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTXStringElement.java b/src/xlsx4j/java/org/xlsx4j/sml/CTXStringElement.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTXStringElement.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTXStringElement.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTXf.java b/src/xlsx4j/java/org/xlsx4j/sml/CTXf.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTXf.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTXf.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTXmlCellPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTXmlCellPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTXmlCellPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTXmlCellPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTXmlColumnPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTXmlColumnPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTXmlColumnPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTXmlColumnPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTXmlPr.java b/src/xlsx4j/java/org/xlsx4j/sml/CTXmlPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/CTXmlPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/CTXmlPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/Cell.java b/src/xlsx4j/java/org/xlsx4j/sml/Cell.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/Cell.java
rename to src/xlsx4j/java/org/xlsx4j/sml/Cell.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/Col.java b/src/xlsx4j/java/org/xlsx4j/sml/Col.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/Col.java
rename to src/xlsx4j/java/org/xlsx4j/sml/Col.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/Cols.java b/src/xlsx4j/java/org/xlsx4j/sml/Cols.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/Cols.java
rename to src/xlsx4j/java/org/xlsx4j/sml/Cols.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/DefinedNames.java b/src/xlsx4j/java/org/xlsx4j/sml/DefinedNames.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/DefinedNames.java
rename to src/xlsx4j/java/org/xlsx4j/sml/DefinedNames.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/Dialogsheet.java b/src/xlsx4j/java/org/xlsx4j/sml/Dialogsheet.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/Dialogsheet.java
rename to src/xlsx4j/java/org/xlsx4j/sml/Dialogsheet.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/FileVersion.java b/src/xlsx4j/java/org/xlsx4j/sml/FileVersion.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/FileVersion.java
rename to src/xlsx4j/java/org/xlsx4j/sml/FileVersion.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/Macrosheet.java b/src/xlsx4j/java/org/xlsx4j/sml/Macrosheet.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/Macrosheet.java
rename to src/xlsx4j/java/org/xlsx4j/sml/Macrosheet.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/ObjectFactory.java b/src/xlsx4j/java/org/xlsx4j/sml/ObjectFactory.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/ObjectFactory.java
rename to src/xlsx4j/java/org/xlsx4j/sml/ObjectFactory.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/Row.java b/src/xlsx4j/java/org/xlsx4j/sml/Row.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/Row.java
rename to src/xlsx4j/java/org/xlsx4j/sml/Row.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STAxis.java b/src/xlsx4j/java/org/xlsx4j/sml/STAxis.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STAxis.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STAxis.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STBorderStyle.java b/src/xlsx4j/java/org/xlsx4j/sml/STBorderStyle.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STBorderStyle.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STBorderStyle.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCalcMode.java b/src/xlsx4j/java/org/xlsx4j/sml/STCalcMode.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCalcMode.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STCalcMode.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCalendarType.java b/src/xlsx4j/java/org/xlsx4j/sml/STCalendarType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCalendarType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STCalendarType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCellComments.java b/src/xlsx4j/java/org/xlsx4j/sml/STCellComments.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCellComments.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STCellComments.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCellFormulaType.java b/src/xlsx4j/java/org/xlsx4j/sml/STCellFormulaType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCellFormulaType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STCellFormulaType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCellType.java b/src/xlsx4j/java/org/xlsx4j/sml/STCellType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCellType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STCellType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCfType.java b/src/xlsx4j/java/org/xlsx4j/sml/STCfType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCfType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STCfType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCfvoType.java b/src/xlsx4j/java/org/xlsx4j/sml/STCfvoType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCfvoType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STCfvoType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STComments.java b/src/xlsx4j/java/org/xlsx4j/sml/STComments.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STComments.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STComments.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STConditionalFormattingOperator.java b/src/xlsx4j/java/org/xlsx4j/sml/STConditionalFormattingOperator.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STConditionalFormattingOperator.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STConditionalFormattingOperator.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCredMethod.java b/src/xlsx4j/java/org/xlsx4j/sml/STCredMethod.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STCredMethod.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STCredMethod.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDataConsolidateFunction.java b/src/xlsx4j/java/org/xlsx4j/sml/STDataConsolidateFunction.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDataConsolidateFunction.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STDataConsolidateFunction.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDataValidationErrorStyle.java b/src/xlsx4j/java/org/xlsx4j/sml/STDataValidationErrorStyle.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDataValidationErrorStyle.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STDataValidationErrorStyle.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDataValidationImeMode.java b/src/xlsx4j/java/org/xlsx4j/sml/STDataValidationImeMode.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDataValidationImeMode.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STDataValidationImeMode.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDataValidationOperator.java b/src/xlsx4j/java/org/xlsx4j/sml/STDataValidationOperator.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDataValidationOperator.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STDataValidationOperator.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDataValidationType.java b/src/xlsx4j/java/org/xlsx4j/sml/STDataValidationType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDataValidationType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STDataValidationType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDateTimeGrouping.java b/src/xlsx4j/java/org/xlsx4j/sml/STDateTimeGrouping.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDateTimeGrouping.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STDateTimeGrouping.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDdeValueType.java b/src/xlsx4j/java/org/xlsx4j/sml/STDdeValueType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDdeValueType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STDdeValueType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDvAspect.java b/src/xlsx4j/java/org/xlsx4j/sml/STDvAspect.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDvAspect.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STDvAspect.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDynamicFilterType.java b/src/xlsx4j/java/org/xlsx4j/sml/STDynamicFilterType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STDynamicFilterType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STDynamicFilterType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STExternalConnectionType.java b/src/xlsx4j/java/org/xlsx4j/sml/STExternalConnectionType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STExternalConnectionType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STExternalConnectionType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STFieldSortType.java b/src/xlsx4j/java/org/xlsx4j/sml/STFieldSortType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STFieldSortType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STFieldSortType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STFileType.java b/src/xlsx4j/java/org/xlsx4j/sml/STFileType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STFileType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STFileType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STFilterOperator.java b/src/xlsx4j/java/org/xlsx4j/sml/STFilterOperator.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STFilterOperator.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STFilterOperator.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STFontScheme.java b/src/xlsx4j/java/org/xlsx4j/sml/STFontScheme.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STFontScheme.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STFontScheme.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STFormatAction.java b/src/xlsx4j/java/org/xlsx4j/sml/STFormatAction.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STFormatAction.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STFormatAction.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STFormulaExpression.java b/src/xlsx4j/java/org/xlsx4j/sml/STFormulaExpression.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STFormulaExpression.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STFormulaExpression.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STGradientType.java b/src/xlsx4j/java/org/xlsx4j/sml/STGradientType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STGradientType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STGradientType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STGroupBy.java b/src/xlsx4j/java/org/xlsx4j/sml/STGroupBy.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STGroupBy.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STGroupBy.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STGrowShrinkType.java b/src/xlsx4j/java/org/xlsx4j/sml/STGrowShrinkType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STGrowShrinkType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STGrowShrinkType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STHorizontalAlignment.java b/src/xlsx4j/java/org/xlsx4j/sml/STHorizontalAlignment.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STHorizontalAlignment.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STHorizontalAlignment.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STHtmlFmt.java b/src/xlsx4j/java/org/xlsx4j/sml/STHtmlFmt.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STHtmlFmt.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STHtmlFmt.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STItemType.java b/src/xlsx4j/java/org/xlsx4j/sml/STItemType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STItemType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STItemType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STMdxFunctionType.java b/src/xlsx4j/java/org/xlsx4j/sml/STMdxFunctionType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STMdxFunctionType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STMdxFunctionType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STMdxKPIProperty.java b/src/xlsx4j/java/org/xlsx4j/sml/STMdxKPIProperty.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STMdxKPIProperty.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STMdxKPIProperty.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STMdxSetOrder.java b/src/xlsx4j/java/org/xlsx4j/sml/STMdxSetOrder.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STMdxSetOrder.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STMdxSetOrder.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STObjects.java b/src/xlsx4j/java/org/xlsx4j/sml/STObjects.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STObjects.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STObjects.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STOleUpdate.java b/src/xlsx4j/java/org/xlsx4j/sml/STOleUpdate.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STOleUpdate.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STOleUpdate.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STOrientation.java b/src/xlsx4j/java/org/xlsx4j/sml/STOrientation.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STOrientation.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STOrientation.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPageOrder.java b/src/xlsx4j/java/org/xlsx4j/sml/STPageOrder.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPageOrder.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STPageOrder.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPane.java b/src/xlsx4j/java/org/xlsx4j/sml/STPane.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPane.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STPane.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPaneState.java b/src/xlsx4j/java/org/xlsx4j/sml/STPaneState.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPaneState.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STPaneState.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STParameterType.java b/src/xlsx4j/java/org/xlsx4j/sml/STParameterType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STParameterType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STParameterType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPatternType.java b/src/xlsx4j/java/org/xlsx4j/sml/STPatternType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPatternType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STPatternType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPhoneticAlignment.java b/src/xlsx4j/java/org/xlsx4j/sml/STPhoneticAlignment.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPhoneticAlignment.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STPhoneticAlignment.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPhoneticType.java b/src/xlsx4j/java/org/xlsx4j/sml/STPhoneticType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPhoneticType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STPhoneticType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPivotAreaType.java b/src/xlsx4j/java/org/xlsx4j/sml/STPivotAreaType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPivotAreaType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STPivotAreaType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPivotFilterType.java b/src/xlsx4j/java/org/xlsx4j/sml/STPivotFilterType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPivotFilterType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STPivotFilterType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPrintError.java b/src/xlsx4j/java/org/xlsx4j/sml/STPrintError.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STPrintError.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STPrintError.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STQualifier.java b/src/xlsx4j/java/org/xlsx4j/sml/STQualifier.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STQualifier.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STQualifier.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STRefMode.java b/src/xlsx4j/java/org/xlsx4j/sml/STRefMode.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STRefMode.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STRefMode.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STRevisionAction.java b/src/xlsx4j/java/org/xlsx4j/sml/STRevisionAction.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STRevisionAction.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STRevisionAction.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STRwColActionType.java b/src/xlsx4j/java/org/xlsx4j/sml/STRwColActionType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STRwColActionType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STRwColActionType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STScope.java b/src/xlsx4j/java/org/xlsx4j/sml/STScope.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STScope.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STScope.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSheetState.java b/src/xlsx4j/java/org/xlsx4j/sml/STSheetState.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSheetState.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STSheetState.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSheetViewType.java b/src/xlsx4j/java/org/xlsx4j/sml/STSheetViewType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSheetViewType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STSheetViewType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STShowDataAs.java b/src/xlsx4j/java/org/xlsx4j/sml/STShowDataAs.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STShowDataAs.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STShowDataAs.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSmartTagShow.java b/src/xlsx4j/java/org/xlsx4j/sml/STSmartTagShow.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSmartTagShow.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STSmartTagShow.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSortBy.java b/src/xlsx4j/java/org/xlsx4j/sml/STSortBy.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSortBy.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STSortBy.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSortMethod.java b/src/xlsx4j/java/org/xlsx4j/sml/STSortMethod.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSortMethod.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STSortMethod.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSortType.java b/src/xlsx4j/java/org/xlsx4j/sml/STSortType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSortType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STSortType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSourceType.java b/src/xlsx4j/java/org/xlsx4j/sml/STSourceType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STSourceType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STSourceType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STTableStyleType.java b/src/xlsx4j/java/org/xlsx4j/sml/STTableStyleType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STTableStyleType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STTableStyleType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STTableType.java b/src/xlsx4j/java/org/xlsx4j/sml/STTableType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STTableType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STTableType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STTimePeriod.java b/src/xlsx4j/java/org/xlsx4j/sml/STTimePeriod.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STTimePeriod.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STTimePeriod.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STTotalsRowFunction.java b/src/xlsx4j/java/org/xlsx4j/sml/STTotalsRowFunction.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STTotalsRowFunction.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STTotalsRowFunction.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STType.java b/src/xlsx4j/java/org/xlsx4j/sml/STType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STUnderlineValues.java b/src/xlsx4j/java/org/xlsx4j/sml/STUnderlineValues.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STUnderlineValues.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STUnderlineValues.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STUpdateLinks.java b/src/xlsx4j/java/org/xlsx4j/sml/STUpdateLinks.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STUpdateLinks.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STUpdateLinks.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STVerticalAlignRun.java b/src/xlsx4j/java/org/xlsx4j/sml/STVerticalAlignRun.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STVerticalAlignRun.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STVerticalAlignRun.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STVerticalAlignment.java b/src/xlsx4j/java/org/xlsx4j/sml/STVerticalAlignment.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STVerticalAlignment.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STVerticalAlignment.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STVisibility.java b/src/xlsx4j/java/org/xlsx4j/sml/STVisibility.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STVisibility.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STVisibility.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STVolDepType.java b/src/xlsx4j/java/org/xlsx4j/sml/STVolDepType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STVolDepType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STVolDepType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STVolValueType.java b/src/xlsx4j/java/org/xlsx4j/sml/STVolValueType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STVolValueType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STVolValueType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STWebSourceType.java b/src/xlsx4j/java/org/xlsx4j/sml/STWebSourceType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STWebSourceType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STWebSourceType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/STXmlDataType.java b/src/xlsx4j/java/org/xlsx4j/sml/STXmlDataType.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/STXmlDataType.java
rename to src/xlsx4j/java/org/xlsx4j/sml/STXmlDataType.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/Sheet.java b/src/xlsx4j/java/org/xlsx4j/sml/Sheet.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/Sheet.java
rename to src/xlsx4j/java/org/xlsx4j/sml/Sheet.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/SheetData.java b/src/xlsx4j/java/org/xlsx4j/sml/SheetData.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/SheetData.java
rename to src/xlsx4j/java/org/xlsx4j/sml/SheetData.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/SheetView.java b/src/xlsx4j/java/org/xlsx4j/sml/SheetView.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/SheetView.java
rename to src/xlsx4j/java/org/xlsx4j/sml/SheetView.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/SheetViews.java b/src/xlsx4j/java/org/xlsx4j/sml/SheetViews.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/SheetViews.java
rename to src/xlsx4j/java/org/xlsx4j/sml/SheetViews.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/Sheets.java b/src/xlsx4j/java/org/xlsx4j/sml/Sheets.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/Sheets.java
rename to src/xlsx4j/java/org/xlsx4j/sml/Sheets.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/Workbook.java b/src/xlsx4j/java/org/xlsx4j/sml/Workbook.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/Workbook.java
rename to src/xlsx4j/java/org/xlsx4j/sml/Workbook.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/WorkbookPr.java b/src/xlsx4j/java/org/xlsx4j/sml/WorkbookPr.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/WorkbookPr.java
rename to src/xlsx4j/java/org/xlsx4j/sml/WorkbookPr.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/Worksheet.java b/src/xlsx4j/java/org/xlsx4j/sml/Worksheet.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/Worksheet.java
rename to src/xlsx4j/java/org/xlsx4j/sml/Worksheet.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/header.txt b/src/xlsx4j/java/org/xlsx4j/sml/header.txt
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/header.txt
rename to src/xlsx4j/java/org/xlsx4j/sml/header.txt
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/package-info.java b/src/xlsx4j/java/org/xlsx4j/sml/package-info.java
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/package-info.java
rename to src/xlsx4j/java/org/xlsx4j/sml/package-info.java
diff --git a/docx4j/src/xlsx4j/java/org/xlsx4j/sml/script b/src/xlsx4j/java/org/xlsx4j/sml/script
similarity index 100%
rename from docx4j/src/xlsx4j/java/org/xlsx4j/sml/script
rename to src/xlsx4j/java/org/xlsx4j/sml/script
diff --git a/docx4j/wagon-svn-pom.xml b/wagon-svn-pom.xml
similarity index 100%
rename from docx4j/wagon-svn-pom.xml
rename to wagon-svn-pom.xml
diff --git a/docx4j/xsd/OpenDoPE/SmartArtDataHierarchy.xsd b/xsd/OpenDoPE/SmartArtDataHierarchy.xsd
similarity index 100%
rename from docx4j/xsd/OpenDoPE/SmartArtDataHierarchy.xsd
rename to xsd/OpenDoPE/SmartArtDataHierarchy.xsd
diff --git a/docx4j/xsd/OpenDoPE/components.xsd b/xsd/OpenDoPE/components.xsd
similarity index 100%
rename from docx4j/xsd/OpenDoPE/components.xsd
rename to xsd/OpenDoPE/components.xsd
diff --git a/docx4j/xsd/OpenDoPE/conditions.xsd b/xsd/OpenDoPE/conditions.xsd
similarity index 100%
rename from docx4j/xsd/OpenDoPE/conditions.xsd
rename to xsd/OpenDoPE/conditions.xsd
diff --git a/docx4j/xsd/contentTypes/README b/xsd/contentTypes/README
similarity index 100%
rename from docx4j/xsd/contentTypes/README
rename to xsd/contentTypes/README
diff --git a/docx4j/xsd/contentTypes/opc-contentTypes.xsd b/xsd/contentTypes/opc-contentTypes.xsd
similarity index 100%
rename from docx4j/xsd/contentTypes/opc-contentTypes.xsd
rename to xsd/contentTypes/opc-contentTypes.xsd
diff --git a/docx4j/xsd/customXml/shared-customXmlSchemaProperties.xsd b/xsd/customXml/shared-customXmlSchemaProperties.xsd
similarity index 100%
rename from docx4j/xsd/customXml/shared-customXmlSchemaProperties.xsd
rename to xsd/customXml/shared-customXmlSchemaProperties.xsd
diff --git a/docx4j/xsd/customXmlProperties/shared-customxmlprops.xsd b/xsd/customXmlProperties/shared-customxmlprops.xsd
similarity index 100%
rename from docx4j/xsd/customXmlProperties/shared-customxmlprops.xsd
rename to xsd/customXmlProperties/shared-customxmlprops.xsd
diff --git a/docx4j/xsd/dml/README.txt b/xsd/dml/README.txt
similarity index 100%
rename from docx4j/xsd/dml/README.txt
rename to xsd/dml/README.txt
diff --git a/docx4j/xsd/dml/dml-audioVideo.xsd b/xsd/dml/dml-audioVideo.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-audioVideo.xsd
rename to xsd/dml/dml-audioVideo.xsd
diff --git a/docx4j/xsd/dml/dml-baseStylesheet.xsd b/xsd/dml/dml-baseStylesheet.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-baseStylesheet.xsd
rename to xsd/dml/dml-baseStylesheet.xsd
diff --git a/docx4j/xsd/dml/dml-baseTypes.xsd b/xsd/dml/dml-baseTypes.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-baseTypes.xsd
rename to xsd/dml/dml-baseTypes.xsd
diff --git a/docx4j/xsd/dml/dml-chart.xsd b/xsd/dml/dml-chart.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-chart.xsd
rename to xsd/dml/dml-chart.xsd
diff --git a/docx4j/xsd/dml/dml-chartDrawing.xsd b/xsd/dml/dml-chartDrawing.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-chartDrawing.xsd
rename to xsd/dml/dml-chartDrawing.xsd
diff --git a/docx4j/xsd/dml/dml-compatibility.xsd b/xsd/dml/dml-compatibility.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-compatibility.xsd
rename to xsd/dml/dml-compatibility.xsd
diff --git a/docx4j/xsd/dml/dml-diagramColorTransform.xsd b/xsd/dml/dml-diagramColorTransform.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-diagramColorTransform.xsd
rename to xsd/dml/dml-diagramColorTransform.xsd
diff --git a/docx4j/xsd/dml/dml-diagramDataModel.xsd b/xsd/dml/dml-diagramDataModel.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-diagramDataModel.xsd
rename to xsd/dml/dml-diagramDataModel.xsd
diff --git a/docx4j/xsd/dml/dml-diagramDefinition.xsd b/xsd/dml/dml-diagramDefinition.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-diagramDefinition.xsd
rename to xsd/dml/dml-diagramDefinition.xsd
diff --git a/docx4j/xsd/dml/dml-diagramDrawing.xsd b/xsd/dml/dml-diagramDrawing.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-diagramDrawing.xsd
rename to xsd/dml/dml-diagramDrawing.xsd
diff --git a/docx4j/xsd/dml/dml-diagramElementPropertySet.xsd b/xsd/dml/dml-diagramElementPropertySet.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-diagramElementPropertySet.xsd
rename to xsd/dml/dml-diagramElementPropertySet.xsd
diff --git a/docx4j/xsd/dml/dml-diagramLayoutVariables.xsd b/xsd/dml/dml-diagramLayoutVariables.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-diagramLayoutVariables.xsd
rename to xsd/dml/dml-diagramLayoutVariables.xsd
diff --git a/docx4j/xsd/dml/dml-diagramStyleDefinition.xsd b/xsd/dml/dml-diagramStyleDefinition.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-diagramStyleDefinition.xsd
rename to xsd/dml/dml-diagramStyleDefinition.xsd
diff --git a/docx4j/xsd/dml/dml-diagramTypes.xsd b/xsd/dml/dml-diagramTypes.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-diagramTypes.xsd
rename to xsd/dml/dml-diagramTypes.xsd
diff --git a/docx4j/xsd/dml/dml-documentProperties.xsd b/xsd/dml/dml-documentProperties.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-documentProperties.xsd
rename to xsd/dml/dml-documentProperties.xsd
diff --git a/docx4j/xsd/dml/dml-graphicalObject.xsd b/xsd/dml/dml-graphicalObject.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-graphicalObject.xsd
rename to xsd/dml/dml-graphicalObject.xsd
diff --git a/docx4j/xsd/dml/dml-graphicalObjectAnimation.xsd b/xsd/dml/dml-graphicalObjectAnimation.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-graphicalObjectAnimation.xsd
rename to xsd/dml/dml-graphicalObjectAnimation.xsd
diff --git a/docx4j/xsd/dml/dml-graphicalObjectFormat.xsd b/xsd/dml/dml-graphicalObjectFormat.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-graphicalObjectFormat.xsd
rename to xsd/dml/dml-graphicalObjectFormat.xsd
diff --git a/docx4j/xsd/dml/dml-gvml.xsd b/xsd/dml/dml-gvml.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-gvml.xsd
rename to xsd/dml/dml-gvml.xsd
diff --git a/docx4j/xsd/dml/dml-lockedCanvas.xsd b/xsd/dml/dml-lockedCanvas.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-lockedCanvas.xsd
rename to xsd/dml/dml-lockedCanvas.xsd
diff --git a/docx4j/xsd/dml/dml-picture.xsd b/xsd/dml/dml-picture.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-picture.xsd
rename to xsd/dml/dml-picture.xsd
diff --git a/docx4j/xsd/dml/dml-shape3DCamera.xsd b/xsd/dml/dml-shape3DCamera.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-shape3DCamera.xsd
rename to xsd/dml/dml-shape3DCamera.xsd
diff --git a/docx4j/xsd/dml/dml-shape3DLighting.xsd b/xsd/dml/dml-shape3DLighting.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-shape3DLighting.xsd
rename to xsd/dml/dml-shape3DLighting.xsd
diff --git a/docx4j/xsd/dml/dml-shape3DScene.xsd b/xsd/dml/dml-shape3DScene.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-shape3DScene.xsd
rename to xsd/dml/dml-shape3DScene.xsd
diff --git a/docx4j/xsd/dml/dml-shape3DScenePlane.xsd b/xsd/dml/dml-shape3DScenePlane.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-shape3DScenePlane.xsd
rename to xsd/dml/dml-shape3DScenePlane.xsd
diff --git a/docx4j/xsd/dml/dml-shape3DStyles.xsd b/xsd/dml/dml-shape3DStyles.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-shape3DStyles.xsd
rename to xsd/dml/dml-shape3DStyles.xsd
diff --git a/docx4j/xsd/dml/dml-shapeEffects.xsd b/xsd/dml/dml-shapeEffects.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-shapeEffects.xsd
rename to xsd/dml/dml-shapeEffects.xsd
diff --git a/docx4j/xsd/dml/dml-shapeGeometry.xsd b/xsd/dml/dml-shapeGeometry.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-shapeGeometry.xsd
rename to xsd/dml/dml-shapeGeometry.xsd
diff --git a/docx4j/xsd/dml/dml-shapeLineProperties.xsd b/xsd/dml/dml-shapeLineProperties.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-shapeLineProperties.xsd
rename to xsd/dml/dml-shapeLineProperties.xsd
diff --git a/docx4j/xsd/dml/dml-shapeMiscellaneous.xsd b/xsd/dml/dml-shapeMiscellaneous.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-shapeMiscellaneous.xsd
rename to xsd/dml/dml-shapeMiscellaneous.xsd
diff --git a/docx4j/xsd/dml/dml-shapeProperties.xsd b/xsd/dml/dml-shapeProperties.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-shapeProperties.xsd
rename to xsd/dml/dml-shapeProperties.xsd
diff --git a/docx4j/xsd/dml/dml-shapeStyle.xsd b/xsd/dml/dml-shapeStyle.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-shapeStyle.xsd
rename to xsd/dml/dml-shapeStyle.xsd
diff --git a/docx4j/xsd/dml/dml-spreadsheetDrawing.xsd b/xsd/dml/dml-spreadsheetDrawing.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-spreadsheetDrawing.xsd
rename to xsd/dml/dml-spreadsheetDrawing.xsd
diff --git a/docx4j/xsd/dml/dml-styleDefaults.xsd b/xsd/dml/dml-styleDefaults.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-styleDefaults.xsd
rename to xsd/dml/dml-styleDefaults.xsd
diff --git a/docx4j/xsd/dml/dml-stylesheet.xsd b/xsd/dml/dml-stylesheet.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-stylesheet.xsd
rename to xsd/dml/dml-stylesheet.xsd
diff --git a/docx4j/xsd/dml/dml-table.xsd b/xsd/dml/dml-table.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-table.xsd
rename to xsd/dml/dml-table.xsd
diff --git a/docx4j/xsd/dml/dml-tableStyle.xsd b/xsd/dml/dml-tableStyle.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-tableStyle.xsd
rename to xsd/dml/dml-tableStyle.xsd
diff --git a/docx4j/xsd/dml/dml-text.xsd b/xsd/dml/dml-text.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-text.xsd
rename to xsd/dml/dml-text.xsd
diff --git a/docx4j/xsd/dml/dml-textBullet.xsd b/xsd/dml/dml-textBullet.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-textBullet.xsd
rename to xsd/dml/dml-textBullet.xsd
diff --git a/docx4j/xsd/dml/dml-textCharacter.xsd b/xsd/dml/dml-textCharacter.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-textCharacter.xsd
rename to xsd/dml/dml-textCharacter.xsd
diff --git a/docx4j/xsd/dml/dml-textParagraph.xsd b/xsd/dml/dml-textParagraph.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-textParagraph.xsd
rename to xsd/dml/dml-textParagraph.xsd
diff --git a/docx4j/xsd/dml/dml-textRun.xsd b/xsd/dml/dml-textRun.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-textRun.xsd
rename to xsd/dml/dml-textRun.xsd
diff --git a/docx4j/xsd/dml/dml-wordprocessingDrawing.xsd b/xsd/dml/dml-wordprocessingDrawing.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml-wordprocessingDrawing.xsd
rename to xsd/dml/dml-wordprocessingDrawing.xsd
diff --git a/docx4j/xsd/dml/dml__ROOT.xsd b/xsd/dml/dml__ROOT.xsd
similarity index 100%
rename from docx4j/xsd/dml/dml__ROOT.xsd
rename to xsd/dml/dml__ROOT.xsd
diff --git a/docx4j/xsd/dml/tmp.txt b/xsd/dml/tmp.txt
similarity index 100%
rename from docx4j/xsd/dml/tmp.txt
rename to xsd/dml/tmp.txt
diff --git a/docx4j/xsd/dml/wordprocessingDrawing_import_Main.xsd b/xsd/dml/wordprocessingDrawing_import_Main.xsd
similarity index 100%
rename from docx4j/xsd/dml/wordprocessingDrawing_import_Main.xsd
rename to xsd/dml/wordprocessingDrawing_import_Main.xsd
diff --git a/docx4j/xsd/docProps/dc.xsd b/xsd/docProps/dc.xsd
similarity index 100%
rename from docx4j/xsd/docProps/dc.xsd
rename to xsd/docProps/dc.xsd
diff --git a/docx4j/xsd/docProps/dcmitype.xsd b/xsd/docProps/dcmitype.xsd
similarity index 100%
rename from docx4j/xsd/docProps/dcmitype.xsd
rename to xsd/docProps/dcmitype.xsd
diff --git a/docx4j/xsd/docProps/dcterms.xsd b/xsd/docProps/dcterms.xsd
similarity index 100%
rename from docx4j/xsd/docProps/dcterms.xsd
rename to xsd/docProps/dcterms.xsd
diff --git a/docx4j/xsd/docProps/opc-coreProperties.xsd b/xsd/docProps/opc-coreProperties.xsd
similarity index 100%
rename from docx4j/xsd/docProps/opc-coreProperties.xsd
rename to xsd/docProps/opc-coreProperties.xsd
diff --git a/docx4j/xsd/docProps/shared-documentPropertiesCustom.xsd b/xsd/docProps/shared-documentPropertiesCustom.xsd
similarity index 100%
rename from docx4j/xsd/docProps/shared-documentPropertiesCustom.xsd
rename to xsd/docProps/shared-documentPropertiesCustom.xsd
diff --git a/docx4j/xsd/docProps/shared-documentPropertiesExtended.xsd b/xsd/docProps/shared-documentPropertiesExtended.xsd
similarity index 100%
rename from docx4j/xsd/docProps/shared-documentPropertiesExtended.xsd
rename to xsd/docProps/shared-documentPropertiesExtended.xsd
diff --git a/docx4j/xsd/docProps/shared-documentPropertiesVariantTypes.xsd b/xsd/docProps/shared-documentPropertiesVariantTypes.xsd
similarity index 100%
rename from docx4j/xsd/docProps/shared-documentPropertiesVariantTypes.xsd
rename to xsd/docProps/shared-documentPropertiesVariantTypes.xsd
diff --git a/docx4j/xsd/license.html b/xsd/license.html
similarity index 100%
rename from docx4j/xsd/license.html
rename to xsd/license.html
diff --git a/docx4j/xsd/license_files/BackButton.gif b/xsd/license_files/BackButton.gif
similarity index 100%
rename from docx4j/xsd/license_files/BackButton.gif
rename to xsd/license_files/BackButton.gif
diff --git a/docx4j/xsd/license_files/H-dash.gif b/xsd/license_files/H-dash.gif
similarity index 100%
rename from docx4j/xsd/license_files/H-dash.gif
rename to xsd/license_files/H-dash.gif
diff --git a/docx4j/xsd/license_files/Lxmenu_spacer.gif b/xsd/license_files/Lxmenu_spacer.gif
similarity index 100%
rename from docx4j/xsd/license_files/Lxmenu_spacer.gif
rename to xsd/license_files/Lxmenu_spacer.gif
diff --git a/docx4j/xsd/license_files/MainLine.gif b/xsd/license_files/MainLine.gif
similarity index 100%
rename from docx4j/xsd/license_files/MainLine.gif
rename to xsd/license_files/MainLine.gif
diff --git a/docx4j/xsd/license_files/activities.gif b/xsd/license_files/activities.gif
similarity index 100%
rename from docx4j/xsd/license_files/activities.gif
rename to xsd/license_files/activities.gif
diff --git a/docx4j/xsd/license_files/contactEcma1.gif b/xsd/license_files/contactEcma1.gif
similarity index 100%
rename from docx4j/xsd/license_files/contactEcma1.gif
rename to xsd/license_files/contactEcma1.gif
diff --git a/docx4j/xsd/license_files/ecmasite.css b/xsd/license_files/ecmasite.css
similarity index 100%
rename from docx4j/xsd/license_files/ecmasite.css
rename to xsd/license_files/ecmasite.css
diff --git a/docx4j/xsd/license_files/leftmenu-bar1.gif b/xsd/license_files/leftmenu-bar1.gif
similarity index 100%
rename from docx4j/xsd/license_files/leftmenu-bar1.gif
rename to xsd/license_files/leftmenu-bar1.gif
diff --git a/docx4j/xsd/license_files/loadImg.js b/xsd/license_files/loadImg.js
similarity index 100%
rename from docx4j/xsd/license_files/loadImg.js
rename to xsd/license_files/loadImg.js
diff --git a/docx4j/xsd/license_files/logo_top.gif b/xsd/license_files/logo_top.gif
similarity index 100%
rename from docx4j/xsd/license_files/logo_top.gif
rename to xsd/license_files/logo_top.gif
diff --git a/docx4j/xsd/license_files/menu_bar.gif b/xsd/license_files/menu_bar.gif
similarity index 100%
rename from docx4j/xsd/license_files/menu_bar.gif
rename to xsd/license_files/menu_bar.gif
diff --git a/docx4j/xsd/license_files/news.gif b/xsd/license_files/news.gif
similarity index 100%
rename from docx4j/xsd/license_files/news.gif
rename to xsd/license_files/news.gif
diff --git a/docx4j/xsd/license_files/siteMap.gif b/xsd/license_files/siteMap.gif
similarity index 100%
rename from docx4j/xsd/license_files/siteMap.gif
rename to xsd/license_files/siteMap.gif
diff --git a/docx4j/xsd/license_files/sitemap-bkgrd.gif b/xsd/license_files/sitemap-bkgrd.gif
similarity index 100%
rename from docx4j/xsd/license_files/sitemap-bkgrd.gif
rename to xsd/license_files/sitemap-bkgrd.gif
diff --git a/docx4j/xsd/license_files/standardsactive.gif b/xsd/license_files/standardsactive.gif
similarity index 100%
rename from docx4j/xsd/license_files/standardsactive.gif
rename to xsd/license_files/standardsactive.gif
diff --git a/docx4j/xsd/license_files/top_bar.gif b/xsd/license_files/top_bar.gif
similarity index 100%
rename from docx4j/xsd/license_files/top_bar.gif
rename to xsd/license_files/top_bar.gif
diff --git a/docx4j/xsd/license_files/wcag1A.png b/xsd/license_files/wcag1A.png
similarity index 100%
rename from docx4j/xsd/license_files/wcag1A.png
rename to xsd/license_files/wcag1A.png
diff --git a/docx4j/xsd/license_files/whatisEcma.gif b/xsd/license_files/whatisEcma.gif
similarity index 100%
rename from docx4j/xsd/license_files/whatisEcma.gif
rename to xsd/license_files/whatisEcma.gif
diff --git a/docx4j/xsd/pml/dml_imports.xsd b/xsd/pml/dml_imports.xsd
similarity index 100%
rename from docx4j/xsd/pml/dml_imports.xsd
rename to xsd/pml/dml_imports.xsd
diff --git a/docx4j/xsd/pml/pml-animationInfo.xsd b/xsd/pml/pml-animationInfo.xsd
similarity index 100%
rename from docx4j/xsd/pml/pml-animationInfo.xsd
rename to xsd/pml/pml-animationInfo.xsd
diff --git a/docx4j/xsd/pml/pml-baseTypes.xsd b/xsd/pml/pml-baseTypes.xsd
similarity index 100%
rename from docx4j/xsd/pml/pml-baseTypes.xsd
rename to xsd/pml/pml-baseTypes.xsd
diff --git a/docx4j/xsd/pml/pml-comments.xsd b/xsd/pml/pml-comments.xsd
similarity index 100%
rename from docx4j/xsd/pml/pml-comments.xsd
rename to xsd/pml/pml-comments.xsd
diff --git a/docx4j/xsd/pml/pml-embedding.xsd b/xsd/pml/pml-embedding.xsd
similarity index 100%
rename from docx4j/xsd/pml/pml-embedding.xsd
rename to xsd/pml/pml-embedding.xsd
diff --git a/docx4j/xsd/pml/pml-presentation.xsd b/xsd/pml/pml-presentation.xsd
similarity index 100%
rename from docx4j/xsd/pml/pml-presentation.xsd
rename to xsd/pml/pml-presentation.xsd
diff --git a/docx4j/xsd/pml/pml-presentationProperties.xsd b/xsd/pml/pml-presentationProperties.xsd
similarity index 100%
rename from docx4j/xsd/pml/pml-presentationProperties.xsd
rename to xsd/pml/pml-presentationProperties.xsd
diff --git a/docx4j/xsd/pml/pml-slide.xsd b/xsd/pml/pml-slide.xsd
similarity index 100%
rename from docx4j/xsd/pml/pml-slide.xsd
rename to xsd/pml/pml-slide.xsd
diff --git a/docx4j/xsd/pml/pml-slideSynchronizationData.xsd b/xsd/pml/pml-slideSynchronizationData.xsd
similarity index 100%
rename from docx4j/xsd/pml/pml-slideSynchronizationData.xsd
rename to xsd/pml/pml-slideSynchronizationData.xsd
diff --git a/docx4j/xsd/pml/pml-userDefinedTags.xsd b/xsd/pml/pml-userDefinedTags.xsd
similarity index 100%
rename from docx4j/xsd/pml/pml-userDefinedTags.xsd
rename to xsd/pml/pml-userDefinedTags.xsd
diff --git a/docx4j/xsd/pml/pml-viewProperties.xsd b/xsd/pml/pml-viewProperties.xsd
similarity index 100%
rename from docx4j/xsd/pml/pml-viewProperties.xsd
rename to xsd/pml/pml-viewProperties.xsd
diff --git a/docx4j/xsd/pml/pml_root.xsd b/xsd/pml/pml_root.xsd
similarity index 100%
rename from docx4j/xsd/pml/pml_root.xsd
rename to xsd/pml/pml_root.xsd
diff --git a/docx4j/xsd/relationships.xsd b/xsd/relationships.xsd
similarity index 100%
rename from docx4j/xsd/relationships.xsd
rename to xsd/relationships.xsd
diff --git a/docx4j/xsd/sections.xsd b/xsd/sections.xsd
similarity index 100%
rename from docx4j/xsd/sections.xsd
rename to xsd/sections.xsd
diff --git a/docx4j/xsd/shared/shared-additionalCharacteristics.xsd b/xsd/shared/shared-additionalCharacteristics.xsd
similarity index 100%
rename from docx4j/xsd/shared/shared-additionalCharacteristics.xsd
rename to xsd/shared/shared-additionalCharacteristics.xsd
diff --git a/docx4j/xsd/shared/shared-bibliography.xsd b/xsd/shared/shared-bibliography.xsd
similarity index 100%
rename from docx4j/xsd/shared/shared-bibliography.xsd
rename to xsd/shared/shared-bibliography.xsd
diff --git a/docx4j/xsd/shared/shared-commonSimpleTypes.xsd b/xsd/shared/shared-commonSimpleTypes.xsd
similarity index 100%
rename from docx4j/xsd/shared/shared-commonSimpleTypes.xsd
rename to xsd/shared/shared-commonSimpleTypes.xsd
diff --git a/docx4j/xsd/shared/shared-math.xsd b/xsd/shared/shared-math.xsd
similarity index 100%
rename from docx4j/xsd/shared/shared-math.xsd
rename to xsd/shared/shared-math.xsd
diff --git a/docx4j/xsd/shared/shared-relationshipReference.xsd b/xsd/shared/shared-relationshipReference.xsd
similarity index 100%
rename from docx4j/xsd/shared/shared-relationshipReference.xsd
rename to xsd/shared/shared-relationshipReference.xsd
diff --git a/docx4j/xsd/sml/sml-autoFilter.xsd b/xsd/sml/sml-autoFilter.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-autoFilter.xsd
rename to xsd/sml/sml-autoFilter.xsd
diff --git a/docx4j/xsd/sml/sml-baseTypes.xsd b/xsd/sml/sml-baseTypes.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-baseTypes.xsd
rename to xsd/sml/sml-baseTypes.xsd
diff --git a/docx4j/xsd/sml/sml-calculationChain.xsd b/xsd/sml/sml-calculationChain.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-calculationChain.xsd
rename to xsd/sml/sml-calculationChain.xsd
diff --git a/docx4j/xsd/sml/sml-comments.xsd b/xsd/sml/sml-comments.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-comments.xsd
rename to xsd/sml/sml-comments.xsd
diff --git a/docx4j/xsd/sml/sml-customXmlMappings.xsd b/xsd/sml/sml-customXmlMappings.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-customXmlMappings.xsd
rename to xsd/sml/sml-customXmlMappings.xsd
diff --git a/docx4j/xsd/sml/sml-externalConnections.xsd b/xsd/sml/sml-externalConnections.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-externalConnections.xsd
rename to xsd/sml/sml-externalConnections.xsd
diff --git a/docx4j/xsd/sml/sml-pivotTable.xsd b/xsd/sml/sml-pivotTable.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-pivotTable.xsd
rename to xsd/sml/sml-pivotTable.xsd
diff --git a/docx4j/xsd/sml/sml-pivotTableShared.xsd b/xsd/sml/sml-pivotTableShared.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-pivotTableShared.xsd
rename to xsd/sml/sml-pivotTableShared.xsd
diff --git a/docx4j/xsd/sml/sml-queryTable.xsd b/xsd/sml/sml-queryTable.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-queryTable.xsd
rename to xsd/sml/sml-queryTable.xsd
diff --git a/docx4j/xsd/sml/sml-sharedStringTable.xsd b/xsd/sml/sml-sharedStringTable.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-sharedStringTable.xsd
rename to xsd/sml/sml-sharedStringTable.xsd
diff --git a/docx4j/xsd/sml/sml-sharedWorkbookRevisions.xsd b/xsd/sml/sml-sharedWorkbookRevisions.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-sharedWorkbookRevisions.xsd
rename to xsd/sml/sml-sharedWorkbookRevisions.xsd
diff --git a/docx4j/xsd/sml/sml-sharedWorkbookUserNames.xsd b/xsd/sml/sml-sharedWorkbookUserNames.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-sharedWorkbookUserNames.xsd
rename to xsd/sml/sml-sharedWorkbookUserNames.xsd
diff --git a/docx4j/xsd/sml/sml-sheet.xsd b/xsd/sml/sml-sheet.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-sheet.xsd
rename to xsd/sml/sml-sheet.xsd
diff --git a/docx4j/xsd/sml/sml-sheetMetadata.xsd b/xsd/sml/sml-sheetMetadata.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-sheetMetadata.xsd
rename to xsd/sml/sml-sheetMetadata.xsd
diff --git a/docx4j/xsd/sml/sml-singleCellTable.xsd b/xsd/sml/sml-singleCellTable.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-singleCellTable.xsd
rename to xsd/sml/sml-singleCellTable.xsd
diff --git a/docx4j/xsd/sml/sml-styles.xsd b/xsd/sml/sml-styles.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-styles.xsd
rename to xsd/sml/sml-styles.xsd
diff --git a/docx4j/xsd/sml/sml-supplementaryWorkbooks.xsd b/xsd/sml/sml-supplementaryWorkbooks.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-supplementaryWorkbooks.xsd
rename to xsd/sml/sml-supplementaryWorkbooks.xsd
diff --git a/docx4j/xsd/sml/sml-table.xsd b/xsd/sml/sml-table.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-table.xsd
rename to xsd/sml/sml-table.xsd
diff --git a/docx4j/xsd/sml/sml-volatileDependencies.xsd b/xsd/sml/sml-volatileDependencies.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-volatileDependencies.xsd
rename to xsd/sml/sml-volatileDependencies.xsd
diff --git a/docx4j/xsd/sml/sml-workbook.xsd b/xsd/sml/sml-workbook.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml-workbook.xsd
rename to xsd/sml/sml-workbook.xsd
diff --git a/docx4j/xsd/sml/sml_root.xsd b/xsd/sml/sml_root.xsd
similarity index 100%
rename from docx4j/xsd/sml/sml_root.xsd
rename to xsd/sml/sml_root.xsd
diff --git a/docx4j/xsd/vml/README.txt b/xsd/vml/README.txt
similarity index 100%
rename from docx4j/xsd/vml/README.txt
rename to xsd/vml/README.txt
diff --git a/docx4j/xsd/vml/vml-main.xsd b/xsd/vml/vml-main.xsd
similarity index 100%
rename from docx4j/xsd/vml/vml-main.xsd
rename to xsd/vml/vml-main.xsd
diff --git a/docx4j/xsd/vml/vml-officedrawing.xsd b/xsd/vml/vml-officedrawing.xsd
similarity index 100%
rename from docx4j/xsd/vml/vml-officedrawing.xsd
rename to xsd/vml/vml-officedrawing.xsd
diff --git a/docx4j/xsd/vml/vml-presentationDrawing.xsd b/xsd/vml/vml-presentationDrawing.xsd
similarity index 100%
rename from docx4j/xsd/vml/vml-presentationDrawing.xsd
rename to xsd/vml/vml-presentationDrawing.xsd
diff --git a/docx4j/xsd/vml/vml-spreadsheetDrawing.xsd b/xsd/vml/vml-spreadsheetDrawing.xsd
similarity index 100%
rename from docx4j/xsd/vml/vml-spreadsheetDrawing.xsd
rename to xsd/vml/vml-spreadsheetDrawing.xsd
diff --git a/docx4j/xsd/vml/vml-wordprocessingdrawing.xsd b/xsd/vml/vml-wordprocessingdrawing.xsd
similarity index 100%
rename from docx4j/xsd/vml/vml-wordprocessingdrawing.xsd
rename to xsd/vml/vml-wordprocessingdrawing.xsd
diff --git a/docx4j/xsd/vml/vml__ROOT.xsd b/xsd/vml/vml__ROOT.xsd
similarity index 100%
rename from docx4j/xsd/vml/vml__ROOT.xsd
rename to xsd/vml/vml__ROOT.xsd
diff --git a/docx4j/xsd/wml/package.xsd b/xsd/wml/package.xsd
similarity index 100%
rename from docx4j/xsd/wml/package.xsd
rename to xsd/wml/package.xsd
diff --git a/docx4j/xsd/wml/wml-generated-package.patch b/xsd/wml/wml-generated-package.patch
similarity index 100%
rename from docx4j/xsd/wml/wml-generated-package.patch
rename to xsd/wml/wml-generated-package.patch
diff --git a/docx4j/xsd/wml/wml.xsd b/xsd/wml/wml.xsd
similarity index 100%
rename from docx4j/xsd/wml/wml.xsd
rename to xsd/wml/wml.xsd
diff --git a/docx4j/xsd/wml/xml.xsd b/xsd/wml/xml.xsd
similarity index 100%
rename from docx4j/xsd/wml/xml.xsd
rename to xsd/wml/xml.xsd
diff --git a/docx4j/xsd/xhtml-wordml.xsd b/xsd/xhtml-wordml.xsd
similarity index 100%
rename from docx4j/xsd/xhtml-wordml.xsd
rename to xsd/xhtml-wordml.xsd
diff --git a/docx4j/xsd/xmlPackage.xsd b/xsd/xmlPackage.xsd
similarity index 100%
rename from docx4j/xsd/xmlPackage.xsd
rename to xsd/xmlPackage.xsd
diff --git a/docx4j/xsd/xslfo/fop.xsd b/xsd/xslfo/fop.xsd
similarity index 100%
rename from docx4j/xsd/xslfo/fop.xsd
rename to xsd/xslfo/fop.xsd