diff --git a/core-java/src/test/java/org/baeldung/java/io/ApacheFOPTest.java b/apache-fop/src/test/java/org/baeldung/java/ApacheFOPConvertHTMLTest.java
similarity index 98%
rename from core-java/src/test/java/org/baeldung/java/io/ApacheFOPTest.java
rename to apache-fop/src/test/java/org/baeldung/java/ApacheFOPConvertHTMLTest.java
index c3244733bb..533825f39d 100644
--- a/core-java/src/test/java/org/baeldung/java/io/ApacheFOPTest.java
+++ b/apache-fop/src/test/java/org/baeldung/java/ApacheFOPConvertHTMLTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java.io;
+package org.baeldung.java;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -25,7 +25,7 @@ import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.tidy.Tidy;
 
-public class ApacheFOPTest {
+public class ApacheFOPConvertHTMLTest {
     private String inputFile = "src/test/resources/hello.html";
     private String style = "src/test/resources/xhtml2fo.xsl";
     private String style1 = "src/test/resources/docbook-xsl/fo/docbook.xsl";
diff --git a/core-java/src/test/resources/docbook-xsl/AUTHORS b/apache-fop/src/test/resources/docbook-xsl/AUTHORS
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/AUTHORS
rename to apache-fop/src/test/resources/docbook-xsl/AUTHORS
diff --git a/core-java/src/test/resources/docbook-xsl/BUGS b/apache-fop/src/test/resources/docbook-xsl/BUGS
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/BUGS
rename to apache-fop/src/test/resources/docbook-xsl/BUGS
diff --git a/core-java/src/test/resources/docbook-xsl/COPYING b/apache-fop/src/test/resources/docbook-xsl/COPYING
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/COPYING
rename to apache-fop/src/test/resources/docbook-xsl/COPYING
diff --git a/core-java/src/test/resources/docbook-xsl/INSTALL b/apache-fop/src/test/resources/docbook-xsl/INSTALL
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/INSTALL
rename to apache-fop/src/test/resources/docbook-xsl/INSTALL
diff --git a/core-java/src/test/resources/docbook-xsl/Makefile b/apache-fop/src/test/resources/docbook-xsl/Makefile
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/Makefile
rename to apache-fop/src/test/resources/docbook-xsl/Makefile
diff --git a/core-java/src/test/resources/docbook-xsl/NEWS b/apache-fop/src/test/resources/docbook-xsl/NEWS
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/NEWS
rename to apache-fop/src/test/resources/docbook-xsl/NEWS
diff --git a/core-java/src/test/resources/docbook-xsl/NEWS.html b/apache-fop/src/test/resources/docbook-xsl/NEWS.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/NEWS.html
rename to apache-fop/src/test/resources/docbook-xsl/NEWS.html
diff --git a/core-java/src/test/resources/docbook-xsl/NEWS.xml b/apache-fop/src/test/resources/docbook-xsl/NEWS.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/NEWS.xml
rename to apache-fop/src/test/resources/docbook-xsl/NEWS.xml
diff --git a/core-java/src/test/resources/docbook-xsl/README b/apache-fop/src/test/resources/docbook-xsl/README
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/README
rename to apache-fop/src/test/resources/docbook-xsl/README
diff --git a/core-java/src/test/resources/docbook-xsl/RELEASE-NOTES-TMP.xml b/apache-fop/src/test/resources/docbook-xsl/RELEASE-NOTES-TMP.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/RELEASE-NOTES-TMP.xml
rename to apache-fop/src/test/resources/docbook-xsl/RELEASE-NOTES-TMP.xml
diff --git a/core-java/src/test/resources/docbook-xsl/RELEASE-NOTES.html b/apache-fop/src/test/resources/docbook-xsl/RELEASE-NOTES.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/RELEASE-NOTES.html
rename to apache-fop/src/test/resources/docbook-xsl/RELEASE-NOTES.html
diff --git a/core-java/src/test/resources/docbook-xsl/RELEASE-NOTES.pdf b/apache-fop/src/test/resources/docbook-xsl/RELEASE-NOTES.pdf
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/RELEASE-NOTES.pdf
rename to apache-fop/src/test/resources/docbook-xsl/RELEASE-NOTES.pdf
diff --git a/core-java/src/test/resources/docbook-xsl/RELEASE-NOTES.xml b/apache-fop/src/test/resources/docbook-xsl/RELEASE-NOTES.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/RELEASE-NOTES.xml
rename to apache-fop/src/test/resources/docbook-xsl/RELEASE-NOTES.xml
diff --git a/core-java/src/test/resources/docbook-xsl/REVISION b/apache-fop/src/test/resources/docbook-xsl/REVISION
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/REVISION
rename to apache-fop/src/test/resources/docbook-xsl/REVISION
diff --git a/core-java/src/test/resources/docbook-xsl/TODO b/apache-fop/src/test/resources/docbook-xsl/TODO
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/TODO
rename to apache-fop/src/test/resources/docbook-xsl/TODO
diff --git a/core-java/src/test/resources/docbook-xsl/VERSION b/apache-fop/src/test/resources/docbook-xsl/VERSION
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/VERSION
rename to apache-fop/src/test/resources/docbook-xsl/VERSION
diff --git a/core-java/src/test/resources/docbook-xsl/VERSION.xsl b/apache-fop/src/test/resources/docbook-xsl/VERSION.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/VERSION.xsl
rename to apache-fop/src/test/resources/docbook-xsl/VERSION.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/assembly/README b/apache-fop/src/test/resources/docbook-xsl/assembly/README
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/assembly/README
rename to apache-fop/src/test/resources/docbook-xsl/assembly/README
diff --git a/core-java/src/test/resources/docbook-xsl/assembly/assemble.xsl b/apache-fop/src/test/resources/docbook-xsl/assembly/assemble.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/assembly/assemble.xsl
rename to apache-fop/src/test/resources/docbook-xsl/assembly/assemble.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/assembly/schema/assembly51b7.rnc b/apache-fop/src/test/resources/docbook-xsl/assembly/schema/assembly51b7.rnc
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/assembly/schema/assembly51b7.rnc
rename to apache-fop/src/test/resources/docbook-xsl/assembly/schema/assembly51b7.rnc
diff --git a/core-java/src/test/resources/docbook-xsl/assembly/schema/docbook51b7.rnc b/apache-fop/src/test/resources/docbook-xsl/assembly/schema/docbook51b7.rnc
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/assembly/schema/docbook51b7.rnc
rename to apache-fop/src/test/resources/docbook-xsl/assembly/schema/docbook51b7.rnc
diff --git a/core-java/src/test/resources/docbook-xsl/assembly/topic-maker-chunk.xsl b/apache-fop/src/test/resources/docbook-xsl/assembly/topic-maker-chunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/assembly/topic-maker-chunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/assembly/topic-maker-chunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/assembly/topic-maker.xsl b/apache-fop/src/test/resources/docbook-xsl/assembly/topic-maker.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/assembly/topic-maker.xsl
rename to apache-fop/src/test/resources/docbook-xsl/assembly/topic-maker.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/catalog.xml b/apache-fop/src/test/resources/docbook-xsl/catalog.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/catalog.xml
rename to apache-fop/src/test/resources/docbook-xsl/catalog.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/af.xml b/apache-fop/src/test/resources/docbook-xsl/common/af.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/af.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/af.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/am.xml b/apache-fop/src/test/resources/docbook-xsl/common/am.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/am.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/am.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/ar.xml b/apache-fop/src/test/resources/docbook-xsl/common/ar.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/ar.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/ar.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/as.xml b/apache-fop/src/test/resources/docbook-xsl/common/as.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/as.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/as.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/ast.xml b/apache-fop/src/test/resources/docbook-xsl/common/ast.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/ast.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/ast.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/autoidx-kimber.xsl b/apache-fop/src/test/resources/docbook-xsl/common/autoidx-kimber.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/autoidx-kimber.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/autoidx-kimber.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/autoidx-kosek.xsl b/apache-fop/src/test/resources/docbook-xsl/common/autoidx-kosek.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/autoidx-kosek.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/autoidx-kosek.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/az.xml b/apache-fop/src/test/resources/docbook-xsl/common/az.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/az.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/az.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/bg.xml b/apache-fop/src/test/resources/docbook-xsl/common/bg.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/bg.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/bg.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/bn.xml b/apache-fop/src/test/resources/docbook-xsl/common/bn.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/bn.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/bn.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/bn_in.xml b/apache-fop/src/test/resources/docbook-xsl/common/bn_in.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/bn_in.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/bn_in.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/bs.xml b/apache-fop/src/test/resources/docbook-xsl/common/bs.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/bs.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/bs.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/ca.xml b/apache-fop/src/test/resources/docbook-xsl/common/ca.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/ca.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/ca.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/charmap.xml b/apache-fop/src/test/resources/docbook-xsl/common/charmap.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/charmap.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/charmap.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/charmap.xsl b/apache-fop/src/test/resources/docbook-xsl/common/charmap.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/charmap.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/charmap.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/common.xml b/apache-fop/src/test/resources/docbook-xsl/common/common.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/common.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/common.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/common.xsl b/apache-fop/src/test/resources/docbook-xsl/common/common.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/common.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/common.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/cs.xml b/apache-fop/src/test/resources/docbook-xsl/common/cs.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/cs.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/cs.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/cy.xml b/apache-fop/src/test/resources/docbook-xsl/common/cy.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/cy.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/cy.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/da.xml b/apache-fop/src/test/resources/docbook-xsl/common/da.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/da.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/da.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/de.xml b/apache-fop/src/test/resources/docbook-xsl/common/de.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/de.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/de.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/el.xml b/apache-fop/src/test/resources/docbook-xsl/common/el.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/el.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/el.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/en.xml b/apache-fop/src/test/resources/docbook-xsl/common/en.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/en.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/en.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/entities.ent b/apache-fop/src/test/resources/docbook-xsl/common/entities.ent
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/entities.ent
rename to apache-fop/src/test/resources/docbook-xsl/common/entities.ent
diff --git a/core-java/src/test/resources/docbook-xsl/common/eo.xml b/apache-fop/src/test/resources/docbook-xsl/common/eo.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/eo.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/eo.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/es.xml b/apache-fop/src/test/resources/docbook-xsl/common/es.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/es.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/es.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/et.xml b/apache-fop/src/test/resources/docbook-xsl/common/et.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/et.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/et.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/eu.xml b/apache-fop/src/test/resources/docbook-xsl/common/eu.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/eu.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/eu.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/fa.xml b/apache-fop/src/test/resources/docbook-xsl/common/fa.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/fa.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/fa.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/fi.xml b/apache-fop/src/test/resources/docbook-xsl/common/fi.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/fi.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/fi.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/fr.xml b/apache-fop/src/test/resources/docbook-xsl/common/fr.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/fr.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/fr.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/ga.xml b/apache-fop/src/test/resources/docbook-xsl/common/ga.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/ga.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/ga.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/gentext.xsl b/apache-fop/src/test/resources/docbook-xsl/common/gentext.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/gentext.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/gentext.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/gl.xml b/apache-fop/src/test/resources/docbook-xsl/common/gl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/gl.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/gl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/gu.xml b/apache-fop/src/test/resources/docbook-xsl/common/gu.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/gu.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/gu.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/he.xml b/apache-fop/src/test/resources/docbook-xsl/common/he.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/he.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/he.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/hi.xml b/apache-fop/src/test/resources/docbook-xsl/common/hi.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/hi.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/hi.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/hr.xml b/apache-fop/src/test/resources/docbook-xsl/common/hr.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/hr.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/hr.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/hu.xml b/apache-fop/src/test/resources/docbook-xsl/common/hu.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/hu.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/hu.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/id.xml b/apache-fop/src/test/resources/docbook-xsl/common/id.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/id.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/id.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/insertfile.xsl b/apache-fop/src/test/resources/docbook-xsl/common/insertfile.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/insertfile.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/insertfile.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/is.xml b/apache-fop/src/test/resources/docbook-xsl/common/is.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/is.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/is.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/it.xml b/apache-fop/src/test/resources/docbook-xsl/common/it.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/it.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/it.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/ja.xml b/apache-fop/src/test/resources/docbook-xsl/common/ja.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/ja.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/ja.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/ka.xml b/apache-fop/src/test/resources/docbook-xsl/common/ka.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/ka.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/ka.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/kn.xml b/apache-fop/src/test/resources/docbook-xsl/common/kn.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/kn.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/kn.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/ko.xml b/apache-fop/src/test/resources/docbook-xsl/common/ko.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/ko.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/ko.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/ky.xml b/apache-fop/src/test/resources/docbook-xsl/common/ky.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/ky.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/ky.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/l10n.dtd b/apache-fop/src/test/resources/docbook-xsl/common/l10n.dtd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/l10n.dtd
rename to apache-fop/src/test/resources/docbook-xsl/common/l10n.dtd
diff --git a/core-java/src/test/resources/docbook-xsl/common/l10n.xml b/apache-fop/src/test/resources/docbook-xsl/common/l10n.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/l10n.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/l10n.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/l10n.xsl b/apache-fop/src/test/resources/docbook-xsl/common/l10n.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/l10n.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/l10n.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/la.xml b/apache-fop/src/test/resources/docbook-xsl/common/la.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/la.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/la.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/labels.xsl b/apache-fop/src/test/resources/docbook-xsl/common/labels.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/labels.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/labels.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/lt.xml b/apache-fop/src/test/resources/docbook-xsl/common/lt.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/lt.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/lt.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/lv.xml b/apache-fop/src/test/resources/docbook-xsl/common/lv.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/lv.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/lv.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/ml.xml b/apache-fop/src/test/resources/docbook-xsl/common/ml.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/ml.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/ml.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/mn.xml b/apache-fop/src/test/resources/docbook-xsl/common/mn.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/mn.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/mn.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/mr.xml b/apache-fop/src/test/resources/docbook-xsl/common/mr.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/mr.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/mr.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/nb.xml b/apache-fop/src/test/resources/docbook-xsl/common/nb.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/nb.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/nb.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/nds.xml b/apache-fop/src/test/resources/docbook-xsl/common/nds.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/nds.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/nds.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/nl.xml b/apache-fop/src/test/resources/docbook-xsl/common/nl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/nl.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/nl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/nn.xml b/apache-fop/src/test/resources/docbook-xsl/common/nn.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/nn.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/nn.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/olink.xsl b/apache-fop/src/test/resources/docbook-xsl/common/olink.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/olink.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/olink.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/or.xml b/apache-fop/src/test/resources/docbook-xsl/common/or.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/or.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/or.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/pa.xml b/apache-fop/src/test/resources/docbook-xsl/common/pa.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/pa.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/pa.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/pi.xml b/apache-fop/src/test/resources/docbook-xsl/common/pi.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/pi.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/pi.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/pi.xsl b/apache-fop/src/test/resources/docbook-xsl/common/pi.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/pi.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/pi.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/pl.xml b/apache-fop/src/test/resources/docbook-xsl/common/pl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/pl.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/pl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/pt.xml b/apache-fop/src/test/resources/docbook-xsl/common/pt.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/pt.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/pt.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/pt_br.xml b/apache-fop/src/test/resources/docbook-xsl/common/pt_br.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/pt_br.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/pt_br.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/refentry.xml b/apache-fop/src/test/resources/docbook-xsl/common/refentry.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/refentry.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/refentry.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/refentry.xsl b/apache-fop/src/test/resources/docbook-xsl/common/refentry.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/refentry.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/refentry.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/ro.xml b/apache-fop/src/test/resources/docbook-xsl/common/ro.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/ro.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/ro.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/ru.xml b/apache-fop/src/test/resources/docbook-xsl/common/ru.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/ru.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/ru.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/sk.xml b/apache-fop/src/test/resources/docbook-xsl/common/sk.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/sk.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/sk.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/sl.xml b/apache-fop/src/test/resources/docbook-xsl/common/sl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/sl.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/sl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/sq.xml b/apache-fop/src/test/resources/docbook-xsl/common/sq.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/sq.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/sq.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/sr.xml b/apache-fop/src/test/resources/docbook-xsl/common/sr.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/sr.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/sr.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/sr_Latn.xml b/apache-fop/src/test/resources/docbook-xsl/common/sr_Latn.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/sr_Latn.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/sr_Latn.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/stripns.xsl b/apache-fop/src/test/resources/docbook-xsl/common/stripns.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/stripns.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/stripns.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/subtitles.xsl b/apache-fop/src/test/resources/docbook-xsl/common/subtitles.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/subtitles.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/subtitles.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/sv.xml b/apache-fop/src/test/resources/docbook-xsl/common/sv.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/sv.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/sv.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/ta.xml b/apache-fop/src/test/resources/docbook-xsl/common/ta.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/ta.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/ta.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/table.xsl b/apache-fop/src/test/resources/docbook-xsl/common/table.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/table.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/table.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/targetdatabase.dtd b/apache-fop/src/test/resources/docbook-xsl/common/targetdatabase.dtd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/targetdatabase.dtd
rename to apache-fop/src/test/resources/docbook-xsl/common/targetdatabase.dtd
diff --git a/core-java/src/test/resources/docbook-xsl/common/targets.xsl b/apache-fop/src/test/resources/docbook-xsl/common/targets.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/targets.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/targets.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/te.xml b/apache-fop/src/test/resources/docbook-xsl/common/te.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/te.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/te.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/th.xml b/apache-fop/src/test/resources/docbook-xsl/common/th.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/th.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/th.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/titles.xsl b/apache-fop/src/test/resources/docbook-xsl/common/titles.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/titles.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/titles.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/tl.xml b/apache-fop/src/test/resources/docbook-xsl/common/tl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/tl.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/tl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/tr.xml b/apache-fop/src/test/resources/docbook-xsl/common/tr.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/tr.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/tr.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/uk.xml b/apache-fop/src/test/resources/docbook-xsl/common/uk.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/uk.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/uk.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/utility.xml b/apache-fop/src/test/resources/docbook-xsl/common/utility.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/utility.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/utility.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/utility.xsl b/apache-fop/src/test/resources/docbook-xsl/common/utility.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/utility.xsl
rename to apache-fop/src/test/resources/docbook-xsl/common/utility.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/common/vi.xml b/apache-fop/src/test/resources/docbook-xsl/common/vi.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/vi.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/vi.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/xh.xml b/apache-fop/src/test/resources/docbook-xsl/common/xh.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/xh.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/xh.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/zh.xml b/apache-fop/src/test/resources/docbook-xsl/common/zh.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/zh.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/zh.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/zh_cn.xml b/apache-fop/src/test/resources/docbook-xsl/common/zh_cn.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/zh_cn.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/zh_cn.xml
diff --git a/core-java/src/test/resources/docbook-xsl/common/zh_tw.xml b/apache-fop/src/test/resources/docbook-xsl/common/zh_tw.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/common/zh_tw.xml
rename to apache-fop/src/test/resources/docbook-xsl/common/zh_tw.xml
diff --git a/core-java/src/test/resources/docbook-xsl/docsrc/authors.xml b/apache-fop/src/test/resources/docbook-xsl/docsrc/authors.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/docsrc/authors.xml
rename to apache-fop/src/test/resources/docbook-xsl/docsrc/authors.xml
diff --git a/core-java/src/test/resources/docbook-xsl/docsrc/copyright.xml b/apache-fop/src/test/resources/docbook-xsl/docsrc/copyright.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/docsrc/copyright.xml
rename to apache-fop/src/test/resources/docbook-xsl/docsrc/copyright.xml
diff --git a/core-java/src/test/resources/docbook-xsl/docsrc/license.xml b/apache-fop/src/test/resources/docbook-xsl/docsrc/license.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/docsrc/license.xml
rename to apache-fop/src/test/resources/docbook-xsl/docsrc/license.xml
diff --git a/core-java/src/test/resources/docbook-xsl/docsrc/page.png b/apache-fop/src/test/resources/docbook-xsl/docsrc/page.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/docsrc/page.png
rename to apache-fop/src/test/resources/docbook-xsl/docsrc/page.png
diff --git a/core-java/src/test/resources/docbook-xsl/docsrc/reference.css b/apache-fop/src/test/resources/docbook-xsl/docsrc/reference.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/docsrc/reference.css
rename to apache-fop/src/test/resources/docbook-xsl/docsrc/reference.css
diff --git a/core-java/src/test/resources/docbook-xsl/docsrc/reference.xml b/apache-fop/src/test/resources/docbook-xsl/docsrc/reference.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/docsrc/reference.xml
rename to apache-fop/src/test/resources/docbook-xsl/docsrc/reference.xml
diff --git a/core-java/src/test/resources/docbook-xsl/docsrc/reference.xml.included b/apache-fop/src/test/resources/docbook-xsl/docsrc/reference.xml.included
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/docsrc/reference.xml.included
rename to apache-fop/src/test/resources/docbook-xsl/docsrc/reference.xml.included
diff --git a/core-java/src/test/resources/docbook-xsl/docsrc/warranty.xml b/apache-fop/src/test/resources/docbook-xsl/docsrc/warranty.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/docsrc/warranty.xml
rename to apache-fop/src/test/resources/docbook-xsl/docsrc/warranty.xml
diff --git a/core-java/src/test/resources/docbook-xsl/eclipse/eclipse.xsl b/apache-fop/src/test/resources/docbook-xsl/eclipse/eclipse.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/eclipse/eclipse.xsl
rename to apache-fop/src/test/resources/docbook-xsl/eclipse/eclipse.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/eclipse/eclipse3.xsl b/apache-fop/src/test/resources/docbook-xsl/eclipse/eclipse3.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/eclipse/eclipse3.xsl
rename to apache-fop/src/test/resources/docbook-xsl/eclipse/eclipse3.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/eclipse/profile-eclipse.xsl b/apache-fop/src/test/resources/docbook-xsl/eclipse/profile-eclipse.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/eclipse/profile-eclipse.xsl
rename to apache-fop/src/test/resources/docbook-xsl/eclipse/profile-eclipse.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/epub/README b/apache-fop/src/test/resources/docbook-xsl/epub/README
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub/README
rename to apache-fop/src/test/resources/docbook-xsl/epub/README
diff --git a/core-java/src/test/resources/docbook-xsl/epub/bin/dbtoepub b/apache-fop/src/test/resources/docbook-xsl/epub/bin/dbtoepub
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub/bin/dbtoepub
rename to apache-fop/src/test/resources/docbook-xsl/epub/bin/dbtoepub
diff --git a/core-java/src/test/resources/docbook-xsl/epub/bin/lib/docbook.rb b/apache-fop/src/test/resources/docbook-xsl/epub/bin/lib/docbook.rb
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub/bin/lib/docbook.rb
rename to apache-fop/src/test/resources/docbook-xsl/epub/bin/lib/docbook.rb
diff --git a/core-java/src/test/resources/docbook-xsl/epub/bin/xslt/obfuscate.xsl b/apache-fop/src/test/resources/docbook-xsl/epub/bin/xslt/obfuscate.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub/bin/xslt/obfuscate.xsl
rename to apache-fop/src/test/resources/docbook-xsl/epub/bin/xslt/obfuscate.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/epub/docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/epub/docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub/docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/epub/docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/epub3/README b/apache-fop/src/test/resources/docbook-xsl/epub3/README
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub3/README
rename to apache-fop/src/test/resources/docbook-xsl/epub3/README
diff --git a/core-java/src/test/resources/docbook-xsl/epub3/chunk.xsl b/apache-fop/src/test/resources/docbook-xsl/epub3/chunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub3/chunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/epub3/chunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/epub3/chunkfast.xsl b/apache-fop/src/test/resources/docbook-xsl/epub3/chunkfast.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub3/chunkfast.xsl
rename to apache-fop/src/test/resources/docbook-xsl/epub3/chunkfast.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/epub3/docbook-epub.css.xml b/apache-fop/src/test/resources/docbook-xsl/epub3/docbook-epub.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub3/docbook-epub.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/epub3/docbook-epub.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/epub3/docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/epub3/docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub3/docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/epub3/docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/epub3/epub3-chunk-mods.xsl b/apache-fop/src/test/resources/docbook-xsl/epub3/epub3-chunk-mods.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub3/epub3-chunk-mods.xsl
rename to apache-fop/src/test/resources/docbook-xsl/epub3/epub3-chunk-mods.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/epub3/epub3-element-mods.xsl b/apache-fop/src/test/resources/docbook-xsl/epub3/epub3-element-mods.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub3/epub3-element-mods.xsl
rename to apache-fop/src/test/resources/docbook-xsl/epub3/epub3-element-mods.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/epub3/profile-chunk.xsl b/apache-fop/src/test/resources/docbook-xsl/epub3/profile-chunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub3/profile-chunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/epub3/profile-chunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/epub3/profile-docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/epub3/profile-docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub3/profile-docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/epub3/profile-docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/epub3/titlepage.templates.xml b/apache-fop/src/test/resources/docbook-xsl/epub3/titlepage.templates.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub3/titlepage.templates.xml
rename to apache-fop/src/test/resources/docbook-xsl/epub3/titlepage.templates.xml
diff --git a/core-java/src/test/resources/docbook-xsl/epub3/titlepage.templates.xsl b/apache-fop/src/test/resources/docbook-xsl/epub3/titlepage.templates.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/epub3/titlepage.templates.xsl
rename to apache-fop/src/test/resources/docbook-xsl/epub3/titlepage.templates.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/extensions/README.LIBXSLT b/apache-fop/src/test/resources/docbook-xsl/extensions/README.LIBXSLT
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/extensions/README.LIBXSLT
rename to apache-fop/src/test/resources/docbook-xsl/extensions/README.LIBXSLT
diff --git a/core-java/src/test/resources/docbook-xsl/extensions/docbook.py b/apache-fop/src/test/resources/docbook-xsl/extensions/docbook.py
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/extensions/docbook.py
rename to apache-fop/src/test/resources/docbook-xsl/extensions/docbook.py
diff --git a/core-java/src/test/resources/docbook-xsl/extensions/xslt.py b/apache-fop/src/test/resources/docbook-xsl/extensions/xslt.py
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/extensions/xslt.py
rename to apache-fop/src/test/resources/docbook-xsl/extensions/xslt.py
diff --git a/core-java/src/test/resources/docbook-xsl/fo/admon.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/admon.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/admon.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/admon.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/annotations.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/annotations.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/annotations.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/annotations.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/autoidx-kimber.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/autoidx-kimber.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/autoidx-kimber.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/autoidx-kimber.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/autoidx-kosek.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/autoidx-kosek.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/autoidx-kosek.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/autoidx-kosek.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/autoidx-ng.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/autoidx-ng.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/autoidx-ng.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/autoidx-ng.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/autoidx.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/autoidx.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/autoidx.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/autoidx.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/autotoc.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/autotoc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/autotoc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/autotoc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/axf.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/axf.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/axf.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/axf.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/biblio-iso690.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/biblio-iso690.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/biblio-iso690.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/biblio-iso690.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/biblio.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/biblio.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/biblio.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/biblio.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/block.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/block.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/block.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/block.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/callout.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/callout.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/callout.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/callout.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/component.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/component.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/component.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/component.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/division.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/division.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/division.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/division.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/ebnf.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/ebnf.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/ebnf.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/ebnf.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/fo-rtf.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/fo-rtf.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/fo-rtf.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/fo-rtf.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/fo.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/fo.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/fo.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/fo.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/footnote.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/footnote.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/footnote.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/footnote.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/fop.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/fop.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/fop.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/fop.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/fop1.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/fop1.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/fop1.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/fop1.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/formal.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/formal.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/formal.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/formal.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/glossary.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/glossary.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/glossary.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/glossary.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/graphics.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/graphics.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/graphics.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/graphics.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/highlight.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/highlight.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/highlight.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/highlight.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/htmltbl.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/htmltbl.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/htmltbl.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/htmltbl.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/index.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/index.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/index.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/index.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/info.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/info.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/info.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/info.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/inline.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/inline.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/inline.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/inline.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/keywords.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/keywords.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/keywords.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/keywords.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/lists.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/lists.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/lists.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/lists.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/math.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/math.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/math.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/math.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/pagesetup.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/pagesetup.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/pagesetup.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/pagesetup.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/param.xml b/apache-fop/src/test/resources/docbook-xsl/fo/param.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/param.xml
rename to apache-fop/src/test/resources/docbook-xsl/fo/param.xml
diff --git a/core-java/src/test/resources/docbook-xsl/fo/param.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/param.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/param.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/param.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/passivetex.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/passivetex.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/passivetex.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/passivetex.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/pdf2index b/apache-fop/src/test/resources/docbook-xsl/fo/pdf2index
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/pdf2index
rename to apache-fop/src/test/resources/docbook-xsl/fo/pdf2index
diff --git a/core-java/src/test/resources/docbook-xsl/fo/pi.xml b/apache-fop/src/test/resources/docbook-xsl/fo/pi.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/pi.xml
rename to apache-fop/src/test/resources/docbook-xsl/fo/pi.xml
diff --git a/core-java/src/test/resources/docbook-xsl/fo/pi.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/pi.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/pi.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/pi.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/profile-docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/profile-docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/profile-docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/profile-docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/ptc.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/ptc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/ptc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/ptc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/qandaset.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/qandaset.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/qandaset.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/qandaset.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/refentry.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/refentry.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/refentry.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/refentry.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/sections.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/sections.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/sections.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/sections.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/spaces.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/spaces.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/spaces.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/spaces.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/synop.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/synop.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/synop.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/synop.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/table.xml b/apache-fop/src/test/resources/docbook-xsl/fo/table.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/table.xml
rename to apache-fop/src/test/resources/docbook-xsl/fo/table.xml
diff --git a/core-java/src/test/resources/docbook-xsl/fo/table.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/table.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/table.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/table.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/task.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/task.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/task.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/task.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/titlepage.templates.xml b/apache-fop/src/test/resources/docbook-xsl/fo/titlepage.templates.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/titlepage.templates.xml
rename to apache-fop/src/test/resources/docbook-xsl/fo/titlepage.templates.xml
diff --git a/core-java/src/test/resources/docbook-xsl/fo/titlepage.templates.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/titlepage.templates.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/titlepage.templates.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/titlepage.templates.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/titlepage.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/titlepage.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/titlepage.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/titlepage.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/toc.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/toc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/toc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/toc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/verbatim.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/verbatim.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/verbatim.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/verbatim.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/xep.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/xep.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/xep.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/xep.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/fo/xref.xsl b/apache-fop/src/test/resources/docbook-xsl/fo/xref.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/fo/xref.xsl
rename to apache-fop/src/test/resources/docbook-xsl/fo/xref.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/README b/apache-fop/src/test/resources/docbook-xsl/highlighting/README
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/README
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/README
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/bourne-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/bourne-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/bourne-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/bourne-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/c-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/c-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/c-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/c-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/cmake-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/cmake-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/cmake-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/cmake-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/common.xsl b/apache-fop/src/test/resources/docbook-xsl/highlighting/common.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/common.xsl
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/common.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/cpp-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/cpp-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/cpp-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/cpp-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/csharp-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/csharp-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/csharp-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/csharp-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/css21-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/css21-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/css21-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/css21-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/delphi-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/delphi-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/delphi-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/delphi-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/ini-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/ini-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/ini-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/ini-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/java-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/java-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/java-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/java-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/javascript-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/javascript-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/javascript-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/javascript-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/lua-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/lua-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/lua-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/lua-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/m2-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/m2-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/m2-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/m2-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/myxml-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/myxml-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/myxml-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/myxml-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/perl-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/perl-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/perl-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/perl-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/php-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/php-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/php-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/php-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/python-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/python-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/python-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/python-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/ruby-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/ruby-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/ruby-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/ruby-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/sql1999-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/sql1999-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/sql1999-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/sql1999-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/sql2003-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/sql2003-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/sql2003-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/sql2003-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/sql92-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/sql92-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/sql92-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/sql92-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/tcl-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/tcl-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/tcl-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/tcl-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/upc-hl.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/upc-hl.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/upc-hl.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/upc-hl.xml
diff --git a/core-java/src/test/resources/docbook-xsl/highlighting/xslthl-config.xml b/apache-fop/src/test/resources/docbook-xsl/highlighting/xslthl-config.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/highlighting/xslthl-config.xml
rename to apache-fop/src/test/resources/docbook-xsl/highlighting/xslthl-config.xml
diff --git a/core-java/src/test/resources/docbook-xsl/html/admon.xsl b/apache-fop/src/test/resources/docbook-xsl/html/admon.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/admon.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/admon.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/annotations.xsl b/apache-fop/src/test/resources/docbook-xsl/html/annotations.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/annotations.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/annotations.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/autoidx-kimber.xsl b/apache-fop/src/test/resources/docbook-xsl/html/autoidx-kimber.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/autoidx-kimber.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/autoidx-kimber.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/autoidx-kosek.xsl b/apache-fop/src/test/resources/docbook-xsl/html/autoidx-kosek.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/autoidx-kosek.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/autoidx-kosek.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/autoidx-ng.xsl b/apache-fop/src/test/resources/docbook-xsl/html/autoidx-ng.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/autoidx-ng.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/autoidx-ng.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/autoidx.xsl b/apache-fop/src/test/resources/docbook-xsl/html/autoidx.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/autoidx.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/autoidx.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/autotoc.xsl b/apache-fop/src/test/resources/docbook-xsl/html/autotoc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/autotoc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/autotoc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/biblio-iso690.xsl b/apache-fop/src/test/resources/docbook-xsl/html/biblio-iso690.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/biblio-iso690.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/biblio-iso690.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/biblio.xsl b/apache-fop/src/test/resources/docbook-xsl/html/biblio.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/biblio.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/biblio.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/block.xsl b/apache-fop/src/test/resources/docbook-xsl/html/block.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/block.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/block.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/callout.xsl b/apache-fop/src/test/resources/docbook-xsl/html/callout.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/callout.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/callout.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/changebars.xsl b/apache-fop/src/test/resources/docbook-xsl/html/changebars.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/changebars.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/changebars.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/chunk-changebars.xsl b/apache-fop/src/test/resources/docbook-xsl/html/chunk-changebars.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/chunk-changebars.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/chunk-changebars.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/chunk-code.xsl b/apache-fop/src/test/resources/docbook-xsl/html/chunk-code.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/chunk-code.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/chunk-code.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/chunk-common.xsl b/apache-fop/src/test/resources/docbook-xsl/html/chunk-common.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/chunk-common.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/chunk-common.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/chunk.xsl b/apache-fop/src/test/resources/docbook-xsl/html/chunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/chunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/chunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/chunker.xsl b/apache-fop/src/test/resources/docbook-xsl/html/chunker.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/chunker.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/chunker.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/chunkfast.xsl b/apache-fop/src/test/resources/docbook-xsl/html/chunkfast.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/chunkfast.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/chunkfast.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/chunktoc.xsl b/apache-fop/src/test/resources/docbook-xsl/html/chunktoc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/chunktoc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/chunktoc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/component.xsl b/apache-fop/src/test/resources/docbook-xsl/html/component.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/component.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/component.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/division.xsl b/apache-fop/src/test/resources/docbook-xsl/html/division.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/division.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/division.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/docbook.css.xml b/apache-fop/src/test/resources/docbook-xsl/html/docbook.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/docbook.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/html/docbook.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/html/docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/html/docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/ebnf.xsl b/apache-fop/src/test/resources/docbook-xsl/html/ebnf.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/ebnf.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/ebnf.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/footnote.xsl b/apache-fop/src/test/resources/docbook-xsl/html/footnote.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/footnote.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/footnote.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/formal.xsl b/apache-fop/src/test/resources/docbook-xsl/html/formal.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/formal.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/formal.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/glossary.xsl b/apache-fop/src/test/resources/docbook-xsl/html/glossary.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/glossary.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/glossary.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/graphics.xsl b/apache-fop/src/test/resources/docbook-xsl/html/graphics.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/graphics.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/graphics.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/highlight.xsl b/apache-fop/src/test/resources/docbook-xsl/html/highlight.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/highlight.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/highlight.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/html-rtf.xsl b/apache-fop/src/test/resources/docbook-xsl/html/html-rtf.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/html-rtf.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/html-rtf.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/html.xsl b/apache-fop/src/test/resources/docbook-xsl/html/html.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/html.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/html.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/htmltbl.xsl b/apache-fop/src/test/resources/docbook-xsl/html/htmltbl.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/htmltbl.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/htmltbl.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/index.xsl b/apache-fop/src/test/resources/docbook-xsl/html/index.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/index.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/index.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/info.xsl b/apache-fop/src/test/resources/docbook-xsl/html/info.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/info.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/info.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/inline.xsl b/apache-fop/src/test/resources/docbook-xsl/html/inline.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/inline.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/inline.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/keywords.xsl b/apache-fop/src/test/resources/docbook-xsl/html/keywords.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/keywords.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/keywords.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/lists.xsl b/apache-fop/src/test/resources/docbook-xsl/html/lists.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/lists.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/lists.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/maketoc.xsl b/apache-fop/src/test/resources/docbook-xsl/html/maketoc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/maketoc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/maketoc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/manifest.xsl b/apache-fop/src/test/resources/docbook-xsl/html/manifest.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/manifest.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/manifest.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/math.xsl b/apache-fop/src/test/resources/docbook-xsl/html/math.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/math.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/math.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/oldchunker.xsl b/apache-fop/src/test/resources/docbook-xsl/html/oldchunker.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/oldchunker.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/oldchunker.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/onechunk.xsl b/apache-fop/src/test/resources/docbook-xsl/html/onechunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/onechunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/onechunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/param.xml b/apache-fop/src/test/resources/docbook-xsl/html/param.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/param.xml
rename to apache-fop/src/test/resources/docbook-xsl/html/param.xml
diff --git a/core-java/src/test/resources/docbook-xsl/html/param.xsl b/apache-fop/src/test/resources/docbook-xsl/html/param.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/param.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/param.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/pi.xml b/apache-fop/src/test/resources/docbook-xsl/html/pi.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/pi.xml
rename to apache-fop/src/test/resources/docbook-xsl/html/pi.xml
diff --git a/core-java/src/test/resources/docbook-xsl/html/pi.xsl b/apache-fop/src/test/resources/docbook-xsl/html/pi.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/pi.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/pi.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/profile-chunk-code.xsl b/apache-fop/src/test/resources/docbook-xsl/html/profile-chunk-code.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/profile-chunk-code.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/profile-chunk-code.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/profile-chunk.xsl b/apache-fop/src/test/resources/docbook-xsl/html/profile-chunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/profile-chunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/profile-chunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/profile-docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/html/profile-docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/profile-docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/profile-docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/profile-onechunk.xsl b/apache-fop/src/test/resources/docbook-xsl/html/profile-onechunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/profile-onechunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/profile-onechunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/qandaset.xsl b/apache-fop/src/test/resources/docbook-xsl/html/qandaset.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/qandaset.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/qandaset.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/refentry.xsl b/apache-fop/src/test/resources/docbook-xsl/html/refentry.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/refentry.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/refentry.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/sections.xsl b/apache-fop/src/test/resources/docbook-xsl/html/sections.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/sections.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/sections.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/synop.xsl b/apache-fop/src/test/resources/docbook-xsl/html/synop.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/synop.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/synop.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/table.xsl b/apache-fop/src/test/resources/docbook-xsl/html/table.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/table.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/table.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/task.xsl b/apache-fop/src/test/resources/docbook-xsl/html/task.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/task.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/task.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/titlepage.templates.xml b/apache-fop/src/test/resources/docbook-xsl/html/titlepage.templates.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/titlepage.templates.xml
rename to apache-fop/src/test/resources/docbook-xsl/html/titlepage.templates.xml
diff --git a/core-java/src/test/resources/docbook-xsl/html/titlepage.templates.xsl b/apache-fop/src/test/resources/docbook-xsl/html/titlepage.templates.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/titlepage.templates.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/titlepage.templates.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/titlepage.xsl b/apache-fop/src/test/resources/docbook-xsl/html/titlepage.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/titlepage.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/titlepage.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/toc.xsl b/apache-fop/src/test/resources/docbook-xsl/html/toc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/toc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/toc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/verbatim.xsl b/apache-fop/src/test/resources/docbook-xsl/html/verbatim.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/verbatim.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/verbatim.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/html/xref.xsl b/apache-fop/src/test/resources/docbook-xsl/html/xref.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/html/xref.xsl
rename to apache-fop/src/test/resources/docbook-xsl/html/xref.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/htmlhelp/htmlhelp-common.xsl b/apache-fop/src/test/resources/docbook-xsl/htmlhelp/htmlhelp-common.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/htmlhelp/htmlhelp-common.xsl
rename to apache-fop/src/test/resources/docbook-xsl/htmlhelp/htmlhelp-common.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/htmlhelp/htmlhelp.xsl b/apache-fop/src/test/resources/docbook-xsl/htmlhelp/htmlhelp.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/htmlhelp/htmlhelp.xsl
rename to apache-fop/src/test/resources/docbook-xsl/htmlhelp/htmlhelp.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/htmlhelp/profile-htmlhelp-common.xsl b/apache-fop/src/test/resources/docbook-xsl/htmlhelp/profile-htmlhelp-common.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/htmlhelp/profile-htmlhelp-common.xsl
rename to apache-fop/src/test/resources/docbook-xsl/htmlhelp/profile-htmlhelp-common.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/htmlhelp/profile-htmlhelp.xsl b/apache-fop/src/test/resources/docbook-xsl/htmlhelp/profile-htmlhelp.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/htmlhelp/profile-htmlhelp.xsl
rename to apache-fop/src/test/resources/docbook-xsl/htmlhelp/profile-htmlhelp.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/images/annot-close.png b/apache-fop/src/test/resources/docbook-xsl/images/annot-close.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/annot-close.png
rename to apache-fop/src/test/resources/docbook-xsl/images/annot-close.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/annot-open.png b/apache-fop/src/test/resources/docbook-xsl/images/annot-open.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/annot-open.png
rename to apache-fop/src/test/resources/docbook-xsl/images/annot-open.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/blank.png b/apache-fop/src/test/resources/docbook-xsl/images/blank.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/blank.png
rename to apache-fop/src/test/resources/docbook-xsl/images/blank.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/1.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/1.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/1.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/1.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/1.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/1.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/1.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/1.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/1.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/1.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/1.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/1.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/10.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/10.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/10.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/10.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/10.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/10.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/10.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/10.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/10.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/10.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/10.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/10.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/11.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/11.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/11.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/11.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/11.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/11.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/11.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/11.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/11.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/11.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/11.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/11.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/12.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/12.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/12.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/12.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/12.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/12.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/12.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/12.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/12.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/12.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/12.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/12.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/13.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/13.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/13.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/13.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/13.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/13.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/13.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/13.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/13.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/13.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/13.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/13.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/14.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/14.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/14.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/14.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/14.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/14.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/14.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/14.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/14.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/14.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/14.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/14.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/15.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/15.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/15.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/15.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/15.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/15.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/15.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/15.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/15.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/15.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/15.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/15.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/16.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/16.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/16.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/16.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/17.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/17.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/17.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/17.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/18.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/18.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/18.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/18.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/19.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/19.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/19.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/19.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/2.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/2.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/2.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/2.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/2.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/2.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/2.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/2.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/2.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/2.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/2.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/2.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/20.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/20.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/20.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/20.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/21.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/21.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/21.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/21.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/22.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/22.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/22.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/22.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/23.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/23.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/23.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/23.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/24.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/24.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/24.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/24.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/25.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/25.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/25.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/25.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/26.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/26.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/26.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/26.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/27.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/27.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/27.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/27.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/28.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/28.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/28.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/28.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/29.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/29.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/29.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/29.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/3.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/3.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/3.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/3.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/3.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/3.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/3.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/3.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/3.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/3.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/3.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/3.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/30.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/30.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/30.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/30.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/4.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/4.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/4.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/4.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/4.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/4.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/4.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/4.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/4.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/4.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/4.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/4.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/5.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/5.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/5.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/5.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/5.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/5.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/5.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/5.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/5.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/5.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/5.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/5.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/6.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/6.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/6.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/6.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/6.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/6.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/6.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/6.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/6.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/6.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/6.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/6.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/7.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/7.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/7.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/7.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/7.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/7.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/7.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/7.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/7.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/7.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/7.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/7.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/8.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/8.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/8.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/8.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/8.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/8.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/8.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/8.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/8.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/8.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/8.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/8.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/9.gif b/apache-fop/src/test/resources/docbook-xsl/images/callouts/9.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/9.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/9.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/9.png b/apache-fop/src/test/resources/docbook-xsl/images/callouts/9.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/9.png
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/9.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/callouts/9.svg b/apache-fop/src/test/resources/docbook-xsl/images/callouts/9.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/callouts/9.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/callouts/9.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/caution.gif b/apache-fop/src/test/resources/docbook-xsl/images/caution.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/caution.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/caution.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/caution.png b/apache-fop/src/test/resources/docbook-xsl/images/caution.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/caution.png
rename to apache-fop/src/test/resources/docbook-xsl/images/caution.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/caution.svg b/apache-fop/src/test/resources/docbook-xsl/images/caution.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/caution.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/caution.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/caution.tif b/apache-fop/src/test/resources/docbook-xsl/images/caution.tif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/caution.tif
rename to apache-fop/src/test/resources/docbook-xsl/images/caution.tif
diff --git a/core-java/src/test/resources/docbook-xsl/images/colorsvg/caution.svg b/apache-fop/src/test/resources/docbook-xsl/images/colorsvg/caution.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/colorsvg/caution.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/colorsvg/caution.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/colorsvg/home.svg b/apache-fop/src/test/resources/docbook-xsl/images/colorsvg/home.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/colorsvg/home.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/colorsvg/home.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/colorsvg/important.svg b/apache-fop/src/test/resources/docbook-xsl/images/colorsvg/important.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/colorsvg/important.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/colorsvg/important.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/colorsvg/next.svg b/apache-fop/src/test/resources/docbook-xsl/images/colorsvg/next.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/colorsvg/next.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/colorsvg/next.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/colorsvg/note.svg b/apache-fop/src/test/resources/docbook-xsl/images/colorsvg/note.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/colorsvg/note.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/colorsvg/note.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/colorsvg/prev.svg b/apache-fop/src/test/resources/docbook-xsl/images/colorsvg/prev.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/colorsvg/prev.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/colorsvg/prev.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/colorsvg/tip.svg b/apache-fop/src/test/resources/docbook-xsl/images/colorsvg/tip.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/colorsvg/tip.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/colorsvg/tip.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/colorsvg/up.svg b/apache-fop/src/test/resources/docbook-xsl/images/colorsvg/up.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/colorsvg/up.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/colorsvg/up.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/colorsvg/warning.svg b/apache-fop/src/test/resources/docbook-xsl/images/colorsvg/warning.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/colorsvg/warning.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/colorsvg/warning.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/draft.png b/apache-fop/src/test/resources/docbook-xsl/images/draft.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/draft.png
rename to apache-fop/src/test/resources/docbook-xsl/images/draft.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/draft.svg b/apache-fop/src/test/resources/docbook-xsl/images/draft.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/draft.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/draft.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/home.gif b/apache-fop/src/test/resources/docbook-xsl/images/home.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/home.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/home.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/home.png b/apache-fop/src/test/resources/docbook-xsl/images/home.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/home.png
rename to apache-fop/src/test/resources/docbook-xsl/images/home.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/home.svg b/apache-fop/src/test/resources/docbook-xsl/images/home.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/home.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/home.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/important.gif b/apache-fop/src/test/resources/docbook-xsl/images/important.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/important.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/important.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/important.png b/apache-fop/src/test/resources/docbook-xsl/images/important.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/important.png
rename to apache-fop/src/test/resources/docbook-xsl/images/important.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/important.svg b/apache-fop/src/test/resources/docbook-xsl/images/important.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/important.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/important.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/important.tif b/apache-fop/src/test/resources/docbook-xsl/images/important.tif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/important.tif
rename to apache-fop/src/test/resources/docbook-xsl/images/important.tif
diff --git a/core-java/src/test/resources/docbook-xsl/images/next.gif b/apache-fop/src/test/resources/docbook-xsl/images/next.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/next.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/next.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/next.png b/apache-fop/src/test/resources/docbook-xsl/images/next.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/next.png
rename to apache-fop/src/test/resources/docbook-xsl/images/next.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/next.svg b/apache-fop/src/test/resources/docbook-xsl/images/next.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/next.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/next.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/note.gif b/apache-fop/src/test/resources/docbook-xsl/images/note.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/note.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/note.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/note.png b/apache-fop/src/test/resources/docbook-xsl/images/note.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/note.png
rename to apache-fop/src/test/resources/docbook-xsl/images/note.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/note.svg b/apache-fop/src/test/resources/docbook-xsl/images/note.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/note.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/note.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/note.tif b/apache-fop/src/test/resources/docbook-xsl/images/note.tif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/note.tif
rename to apache-fop/src/test/resources/docbook-xsl/images/note.tif
diff --git a/core-java/src/test/resources/docbook-xsl/images/prev.gif b/apache-fop/src/test/resources/docbook-xsl/images/prev.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/prev.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/prev.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/prev.png b/apache-fop/src/test/resources/docbook-xsl/images/prev.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/prev.png
rename to apache-fop/src/test/resources/docbook-xsl/images/prev.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/prev.svg b/apache-fop/src/test/resources/docbook-xsl/images/prev.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/prev.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/prev.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/tip.gif b/apache-fop/src/test/resources/docbook-xsl/images/tip.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/tip.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/tip.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/tip.png b/apache-fop/src/test/resources/docbook-xsl/images/tip.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/tip.png
rename to apache-fop/src/test/resources/docbook-xsl/images/tip.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/tip.svg b/apache-fop/src/test/resources/docbook-xsl/images/tip.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/tip.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/tip.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/tip.tif b/apache-fop/src/test/resources/docbook-xsl/images/tip.tif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/tip.tif
rename to apache-fop/src/test/resources/docbook-xsl/images/tip.tif
diff --git a/core-java/src/test/resources/docbook-xsl/images/toc-blank.png b/apache-fop/src/test/resources/docbook-xsl/images/toc-blank.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/toc-blank.png
rename to apache-fop/src/test/resources/docbook-xsl/images/toc-blank.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/toc-minus.png b/apache-fop/src/test/resources/docbook-xsl/images/toc-minus.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/toc-minus.png
rename to apache-fop/src/test/resources/docbook-xsl/images/toc-minus.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/toc-plus.png b/apache-fop/src/test/resources/docbook-xsl/images/toc-plus.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/toc-plus.png
rename to apache-fop/src/test/resources/docbook-xsl/images/toc-plus.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/up.gif b/apache-fop/src/test/resources/docbook-xsl/images/up.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/up.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/up.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/up.png b/apache-fop/src/test/resources/docbook-xsl/images/up.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/up.png
rename to apache-fop/src/test/resources/docbook-xsl/images/up.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/up.svg b/apache-fop/src/test/resources/docbook-xsl/images/up.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/up.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/up.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/warning.gif b/apache-fop/src/test/resources/docbook-xsl/images/warning.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/warning.gif
rename to apache-fop/src/test/resources/docbook-xsl/images/warning.gif
diff --git a/core-java/src/test/resources/docbook-xsl/images/warning.png b/apache-fop/src/test/resources/docbook-xsl/images/warning.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/warning.png
rename to apache-fop/src/test/resources/docbook-xsl/images/warning.png
diff --git a/core-java/src/test/resources/docbook-xsl/images/warning.svg b/apache-fop/src/test/resources/docbook-xsl/images/warning.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/warning.svg
rename to apache-fop/src/test/resources/docbook-xsl/images/warning.svg
diff --git a/core-java/src/test/resources/docbook-xsl/images/warning.tif b/apache-fop/src/test/resources/docbook-xsl/images/warning.tif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/images/warning.tif
rename to apache-fop/src/test/resources/docbook-xsl/images/warning.tif
diff --git a/core-java/src/test/resources/docbook-xsl/install.sh b/apache-fop/src/test/resources/docbook-xsl/install.sh
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/install.sh
rename to apache-fop/src/test/resources/docbook-xsl/install.sh
diff --git a/core-java/src/test/resources/docbook-xsl/javahelp/javahelp.xsl b/apache-fop/src/test/resources/docbook-xsl/javahelp/javahelp.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/javahelp/javahelp.xsl
rename to apache-fop/src/test/resources/docbook-xsl/javahelp/javahelp.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/javahelp/profile-javahelp.xsl b/apache-fop/src/test/resources/docbook-xsl/javahelp/profile-javahelp.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/javahelp/profile-javahelp.xsl
rename to apache-fop/src/test/resources/docbook-xsl/javahelp/profile-javahelp.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/lib/lib.xsl b/apache-fop/src/test/resources/docbook-xsl/lib/lib.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/lib/lib.xsl
rename to apache-fop/src/test/resources/docbook-xsl/lib/lib.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/log b/apache-fop/src/test/resources/docbook-xsl/log
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/log
rename to apache-fop/src/test/resources/docbook-xsl/log
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/ChangeLog.20020917 b/apache-fop/src/test/resources/docbook-xsl/manpages/ChangeLog.20020917
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/ChangeLog.20020917
rename to apache-fop/src/test/resources/docbook-xsl/manpages/ChangeLog.20020917
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/block.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/block.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/block.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/block.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/charmap.groff.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/charmap.groff.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/charmap.groff.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/charmap.groff.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/endnotes.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/endnotes.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/endnotes.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/endnotes.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/html-synop.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/html-synop.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/html-synop.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/html-synop.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/info.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/info.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/info.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/info.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/inline.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/inline.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/inline.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/inline.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/lists.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/lists.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/lists.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/lists.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/other.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/other.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/other.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/other.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/param.xml b/apache-fop/src/test/resources/docbook-xsl/manpages/param.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/param.xml
rename to apache-fop/src/test/resources/docbook-xsl/manpages/param.xml
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/param.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/param.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/param.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/param.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/pi.xml b/apache-fop/src/test/resources/docbook-xsl/manpages/pi.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/pi.xml
rename to apache-fop/src/test/resources/docbook-xsl/manpages/pi.xml
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/pi.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/pi.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/pi.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/pi.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/profile-docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/profile-docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/profile-docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/profile-docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/refentry.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/refentry.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/refentry.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/refentry.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/synop.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/synop.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/synop.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/synop.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/table.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/table.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/table.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/table.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/manpages/utility.xsl b/apache-fop/src/test/resources/docbook-xsl/manpages/utility.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/manpages/utility.xsl
rename to apache-fop/src/test/resources/docbook-xsl/manpages/utility.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/params/abstract.notitle.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/abstract.notitle.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/abstract.notitle.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/abstract.notitle.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/abstract.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/abstract.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/abstract.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/abstract.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/abstract.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/abstract.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/abstract.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/abstract.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/activate.external.olinks.xml b/apache-fop/src/test/resources/docbook-xsl/params/activate.external.olinks.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/activate.external.olinks.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/activate.external.olinks.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/active.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/active.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/active.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/active.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/ade.extensions.xml b/apache-fop/src/test/resources/docbook-xsl/params/ade.extensions.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/ade.extensions.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/ade.extensions.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/admon.graphics.extension.xml b/apache-fop/src/test/resources/docbook-xsl/params/admon.graphics.extension.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/admon.graphics.extension.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/admon.graphics.extension.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/admon.graphics.path.xml b/apache-fop/src/test/resources/docbook-xsl/params/admon.graphics.path.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/admon.graphics.path.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/admon.graphics.path.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/admon.graphics.xml b/apache-fop/src/test/resources/docbook-xsl/params/admon.graphics.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/admon.graphics.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/admon.graphics.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/admon.style.xml b/apache-fop/src/test/resources/docbook-xsl/params/admon.style.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/admon.style.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/admon.style.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/admon.textlabel.xml b/apache-fop/src/test/resources/docbook-xsl/params/admon.textlabel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/admon.textlabel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/admon.textlabel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/admonition.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/admonition.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/admonition.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/admonition.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/admonition.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/admonition.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/admonition.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/admonition.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/alignment.xml b/apache-fop/src/test/resources/docbook-xsl/params/alignment.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/alignment.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/alignment.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/annotate.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/annotate.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/annotate.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/annotate.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/annotation.css.xml b/apache-fop/src/test/resources/docbook-xsl/params/annotation.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/annotation.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/annotation.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/annotation.graphic.close.xml b/apache-fop/src/test/resources/docbook-xsl/params/annotation.graphic.close.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/annotation.graphic.close.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/annotation.graphic.close.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/annotation.graphic.open.xml b/apache-fop/src/test/resources/docbook-xsl/params/annotation.graphic.open.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/annotation.graphic.open.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/annotation.graphic.open.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/annotation.js.xml b/apache-fop/src/test/resources/docbook-xsl/params/annotation.js.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/annotation.js.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/annotation.js.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/annotation.support.xml b/apache-fop/src/test/resources/docbook-xsl/params/annotation.support.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/annotation.support.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/annotation.support.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/appendix.autolabel.xml b/apache-fop/src/test/resources/docbook-xsl/params/appendix.autolabel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/appendix.autolabel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/appendix.autolabel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/arbortext.extensions.xml b/apache-fop/src/test/resources/docbook-xsl/params/arbortext.extensions.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/arbortext.extensions.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/arbortext.extensions.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/article.appendix.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/article.appendix.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/article.appendix.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/article.appendix.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/author.othername.in.middle.xml b/apache-fop/src/test/resources/docbook-xsl/params/author.othername.in.middle.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/author.othername.in.middle.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/author.othername.in.middle.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/autolayout-file.xml b/apache-fop/src/test/resources/docbook-xsl/params/autolayout-file.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/autolayout-file.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/autolayout-file.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/autotoc.label.in.hyperlink.xml b/apache-fop/src/test/resources/docbook-xsl/params/autotoc.label.in.hyperlink.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/autotoc.label.in.hyperlink.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/autotoc.label.in.hyperlink.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/autotoc.label.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/autotoc.label.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/autotoc.label.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/autotoc.label.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/axf.extensions.xml b/apache-fop/src/test/resources/docbook-xsl/params/axf.extensions.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/axf.extensions.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/axf.extensions.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/banner.before.navigation.xml b/apache-fop/src/test/resources/docbook-xsl/params/banner.before.navigation.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/banner.before.navigation.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/banner.before.navigation.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/base.dir.xml b/apache-fop/src/test/resources/docbook-xsl/params/base.dir.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/base.dir.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/base.dir.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/biblioentry.item.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/biblioentry.item.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/biblioentry.item.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/biblioentry.item.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/biblioentry.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/biblioentry.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/biblioentry.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/biblioentry.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/bibliography.collection.xml b/apache-fop/src/test/resources/docbook-xsl/params/bibliography.collection.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/bibliography.collection.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/bibliography.collection.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/bibliography.numbered.xml b/apache-fop/src/test/resources/docbook-xsl/params/bibliography.numbered.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/bibliography.numbered.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/bibliography.numbered.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/bibliography.style.xml b/apache-fop/src/test/resources/docbook-xsl/params/bibliography.style.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/bibliography.style.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/bibliography.style.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/blockquote.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/blockquote.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/blockquote.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/blockquote.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/blurb.on.titlepage.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/blurb.on.titlepage.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/blurb.on.titlepage.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/blurb.on.titlepage.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/body.attributes.xml b/apache-fop/src/test/resources/docbook-xsl/params/body.attributes.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/body.attributes.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/body.attributes.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/body.bg.color.xml b/apache-fop/src/test/resources/docbook-xsl/params/body.bg.color.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/body.bg.color.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/body.bg.color.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/body.end.indent.xml b/apache-fop/src/test/resources/docbook-xsl/params/body.end.indent.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/body.end.indent.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/body.end.indent.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/body.font.family.xml b/apache-fop/src/test/resources/docbook-xsl/params/body.font.family.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/body.font.family.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/body.font.family.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/body.font.master.xml b/apache-fop/src/test/resources/docbook-xsl/params/body.font.master.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/body.font.master.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/body.font.master.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/body.font.size.xml b/apache-fop/src/test/resources/docbook-xsl/params/body.font.size.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/body.font.size.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/body.font.size.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/body.margin.bottom.xml b/apache-fop/src/test/resources/docbook-xsl/params/body.margin.bottom.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/body.margin.bottom.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/body.margin.bottom.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/body.margin.inner.xml b/apache-fop/src/test/resources/docbook-xsl/params/body.margin.inner.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/body.margin.inner.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/body.margin.inner.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/body.margin.outer.xml b/apache-fop/src/test/resources/docbook-xsl/params/body.margin.outer.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/body.margin.outer.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/body.margin.outer.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/body.margin.top.xml b/apache-fop/src/test/resources/docbook-xsl/params/body.margin.top.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/body.margin.top.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/body.margin.top.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/body.start.indent.xml b/apache-fop/src/test/resources/docbook-xsl/params/body.start.indent.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/body.start.indent.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/body.start.indent.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/bookmarks.collapse.xml b/apache-fop/src/test/resources/docbook-xsl/params/bookmarks.collapse.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/bookmarks.collapse.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/bookmarks.collapse.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/bridgehead.in.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/bridgehead.in.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/bridgehead.in.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/bridgehead.in.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/bullet.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/bullet.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/bullet.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/bullet.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/callout.defaultcolumn.xml b/apache-fop/src/test/resources/docbook-xsl/params/callout.defaultcolumn.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/callout.defaultcolumn.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/callout.defaultcolumn.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/callout.graphics.extension.xml b/apache-fop/src/test/resources/docbook-xsl/params/callout.graphics.extension.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/callout.graphics.extension.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/callout.graphics.extension.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/callout.graphics.number.limit.xml b/apache-fop/src/test/resources/docbook-xsl/params/callout.graphics.number.limit.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/callout.graphics.number.limit.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/callout.graphics.number.limit.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/callout.graphics.path.xml b/apache-fop/src/test/resources/docbook-xsl/params/callout.graphics.path.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/callout.graphics.path.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/callout.graphics.path.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/callout.graphics.xml b/apache-fop/src/test/resources/docbook-xsl/params/callout.graphics.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/callout.graphics.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/callout.graphics.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/callout.icon.size.xml b/apache-fop/src/test/resources/docbook-xsl/params/callout.icon.size.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/callout.icon.size.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/callout.icon.size.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/callout.list.table.xml b/apache-fop/src/test/resources/docbook-xsl/params/callout.list.table.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/callout.list.table.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/callout.list.table.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/callout.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/callout.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/callout.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/callout.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/callout.unicode.font.xml b/apache-fop/src/test/resources/docbook-xsl/params/callout.unicode.font.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/callout.unicode.font.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/callout.unicode.font.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/callout.unicode.number.limit.xml b/apache-fop/src/test/resources/docbook-xsl/params/callout.unicode.number.limit.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/callout.unicode.number.limit.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/callout.unicode.number.limit.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/callout.unicode.start.character.xml b/apache-fop/src/test/resources/docbook-xsl/params/callout.unicode.start.character.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/callout.unicode.start.character.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/callout.unicode.start.character.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/callout.unicode.xml b/apache-fop/src/test/resources/docbook-xsl/params/callout.unicode.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/callout.unicode.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/callout.unicode.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/calloutlist.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/calloutlist.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/calloutlist.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/calloutlist.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/callouts.extension.xml b/apache-fop/src/test/resources/docbook-xsl/params/callouts.extension.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/callouts.extension.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/callouts.extension.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chapter.autolabel.xml b/apache-fop/src/test/resources/docbook-xsl/params/chapter.autolabel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chapter.autolabel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chapter.autolabel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunk.append.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunk.append.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunk.append.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunk.append.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunk.first.sections.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunk.first.sections.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunk.first.sections.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunk.first.sections.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunk.quietly.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunk.quietly.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunk.quietly.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunk.quietly.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunk.section.depth.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunk.section.depth.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunk.section.depth.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunk.section.depth.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunk.sections.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunk.sections.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunk.sections.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunk.sections.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunk.separate.lots.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunk.separate.lots.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunk.separate.lots.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunk.separate.lots.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunk.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunk.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunk.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunk.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunk.tocs.and.lots.has.title.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunk.tocs.and.lots.has.title.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunk.tocs.and.lots.has.title.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunk.tocs.and.lots.has.title.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunk.tocs.and.lots.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunk.tocs.and.lots.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunk.tocs.and.lots.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunk.tocs.and.lots.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunked.filename.prefix.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunked.filename.prefix.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunked.filename.prefix.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunked.filename.prefix.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunker.output.cdata-section-elements.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunker.output.cdata-section-elements.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunker.output.cdata-section-elements.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunker.output.cdata-section-elements.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunker.output.doctype-public.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunker.output.doctype-public.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunker.output.doctype-public.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunker.output.doctype-public.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunker.output.doctype-system.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunker.output.doctype-system.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunker.output.doctype-system.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunker.output.doctype-system.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunker.output.encoding.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunker.output.encoding.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunker.output.encoding.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunker.output.encoding.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunker.output.indent.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunker.output.indent.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunker.output.indent.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunker.output.indent.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunker.output.media-type.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunker.output.media-type.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunker.output.media-type.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunker.output.media-type.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunker.output.method.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunker.output.method.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunker.output.method.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunker.output.method.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunker.output.omit-xml-declaration.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunker.output.omit-xml-declaration.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunker.output.omit-xml-declaration.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunker.output.omit-xml-declaration.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/chunker.output.standalone.xml b/apache-fop/src/test/resources/docbook-xsl/params/chunker.output.standalone.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/chunker.output.standalone.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/chunker.output.standalone.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/citerefentry.link.xml b/apache-fop/src/test/resources/docbook-xsl/params/citerefentry.link.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/citerefentry.link.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/citerefentry.link.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/collect.xref.targets.xml b/apache-fop/src/test/resources/docbook-xsl/params/collect.xref.targets.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/collect.xref.targets.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/collect.xref.targets.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/column.count.back.xml b/apache-fop/src/test/resources/docbook-xsl/params/column.count.back.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/column.count.back.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/column.count.back.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/column.count.body.xml b/apache-fop/src/test/resources/docbook-xsl/params/column.count.body.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/column.count.body.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/column.count.body.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/column.count.front.xml b/apache-fop/src/test/resources/docbook-xsl/params/column.count.front.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/column.count.front.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/column.count.front.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/column.count.index.xml b/apache-fop/src/test/resources/docbook-xsl/params/column.count.index.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/column.count.index.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/column.count.index.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/column.count.lot.xml b/apache-fop/src/test/resources/docbook-xsl/params/column.count.lot.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/column.count.lot.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/column.count.lot.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/column.count.titlepage.xml b/apache-fop/src/test/resources/docbook-xsl/params/column.count.titlepage.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/column.count.titlepage.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/column.count.titlepage.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/column.gap.back.xml b/apache-fop/src/test/resources/docbook-xsl/params/column.gap.back.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/column.gap.back.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/column.gap.back.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/column.gap.body.xml b/apache-fop/src/test/resources/docbook-xsl/params/column.gap.body.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/column.gap.body.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/column.gap.body.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/column.gap.front.xml b/apache-fop/src/test/resources/docbook-xsl/params/column.gap.front.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/column.gap.front.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/column.gap.front.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/column.gap.index.xml b/apache-fop/src/test/resources/docbook-xsl/params/column.gap.index.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/column.gap.index.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/column.gap.index.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/column.gap.lot.xml b/apache-fop/src/test/resources/docbook-xsl/params/column.gap.lot.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/column.gap.lot.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/column.gap.lot.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/column.gap.titlepage.xml b/apache-fop/src/test/resources/docbook-xsl/params/column.gap.titlepage.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/column.gap.titlepage.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/column.gap.titlepage.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/compact.list.item.spacing.xml b/apache-fop/src/test/resources/docbook-xsl/params/compact.list.item.spacing.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/compact.list.item.spacing.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/compact.list.item.spacing.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/component.label.includes.part.label.xml b/apache-fop/src/test/resources/docbook-xsl/params/component.label.includes.part.label.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/component.label.includes.part.label.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/component.label.includes.part.label.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/component.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/component.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/component.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/component.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/component.titlepage.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/component.titlepage.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/component.titlepage.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/component.titlepage.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/contrib.inline.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/contrib.inline.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/contrib.inline.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/contrib.inline.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/crop.mark.bleed.xml b/apache-fop/src/test/resources/docbook-xsl/params/crop.mark.bleed.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/crop.mark.bleed.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/crop.mark.bleed.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/crop.mark.offset.xml b/apache-fop/src/test/resources/docbook-xsl/params/crop.mark.offset.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/crop.mark.offset.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/crop.mark.offset.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/crop.mark.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/crop.mark.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/crop.mark.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/crop.mark.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/crop.marks.xml b/apache-fop/src/test/resources/docbook-xsl/params/crop.marks.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/crop.marks.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/crop.marks.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/css.decoration.xml b/apache-fop/src/test/resources/docbook-xsl/params/css.decoration.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/css.decoration.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/css.decoration.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/css.stylesheet.dir.xml b/apache-fop/src/test/resources/docbook-xsl/params/css.stylesheet.dir.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/css.stylesheet.dir.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/css.stylesheet.dir.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/css.stylesheet.xml b/apache-fop/src/test/resources/docbook-xsl/params/css.stylesheet.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/css.stylesheet.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/css.stylesheet.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/current.docid.xml b/apache-fop/src/test/resources/docbook-xsl/params/current.docid.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/current.docid.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/current.docid.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/currentpage.marker.xml b/apache-fop/src/test/resources/docbook-xsl/params/currentpage.marker.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/currentpage.marker.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/currentpage.marker.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/custom.css.source.xml b/apache-fop/src/test/resources/docbook-xsl/params/custom.css.source.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/custom.css.source.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/custom.css.source.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/default.float.class.xml b/apache-fop/src/test/resources/docbook-xsl/params/default.float.class.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/default.float.class.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/default.float.class.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/default.image.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/default.image.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/default.image.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/default.image.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/default.table.frame.xml b/apache-fop/src/test/resources/docbook-xsl/params/default.table.frame.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/default.table.frame.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/default.table.frame.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/default.table.rules.xml b/apache-fop/src/test/resources/docbook-xsl/params/default.table.rules.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/default.table.rules.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/default.table.rules.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/default.table.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/default.table.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/default.table.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/default.table.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/default.units.xml b/apache-fop/src/test/resources/docbook-xsl/params/default.units.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/default.units.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/default.units.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/dingbat.font.family.xml b/apache-fop/src/test/resources/docbook-xsl/params/dingbat.font.family.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/dingbat.font.family.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/dingbat.font.family.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/disable.collapsible.xml b/apache-fop/src/test/resources/docbook-xsl/params/disable.collapsible.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/disable.collapsible.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/disable.collapsible.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/disable.incremental.xml b/apache-fop/src/test/resources/docbook-xsl/params/disable.incremental.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/disable.incremental.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/disable.incremental.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/docbook.css.link.xml b/apache-fop/src/test/resources/docbook-xsl/params/docbook.css.link.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/docbook.css.link.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/docbook.css.link.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/docbook.css.source.xml b/apache-fop/src/test/resources/docbook-xsl/params/docbook.css.source.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/docbook.css.source.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/docbook.css.source.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/double.sided.xml b/apache-fop/src/test/resources/docbook-xsl/params/double.sided.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/double.sided.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/double.sided.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/draft.mode.xml b/apache-fop/src/test/resources/docbook-xsl/params/draft.mode.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/draft.mode.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/draft.mode.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/draft.watermark.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/draft.watermark.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/draft.watermark.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/draft.watermark.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/dry-run.xml b/apache-fop/src/test/resources/docbook-xsl/params/dry-run.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/dry-run.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/dry-run.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/dynamic.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/dynamic.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/dynamic.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/dynamic.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/ebnf.assignment.xml b/apache-fop/src/test/resources/docbook-xsl/params/ebnf.assignment.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/ebnf.assignment.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/ebnf.assignment.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/ebnf.statement.terminator.xml b/apache-fop/src/test/resources/docbook-xsl/params/ebnf.statement.terminator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/ebnf.statement.terminator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/ebnf.statement.terminator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/ebnf.table.bgcolor.xml b/apache-fop/src/test/resources/docbook-xsl/params/ebnf.table.bgcolor.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/ebnf.table.bgcolor.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/ebnf.table.bgcolor.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/ebnf.table.border.xml b/apache-fop/src/test/resources/docbook-xsl/params/ebnf.table.border.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/ebnf.table.border.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/ebnf.table.border.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/eclipse.autolabel.xml b/apache-fop/src/test/resources/docbook-xsl/params/eclipse.autolabel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/eclipse.autolabel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/eclipse.autolabel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/eclipse.plugin.id.xml b/apache-fop/src/test/resources/docbook-xsl/params/eclipse.plugin.id.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/eclipse.plugin.id.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/eclipse.plugin.id.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/eclipse.plugin.name.xml b/apache-fop/src/test/resources/docbook-xsl/params/eclipse.plugin.name.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/eclipse.plugin.name.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/eclipse.plugin.name.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/eclipse.plugin.provider.xml b/apache-fop/src/test/resources/docbook-xsl/params/eclipse.plugin.provider.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/eclipse.plugin.provider.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/eclipse.plugin.provider.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/editedby.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/editedby.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/editedby.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/editedby.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/email.delimiters.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/email.delimiters.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/email.delimiters.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/email.delimiters.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/email.mailto.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/email.mailto.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/email.mailto.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/email.mailto.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/emphasis.propagates.style.xml b/apache-fop/src/test/resources/docbook-xsl/params/emphasis.propagates.style.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/emphasis.propagates.style.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/emphasis.propagates.style.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/entry.propagates.style.xml b/apache-fop/src/test/resources/docbook-xsl/params/entry.propagates.style.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/entry.propagates.style.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/entry.propagates.style.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/epub.autolabel.xml b/apache-fop/src/test/resources/docbook-xsl/params/epub.autolabel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/epub.autolabel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/epub.autolabel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/equation.number.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/equation.number.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/equation.number.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/equation.number.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/equation.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/equation.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/equation.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/equation.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/example.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/example.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/example.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/example.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/exsl.node.set.available.xml b/apache-fop/src/test/resources/docbook-xsl/params/exsl.node.set.available.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/exsl.node.set.available.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/exsl.node.set.available.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/feedback.href.xml b/apache-fop/src/test/resources/docbook-xsl/params/feedback.href.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/feedback.href.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/feedback.href.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/feedback.link.text.xml b/apache-fop/src/test/resources/docbook-xsl/params/feedback.link.text.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/feedback.link.text.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/feedback.link.text.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/feedback.with.ids.xml b/apache-fop/src/test/resources/docbook-xsl/params/feedback.with.ids.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/feedback.with.ids.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/feedback.with.ids.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/figure.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/figure.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/figure.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/figure.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/filename-prefix.xml b/apache-fop/src/test/resources/docbook-xsl/params/filename-prefix.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/filename-prefix.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/filename-prefix.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/firstterm.only.link.xml b/apache-fop/src/test/resources/docbook-xsl/params/firstterm.only.link.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/firstterm.only.link.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/firstterm.only.link.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foil.footer.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/foil.footer.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foil.footer.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foil.footer.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foil.header.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/foil.header.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foil.header.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foil.header.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foil.master.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/foil.master.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foil.master.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foil.master.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foil.page-sequence.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/foil.page-sequence.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foil.page-sequence.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foil.page-sequence.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foil.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/foil.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foil.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foil.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foil.region-after.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/foil.region-after.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foil.region-after.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foil.region-after.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foil.region-before.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/foil.region-before.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foil.region-before.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foil.region-before.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foil.region-body.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/foil.region-body.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foil.region-body.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foil.region-body.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foil.subtitle.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/foil.subtitle.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foil.subtitle.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foil.subtitle.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foil.title.master.xml b/apache-fop/src/test/resources/docbook-xsl/params/foil.title.master.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foil.title.master.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foil.title.master.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foil.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/foil.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foil.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foil.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foil.title.size.xml b/apache-fop/src/test/resources/docbook-xsl/params/foil.title.size.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foil.title.size.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foil.title.size.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foilgroup.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/foilgroup.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foilgroup.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foilgroup.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/foilgroup.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/foilgroup.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/foilgroup.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/foilgroup.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/footer.column.widths.xml b/apache-fop/src/test/resources/docbook-xsl/params/footer.column.widths.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/footer.column.widths.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/footer.column.widths.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/footer.content.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/footer.content.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/footer.content.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/footer.content.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/footer.hr.xml b/apache-fop/src/test/resources/docbook-xsl/params/footer.hr.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/footer.hr.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/footer.hr.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/footer.rule.xml b/apache-fop/src/test/resources/docbook-xsl/params/footer.rule.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/footer.rule.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/footer.rule.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/footer.table.height.xml b/apache-fop/src/test/resources/docbook-xsl/params/footer.table.height.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/footer.table.height.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/footer.table.height.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/footer.table.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/footer.table.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/footer.table.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/footer.table.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/footers.on.blank.pages.xml b/apache-fop/src/test/resources/docbook-xsl/params/footers.on.blank.pages.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/footers.on.blank.pages.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/footers.on.blank.pages.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/footnote.font.size.xml b/apache-fop/src/test/resources/docbook-xsl/params/footnote.font.size.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/footnote.font.size.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/footnote.font.size.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/footnote.mark.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/footnote.mark.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/footnote.mark.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/footnote.mark.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/footnote.number.format.xml b/apache-fop/src/test/resources/docbook-xsl/params/footnote.number.format.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/footnote.number.format.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/footnote.number.format.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/footnote.number.symbols.xml b/apache-fop/src/test/resources/docbook-xsl/params/footnote.number.symbols.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/footnote.number.symbols.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/footnote.number.symbols.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/footnote.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/footnote.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/footnote.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/footnote.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/footnote.sep.leader.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/footnote.sep.leader.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/footnote.sep.leader.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/footnote.sep.leader.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/fop.extensions.xml b/apache-fop/src/test/resources/docbook-xsl/params/fop.extensions.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/fop.extensions.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/fop.extensions.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/fop1.extensions.xml b/apache-fop/src/test/resources/docbook-xsl/params/fop1.extensions.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/fop1.extensions.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/fop1.extensions.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/force.blank.pages.xml b/apache-fop/src/test/resources/docbook-xsl/params/force.blank.pages.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/force.blank.pages.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/force.blank.pages.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/formal.object.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/formal.object.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/formal.object.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/formal.object.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/formal.procedures.xml b/apache-fop/src/test/resources/docbook-xsl/params/formal.procedures.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/formal.procedures.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/formal.procedures.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/formal.title.placement.xml b/apache-fop/src/test/resources/docbook-xsl/params/formal.title.placement.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/formal.title.placement.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/formal.title.placement.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/formal.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/formal.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/formal.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/formal.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/funcsynopsis.decoration.xml b/apache-fop/src/test/resources/docbook-xsl/params/funcsynopsis.decoration.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/funcsynopsis.decoration.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/funcsynopsis.decoration.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/funcsynopsis.style.xml b/apache-fop/src/test/resources/docbook-xsl/params/funcsynopsis.style.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/funcsynopsis.style.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/funcsynopsis.style.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/function.parens.xml b/apache-fop/src/test/resources/docbook-xsl/params/function.parens.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/function.parens.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/function.parens.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.consistent.ids.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.consistent.ids.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.consistent.ids.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.consistent.ids.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.copyright.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.copyright.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.copyright.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.copyright.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.css.header.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.css.header.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.css.header.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.css.header.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.foilgroup.numbered.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.foilgroup.numbered.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.foilgroup.numbered.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.foilgroup.numbered.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.foilgroup.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.foilgroup.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.foilgroup.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.foilgroup.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.handoutnotes.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.handoutnotes.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.handoutnotes.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.handoutnotes.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.id.attributes.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.id.attributes.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.id.attributes.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.id.attributes.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.index.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.index.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.index.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.index.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.legalnotice.link.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.legalnotice.link.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.legalnotice.link.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.legalnotice.link.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.manifest.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.manifest.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.manifest.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.manifest.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.meta.abstract.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.meta.abstract.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.meta.abstract.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.meta.abstract.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.page.number.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.page.number.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.page.number.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.page.number.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.pubdate.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.pubdate.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.pubdate.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.pubdate.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.revhistory.link.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.revhistory.link.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.revhistory.link.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.revhistory.link.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.section.toc.level.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.section.toc.level.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.section.toc.level.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.section.toc.level.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.speakernotes.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.speakernotes.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.speakernotes.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.speakernotes.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.titlepage.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.titlepage.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.titlepage.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.titlepage.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/generate.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/generate.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/generate.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/generate.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/glossary.as.blocks.xml b/apache-fop/src/test/resources/docbook-xsl/params/glossary.as.blocks.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/glossary.as.blocks.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/glossary.as.blocks.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/glossary.collection.xml b/apache-fop/src/test/resources/docbook-xsl/params/glossary.collection.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/glossary.collection.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/glossary.collection.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/glossary.sort.xml b/apache-fop/src/test/resources/docbook-xsl/params/glossary.sort.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/glossary.sort.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/glossary.sort.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/glossdef.block.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/glossdef.block.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/glossdef.block.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/glossdef.block.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/glossdef.list.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/glossdef.list.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/glossdef.list.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/glossdef.list.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/glossentry.list.item.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/glossentry.list.item.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/glossentry.list.item.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/glossentry.list.item.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/glossentry.show.acronym.xml b/apache-fop/src/test/resources/docbook-xsl/params/glossentry.show.acronym.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/glossentry.show.acronym.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/glossentry.show.acronym.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/glosslist.as.blocks.xml b/apache-fop/src/test/resources/docbook-xsl/params/glosslist.as.blocks.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/glosslist.as.blocks.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/glosslist.as.blocks.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/glossterm.auto.link.xml b/apache-fop/src/test/resources/docbook-xsl/params/glossterm.auto.link.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/glossterm.auto.link.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/glossterm.auto.link.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/glossterm.block.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/glossterm.block.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/glossterm.block.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/glossterm.block.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/glossterm.list.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/glossterm.list.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/glossterm.list.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/glossterm.list.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/glossterm.separation.xml b/apache-fop/src/test/resources/docbook-xsl/params/glossterm.separation.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/glossterm.separation.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/glossterm.separation.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/glossterm.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/glossterm.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/glossterm.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/glossterm.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/graphic.default.extension.xml b/apache-fop/src/test/resources/docbook-xsl/params/graphic.default.extension.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/graphic.default.extension.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/graphic.default.extension.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/graphical.admonition.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/graphical.admonition.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/graphical.admonition.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/graphical.admonition.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/graphics.dir.xml b/apache-fop/src/test/resources/docbook-xsl/params/graphics.dir.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/graphics.dir.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/graphics.dir.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/graphicsize.extension.xml b/apache-fop/src/test/resources/docbook-xsl/params/graphicsize.extension.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/graphicsize.extension.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/graphicsize.extension.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/graphicsize.use.img.src.path.xml b/apache-fop/src/test/resources/docbook-xsl/params/graphicsize.use.img.src.path.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/graphicsize.use.img.src.path.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/graphicsize.use.img.src.path.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/handoutnotes.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/handoutnotes.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/handoutnotes.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/handoutnotes.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/header.column.widths.xml b/apache-fop/src/test/resources/docbook-xsl/params/header.column.widths.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/header.column.widths.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/header.column.widths.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/header.content.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/header.content.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/header.content.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/header.content.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/header.hr.xml b/apache-fop/src/test/resources/docbook-xsl/params/header.hr.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/header.hr.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/header.hr.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/header.rule.xml b/apache-fop/src/test/resources/docbook-xsl/params/header.rule.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/header.rule.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/header.rule.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/header.table.height.xml b/apache-fop/src/test/resources/docbook-xsl/params/header.table.height.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/header.table.height.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/header.table.height.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/header.table.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/header.table.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/header.table.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/header.table.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/headers.on.blank.pages.xml b/apache-fop/src/test/resources/docbook-xsl/params/headers.on.blank.pages.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/headers.on.blank.pages.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/headers.on.blank.pages.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/hidetoc.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/hidetoc.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/hidetoc.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/hidetoc.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/highlight.default.language.xml b/apache-fop/src/test/resources/docbook-xsl/params/highlight.default.language.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/highlight.default.language.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/highlight.default.language.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/highlight.source.xml b/apache-fop/src/test/resources/docbook-xsl/params/highlight.source.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/highlight.source.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/highlight.source.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/highlight.xslthl.config.xml b/apache-fop/src/test/resources/docbook-xsl/params/highlight.xslthl.config.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/highlight.xslthl.config.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/highlight.xslthl.config.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/home.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/home.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/home.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/home.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.append.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.append.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.append.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.append.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.base.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.base.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.base.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.base.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.cellpadding.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.cellpadding.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.cellpadding.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.cellpadding.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.cellspacing.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.cellspacing.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.cellspacing.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.cellspacing.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.cleanup.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.cleanup.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.cleanup.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.cleanup.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.ext.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.ext.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.ext.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.ext.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.extra.head.links.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.extra.head.links.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.extra.head.links.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.extra.head.links.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.head.legalnotice.link.multiple.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.head.legalnotice.link.multiple.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.head.legalnotice.link.multiple.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.head.legalnotice.link.multiple.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.head.legalnotice.link.types.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.head.legalnotice.link.types.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.head.legalnotice.link.types.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.head.legalnotice.link.types.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.longdesc.link.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.longdesc.link.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.longdesc.link.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.longdesc.link.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.longdesc.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.longdesc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.longdesc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.longdesc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.script.type.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.script.type.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.script.type.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.script.type.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.script.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.script.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.script.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.script.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.stylesheet.type.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.stylesheet.type.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.stylesheet.type.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.stylesheet.type.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/html.stylesheet.xml b/apache-fop/src/test/resources/docbook-xsl/params/html.stylesheet.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/html.stylesheet.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/html.stylesheet.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.alias.file.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.alias.file.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.alias.file.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.alias.file.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.autolabel.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.autolabel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.autolabel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.autolabel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.back.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.back.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.back.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.back.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.forward.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.forward.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.forward.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.forward.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.hideshow.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.hideshow.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.hideshow.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.hideshow.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.home.url.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.home.url.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.home.url.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.home.url.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.home.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.home.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.home.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.home.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.jump1.title.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.jump1.title.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.jump1.title.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.jump1.title.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.jump1.url.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.jump1.url.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.jump1.url.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.jump1.url.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.jump1.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.jump1.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.jump1.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.jump1.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.jump2.title.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.jump2.title.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.jump2.title.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.jump2.title.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.jump2.url.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.jump2.url.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.jump2.url.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.jump2.url.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.jump2.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.jump2.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.jump2.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.jump2.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.locate.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.locate.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.locate.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.locate.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.next.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.next.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.next.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.next.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.options.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.options.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.options.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.options.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.prev.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.prev.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.prev.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.prev.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.print.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.print.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.print.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.print.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.refresh.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.refresh.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.refresh.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.refresh.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.stop.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.stop.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.stop.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.stop.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.zoom.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.zoom.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.button.zoom.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.button.zoom.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.chm.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.chm.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.chm.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.chm.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.default.topic.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.default.topic.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.default.topic.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.default.topic.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.display.progress.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.display.progress.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.display.progress.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.display.progress.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.encoding.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.encoding.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.encoding.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.encoding.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.enhanced.decompilation.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.enhanced.decompilation.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.enhanced.decompilation.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.enhanced.decompilation.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.enumerate.images.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.enumerate.images.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.enumerate.images.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.enumerate.images.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.force.map.and.alias.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.force.map.and.alias.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.force.map.and.alias.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.force.map.and.alias.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhc.binary.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhc.binary.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhc.binary.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhc.binary.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhc.folders.instead.books.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhc.folders.instead.books.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhc.folders.instead.books.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhc.folders.instead.books.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhc.section.depth.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhc.section.depth.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhc.section.depth.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhc.section.depth.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhc.show.root.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhc.show.root.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhc.show.root.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhc.show.root.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhc.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhc.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhc.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhc.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhc.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhk.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhk.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhk.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhk.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhp.tail.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhp.tail.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhp.tail.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhp.tail.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhp.window.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhp.window.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhp.window.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhp.window.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhp.windows.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhp.windows.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhp.windows.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhp.windows.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhp.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhp.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.hhp.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.hhp.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.map.file.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.map.file.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.map.file.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.map.file.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.only.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.only.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.only.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.only.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.remember.window.position.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.remember.window.position.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.remember.window.position.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.remember.window.position.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.show.advanced.search.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.show.advanced.search.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.show.advanced.search.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.show.advanced.search.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.show.favorities.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.show.favorities.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.show.favorities.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.show.favorities.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.show.menu.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.show.menu.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.show.menu.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.show.menu.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.show.toolbar.text.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.show.toolbar.text.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.show.toolbar.text.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.show.toolbar.text.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.title.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.title.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.title.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.title.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.use.hhk.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.use.hhk.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.use.hhk.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.use.hhk.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/htmlhelp.window.geometry.xml b/apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.window.geometry.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/htmlhelp.window.geometry.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/htmlhelp.window.geometry.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/hyphenate.verbatim.characters.xml b/apache-fop/src/test/resources/docbook-xsl/params/hyphenate.verbatim.characters.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/hyphenate.verbatim.characters.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/hyphenate.verbatim.characters.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/hyphenate.verbatim.xml b/apache-fop/src/test/resources/docbook-xsl/params/hyphenate.verbatim.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/hyphenate.verbatim.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/hyphenate.verbatim.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/hyphenate.xml b/apache-fop/src/test/resources/docbook-xsl/params/hyphenate.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/hyphenate.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/hyphenate.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/id.warnings.xml b/apache-fop/src/test/resources/docbook-xsl/params/id.warnings.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/id.warnings.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/id.warnings.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/ignore.image.scaling.xml b/apache-fop/src/test/resources/docbook-xsl/params/ignore.image.scaling.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/ignore.image.scaling.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/ignore.image.scaling.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/img.src.path.xml b/apache-fop/src/test/resources/docbook-xsl/params/img.src.path.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/img.src.path.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/img.src.path.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/index.div.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/index.div.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/index.div.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/index.div.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/index.entry.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/index.entry.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/index.entry.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/index.entry.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/index.links.to.section.xml b/apache-fop/src/test/resources/docbook-xsl/params/index.links.to.section.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/index.links.to.section.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/index.links.to.section.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/index.method.xml b/apache-fop/src/test/resources/docbook-xsl/params/index.method.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/index.method.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/index.method.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/index.number.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/index.number.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/index.number.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/index.number.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/index.on.role.xml b/apache-fop/src/test/resources/docbook-xsl/params/index.on.role.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/index.on.role.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/index.on.role.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/index.on.type.xml b/apache-fop/src/test/resources/docbook-xsl/params/index.on.type.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/index.on.type.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/index.on.type.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/index.page.number.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/index.page.number.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/index.page.number.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/index.page.number.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/index.prefer.titleabbrev.xml b/apache-fop/src/test/resources/docbook-xsl/params/index.prefer.titleabbrev.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/index.prefer.titleabbrev.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/index.prefer.titleabbrev.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/index.preferred.page.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/index.preferred.page.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/index.preferred.page.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/index.preferred.page.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/index.range.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/index.range.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/index.range.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/index.range.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/index.term.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/index.term.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/index.term.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/index.term.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/informal.object.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/informal.object.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/informal.object.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/informal.object.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/informalequation.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/informalequation.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/informalequation.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/informalequation.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/informalexample.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/informalexample.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/informalexample.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/informalexample.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/informalfigure.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/informalfigure.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/informalfigure.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/informalfigure.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/informaltable.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/informaltable.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/informaltable.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/informaltable.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/inherit.keywords.xml b/apache-fop/src/test/resources/docbook-xsl/params/inherit.keywords.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/inherit.keywords.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/inherit.keywords.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/inner.region.content.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/inner.region.content.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/inner.region.content.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/inner.region.content.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/insert.link.page.number.xml b/apache-fop/src/test/resources/docbook-xsl/params/insert.link.page.number.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/insert.link.page.number.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/insert.link.page.number.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/insert.olink.page.number.xml b/apache-fop/src/test/resources/docbook-xsl/params/insert.olink.page.number.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/insert.olink.page.number.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/insert.olink.page.number.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/insert.olink.pdf.frag.xml b/apache-fop/src/test/resources/docbook-xsl/params/insert.olink.pdf.frag.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/insert.olink.pdf.frag.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/insert.olink.pdf.frag.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/insert.xref.page.number.xml b/apache-fop/src/test/resources/docbook-xsl/params/insert.xref.page.number.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/insert.xref.page.number.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/insert.xref.page.number.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/itemizedlist.label.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/itemizedlist.label.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/itemizedlist.label.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/itemizedlist.label.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/itemizedlist.label.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/itemizedlist.label.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/itemizedlist.label.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/itemizedlist.label.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/itemizedlist.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/itemizedlist.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/itemizedlist.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/itemizedlist.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/javahelp.encoding.xml b/apache-fop/src/test/resources/docbook-xsl/params/javahelp.encoding.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/javahelp.encoding.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/javahelp.encoding.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/keep.relative.image.uris.xml b/apache-fop/src/test/resources/docbook-xsl/params/keep.relative.image.uris.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/keep.relative.image.uris.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/keep.relative.image.uris.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/keyboard.nav.xml b/apache-fop/src/test/resources/docbook-xsl/params/keyboard.nav.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/keyboard.nav.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/keyboard.nav.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/l10n.gentext.default.language.xml b/apache-fop/src/test/resources/docbook-xsl/params/l10n.gentext.default.language.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/l10n.gentext.default.language.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/l10n.gentext.default.language.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/l10n.gentext.language.xml b/apache-fop/src/test/resources/docbook-xsl/params/l10n.gentext.language.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/l10n.gentext.language.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/l10n.gentext.language.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/l10n.gentext.use.xref.language.xml b/apache-fop/src/test/resources/docbook-xsl/params/l10n.gentext.use.xref.language.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/l10n.gentext.use.xref.language.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/l10n.gentext.use.xref.language.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/l10n.lang.value.rfc.compliant.xml b/apache-fop/src/test/resources/docbook-xsl/params/l10n.lang.value.rfc.compliant.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/l10n.lang.value.rfc.compliant.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/l10n.lang.value.rfc.compliant.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/label.from.part.xml b/apache-fop/src/test/resources/docbook-xsl/params/label.from.part.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/label.from.part.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/label.from.part.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/line-height.xml b/apache-fop/src/test/resources/docbook-xsl/params/line-height.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/line-height.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/line-height.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/linenumbering.everyNth.xml b/apache-fop/src/test/resources/docbook-xsl/params/linenumbering.everyNth.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/linenumbering.everyNth.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/linenumbering.everyNth.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/linenumbering.extension.xml b/apache-fop/src/test/resources/docbook-xsl/params/linenumbering.extension.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/linenumbering.extension.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/linenumbering.extension.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/linenumbering.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/linenumbering.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/linenumbering.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/linenumbering.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/linenumbering.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/linenumbering.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/linenumbering.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/linenumbering.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/link.mailto.url.xml b/apache-fop/src/test/resources/docbook-xsl/params/link.mailto.url.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/link.mailto.url.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/link.mailto.url.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/list.block.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/list.block.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/list.block.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/list.block.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/list.block.spacing.xml b/apache-fop/src/test/resources/docbook-xsl/params/list.block.spacing.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/list.block.spacing.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/list.block.spacing.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/list.item.spacing.xml b/apache-fop/src/test/resources/docbook-xsl/params/list.item.spacing.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/list.item.spacing.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/list.item.spacing.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/make.clean.html.xml b/apache-fop/src/test/resources/docbook-xsl/params/make.clean.html.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/make.clean.html.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/make.clean.html.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/make.graphic.viewport.xml b/apache-fop/src/test/resources/docbook-xsl/params/make.graphic.viewport.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/make.graphic.viewport.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/make.graphic.viewport.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/make.index.markup.xml b/apache-fop/src/test/resources/docbook-xsl/params/make.index.markup.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/make.index.markup.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/make.index.markup.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/make.single.year.ranges.xml b/apache-fop/src/test/resources/docbook-xsl/params/make.single.year.ranges.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/make.single.year.ranges.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/make.single.year.ranges.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/make.valid.html.xml b/apache-fop/src/test/resources/docbook-xsl/params/make.valid.html.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/make.valid.html.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/make.valid.html.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/make.year.ranges.xml b/apache-fop/src/test/resources/docbook-xsl/params/make.year.ranges.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/make.year.ranges.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/make.year.ranges.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.authors.section.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.authors.section.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.authors.section.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.authors.section.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.base.url.for.relative.links.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.base.url.for.relative.links.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.base.url.for.relative.links.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.base.url.for.relative.links.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.break.after.slash.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.break.after.slash.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.break.after.slash.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.break.after.slash.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.charmap.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.charmap.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.charmap.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.charmap.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.charmap.subset.profile.english.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.charmap.subset.profile.english.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.charmap.subset.profile.english.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.charmap.subset.profile.english.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.charmap.subset.profile.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.charmap.subset.profile.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.charmap.subset.profile.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.charmap.subset.profile.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.charmap.uri.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.charmap.uri.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.charmap.uri.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.charmap.uri.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.charmap.use.subset.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.charmap.use.subset.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.charmap.use.subset.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.charmap.use.subset.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.copyright.section.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.copyright.section.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.copyright.section.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.copyright.section.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.endnotes.are.numbered.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.endnotes.are.numbered.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.endnotes.are.numbered.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.endnotes.are.numbered.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.endnotes.list.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.endnotes.list.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.endnotes.list.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.endnotes.list.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.endnotes.list.heading.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.endnotes.list.heading.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.endnotes.list.heading.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.endnotes.list.heading.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.font.funcprototype.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.font.funcprototype.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.font.funcprototype.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.font.funcprototype.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.font.funcsynopsisinfo.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.font.funcsynopsisinfo.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.font.funcsynopsisinfo.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.font.funcsynopsisinfo.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.font.links.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.font.links.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.font.links.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.font.links.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.font.table.headings.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.font.table.headings.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.font.table.headings.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.font.table.headings.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.font.table.title.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.font.table.title.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.font.table.title.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.font.table.title.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.funcsynopsis.style.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.funcsynopsis.style.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.funcsynopsis.style.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.funcsynopsis.style.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.hyphenate.computer.inlines.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.hyphenate.computer.inlines.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.hyphenate.computer.inlines.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.hyphenate.computer.inlines.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.hyphenate.filenames.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.hyphenate.filenames.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.hyphenate.filenames.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.hyphenate.filenames.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.hyphenate.urls.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.hyphenate.urls.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.hyphenate.urls.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.hyphenate.urls.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.hyphenate.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.hyphenate.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.hyphenate.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.hyphenate.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.indent.blurbs.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.indent.blurbs.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.indent.blurbs.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.indent.blurbs.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.indent.lists.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.indent.lists.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.indent.lists.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.indent.lists.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.indent.refsect.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.indent.refsect.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.indent.refsect.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.indent.refsect.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.indent.verbatims.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.indent.verbatims.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.indent.verbatims.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.indent.verbatims.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.indent.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.indent.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.indent.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.indent.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.justify.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.justify.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.justify.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.justify.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.output.base.dir.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.output.base.dir.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.output.base.dir.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.output.base.dir.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.output.better.ps.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.output.better.ps.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.output.better.ps.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.output.better.ps.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.output.encoding.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.output.encoding.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.output.encoding.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.output.encoding.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.output.in.separate.dir.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.output.in.separate.dir.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.output.in.separate.dir.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.output.in.separate.dir.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.output.lang.in.name.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.output.lang.in.name.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.output.lang.in.name.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.output.lang.in.name.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.output.manifest.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.output.manifest.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.output.manifest.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.output.manifest.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.output.manifest.filename.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.output.manifest.filename.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.output.manifest.filename.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.output.manifest.filename.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.output.quietly.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.output.quietly.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.output.quietly.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.output.quietly.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.output.subdirs.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.output.subdirs.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.output.subdirs.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.output.subdirs.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.segtitle.suppress.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.segtitle.suppress.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.segtitle.suppress.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.segtitle.suppress.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.string.subst.map.local.post.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.string.subst.map.local.post.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.string.subst.map.local.post.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.string.subst.map.local.post.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.string.subst.map.local.pre.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.string.subst.map.local.pre.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.string.subst.map.local.pre.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.string.subst.map.local.pre.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.string.subst.map.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.string.subst.map.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.string.subst.map.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.string.subst.map.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.subheading.divider.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.subheading.divider.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.subheading.divider.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.subheading.divider.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.subheading.divider.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.subheading.divider.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.subheading.divider.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.subheading.divider.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.table.footnotes.divider.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.table.footnotes.divider.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.table.footnotes.divider.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.table.footnotes.divider.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.th.extra1.suppress.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.th.extra1.suppress.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.th.extra1.suppress.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.th.extra1.suppress.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.th.extra2.max.length.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.th.extra2.max.length.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.th.extra2.max.length.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.th.extra2.max.length.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.th.extra2.suppress.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.th.extra2.suppress.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.th.extra2.suppress.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.th.extra2.suppress.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.th.extra3.max.length.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.th.extra3.max.length.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.th.extra3.max.length.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.th.extra3.max.length.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.th.extra3.suppress.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.th.extra3.suppress.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.th.extra3.suppress.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.th.extra3.suppress.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/man.th.title.max.length.xml b/apache-fop/src/test/resources/docbook-xsl/params/man.th.title.max.length.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/man.th.title.max.length.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/man.th.title.max.length.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/manifest.in.base.dir.xml b/apache-fop/src/test/resources/docbook-xsl/params/manifest.in.base.dir.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/manifest.in.base.dir.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/manifest.in.base.dir.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/manifest.xml b/apache-fop/src/test/resources/docbook-xsl/params/manifest.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/manifest.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/manifest.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/manual.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/manual.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/manual.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/manual.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/margin.note.float.type.xml b/apache-fop/src/test/resources/docbook-xsl/params/margin.note.float.type.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/margin.note.float.type.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/margin.note.float.type.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/margin.note.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/margin.note.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/margin.note.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/margin.note.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/margin.note.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/margin.note.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/margin.note.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/margin.note.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/margin.note.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/margin.note.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/margin.note.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/margin.note.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/marker.section.level.xml b/apache-fop/src/test/resources/docbook-xsl/params/marker.section.level.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/marker.section.level.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/marker.section.level.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/menuchoice.menu.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/menuchoice.menu.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/menuchoice.menu.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/menuchoice.menu.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/menuchoice.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/menuchoice.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/menuchoice.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/menuchoice.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/minus.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/minus.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/minus.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/minus.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/mml.embedding.mode.fo.xml b/apache-fop/src/test/resources/docbook-xsl/params/mml.embedding.mode.fo.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/mml.embedding.mode.fo.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/mml.embedding.mode.fo.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/mml.embedding.mode.xml b/apache-fop/src/test/resources/docbook-xsl/params/mml.embedding.mode.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/mml.embedding.mode.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/mml.embedding.mode.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/monospace.font.family.xml b/apache-fop/src/test/resources/docbook-xsl/params/monospace.font.family.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/monospace.font.family.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/monospace.font.family.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/monospace.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/monospace.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/monospace.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/monospace.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/monospace.verbatim.font.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/monospace.verbatim.font.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/monospace.verbatim.font.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/monospace.verbatim.font.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/monospace.verbatim.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/monospace.verbatim.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/monospace.verbatim.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/monospace.verbatim.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/multiframe.bottom.bgcolor.xml b/apache-fop/src/test/resources/docbook-xsl/params/multiframe.bottom.bgcolor.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/multiframe.bottom.bgcolor.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/multiframe.bottom.bgcolor.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/multiframe.navigation.height.xml b/apache-fop/src/test/resources/docbook-xsl/params/multiframe.navigation.height.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/multiframe.navigation.height.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/multiframe.navigation.height.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/multiframe.top.bgcolor.xml b/apache-fop/src/test/resources/docbook-xsl/params/multiframe.top.bgcolor.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/multiframe.top.bgcolor.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/multiframe.top.bgcolor.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/multiframe.xml b/apache-fop/src/test/resources/docbook-xsl/params/multiframe.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/multiframe.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/multiframe.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/nav.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/nav.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/nav.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/nav.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/nav.table.summary.xml b/apache-fop/src/test/resources/docbook-xsl/params/nav.table.summary.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/nav.table.summary.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/nav.table.summary.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/navbgcolor.xml b/apache-fop/src/test/resources/docbook-xsl/params/navbgcolor.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/navbgcolor.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/navbgcolor.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/navbodywidth.xml b/apache-fop/src/test/resources/docbook-xsl/params/navbodywidth.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/navbodywidth.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/navbodywidth.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/navig.graphics.extension.xml b/apache-fop/src/test/resources/docbook-xsl/params/navig.graphics.extension.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/navig.graphics.extension.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/navig.graphics.extension.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/navig.graphics.path.xml b/apache-fop/src/test/resources/docbook-xsl/params/navig.graphics.path.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/navig.graphics.path.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/navig.graphics.path.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/navig.graphics.xml b/apache-fop/src/test/resources/docbook-xsl/params/navig.graphics.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/navig.graphics.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/navig.graphics.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/navig.showtitles.xml b/apache-fop/src/test/resources/docbook-xsl/params/navig.showtitles.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/navig.showtitles.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/navig.showtitles.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/navtocwidth.xml b/apache-fop/src/test/resources/docbook-xsl/params/navtocwidth.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/navtocwidth.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/navtocwidth.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/next.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/next.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/next.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/next.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/no.home.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/no.home.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/no.home.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/no.home.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/no.next.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/no.next.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/no.next.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/no.next.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/no.prev.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/no.prev.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/no.prev.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/no.prev.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/no.toc.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/no.toc.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/no.toc.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/no.toc.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/no.up.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/no.up.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/no.up.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/no.up.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/nominal.image.depth.xml b/apache-fop/src/test/resources/docbook-xsl/params/nominal.image.depth.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/nominal.image.depth.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/nominal.image.depth.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/nominal.image.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/nominal.image.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/nominal.image.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/nominal.image.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/nominal.table.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/nominal.table.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/nominal.table.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/nominal.table.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/nongraphical.admonition.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/nongraphical.admonition.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/nongraphical.admonition.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/nongraphical.admonition.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/normal.para.spacing.xml b/apache-fop/src/test/resources/docbook-xsl/params/normal.para.spacing.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/normal.para.spacing.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/normal.para.spacing.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/olink.base.uri.xml b/apache-fop/src/test/resources/docbook-xsl/params/olink.base.uri.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/olink.base.uri.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/olink.base.uri.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/olink.debug.xml b/apache-fop/src/test/resources/docbook-xsl/params/olink.debug.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/olink.debug.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/olink.debug.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/olink.doctitle.xml b/apache-fop/src/test/resources/docbook-xsl/params/olink.doctitle.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/olink.doctitle.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/olink.doctitle.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/olink.fragid.xml b/apache-fop/src/test/resources/docbook-xsl/params/olink.fragid.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/olink.fragid.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/olink.fragid.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/olink.lang.fallback.sequence.xml b/apache-fop/src/test/resources/docbook-xsl/params/olink.lang.fallback.sequence.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/olink.lang.fallback.sequence.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/olink.lang.fallback.sequence.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/olink.outline.ext.xml b/apache-fop/src/test/resources/docbook-xsl/params/olink.outline.ext.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/olink.outline.ext.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/olink.outline.ext.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/olink.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/olink.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/olink.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/olink.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/olink.pubid.xml b/apache-fop/src/test/resources/docbook-xsl/params/olink.pubid.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/olink.pubid.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/olink.pubid.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/olink.resolver.xml b/apache-fop/src/test/resources/docbook-xsl/params/olink.resolver.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/olink.resolver.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/olink.resolver.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/olink.sysid.xml b/apache-fop/src/test/resources/docbook-xsl/params/olink.sysid.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/olink.sysid.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/olink.sysid.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/orderedlist.label.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/orderedlist.label.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/orderedlist.label.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/orderedlist.label.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/orderedlist.label.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/orderedlist.label.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/orderedlist.label.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/orderedlist.label.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/orderedlist.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/orderedlist.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/orderedlist.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/orderedlist.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/othercredit.like.author.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/othercredit.like.author.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/othercredit.like.author.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/othercredit.like.author.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/outer.region.content.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/outer.region.content.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/outer.region.content.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/outer.region.content.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/output-root.xml b/apache-fop/src/test/resources/docbook-xsl/params/output-root.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/output-root.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/output-root.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/output.indent.xml b/apache-fop/src/test/resources/docbook-xsl/params/output.indent.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/output.indent.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/output.indent.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/overlay.js.xml b/apache-fop/src/test/resources/docbook-xsl/params/overlay.js.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/overlay.js.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/overlay.js.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/overlay.logo.xml b/apache-fop/src/test/resources/docbook-xsl/params/overlay.logo.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/overlay.logo.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/overlay.logo.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/overlay.xml b/apache-fop/src/test/resources/docbook-xsl/params/overlay.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/overlay.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/overlay.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/page.height.portrait.xml b/apache-fop/src/test/resources/docbook-xsl/params/page.height.portrait.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/page.height.portrait.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/page.height.portrait.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/page.height.xml b/apache-fop/src/test/resources/docbook-xsl/params/page.height.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/page.height.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/page.height.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/page.margin.bottom.xml b/apache-fop/src/test/resources/docbook-xsl/params/page.margin.bottom.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/page.margin.bottom.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/page.margin.bottom.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/page.margin.inner.xml b/apache-fop/src/test/resources/docbook-xsl/params/page.margin.inner.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/page.margin.inner.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/page.margin.inner.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/page.margin.outer.xml b/apache-fop/src/test/resources/docbook-xsl/params/page.margin.outer.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/page.margin.outer.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/page.margin.outer.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/page.margin.top.xml b/apache-fop/src/test/resources/docbook-xsl/params/page.margin.top.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/page.margin.top.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/page.margin.top.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/page.orientation.xml b/apache-fop/src/test/resources/docbook-xsl/params/page.orientation.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/page.orientation.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/page.orientation.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/page.width.portrait.xml b/apache-fop/src/test/resources/docbook-xsl/params/page.width.portrait.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/page.width.portrait.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/page.width.portrait.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/page.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/page.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/page.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/page.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/pages.template.xml b/apache-fop/src/test/resources/docbook-xsl/params/pages.template.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/pages.template.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/pages.template.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/paper.type.xml b/apache-fop/src/test/resources/docbook-xsl/params/paper.type.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/paper.type.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/paper.type.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/para.propagates.style.xml b/apache-fop/src/test/resources/docbook-xsl/params/para.propagates.style.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/para.propagates.style.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/para.propagates.style.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/para.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/para.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/para.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/para.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/part.autolabel.xml b/apache-fop/src/test/resources/docbook-xsl/params/part.autolabel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/part.autolabel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/part.autolabel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/passivetex.extensions.xml b/apache-fop/src/test/resources/docbook-xsl/params/passivetex.extensions.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/passivetex.extensions.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/passivetex.extensions.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/pgwide.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/pgwide.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/pgwide.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/pgwide.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/phrase.propagates.style.xml b/apache-fop/src/test/resources/docbook-xsl/params/phrase.propagates.style.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/phrase.propagates.style.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/phrase.propagates.style.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/pixels.per.inch.xml b/apache-fop/src/test/resources/docbook-xsl/params/pixels.per.inch.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/pixels.per.inch.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/pixels.per.inch.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/plus.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/plus.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/plus.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/plus.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/points.per.em.xml b/apache-fop/src/test/resources/docbook-xsl/params/points.per.em.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/points.per.em.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/points.per.em.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/preface.autolabel.xml b/apache-fop/src/test/resources/docbook-xsl/params/preface.autolabel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/preface.autolabel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/preface.autolabel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/prefer.internal.olink.xml b/apache-fop/src/test/resources/docbook-xsl/params/prefer.internal.olink.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/prefer.internal.olink.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/prefer.internal.olink.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/preferred.mediaobject.role.xml b/apache-fop/src/test/resources/docbook-xsl/params/preferred.mediaobject.role.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/preferred.mediaobject.role.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/preferred.mediaobject.role.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/prev.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/prev.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/prev.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/prev.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/procedure.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/procedure.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/procedure.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/procedure.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/process.empty.source.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/process.empty.source.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/process.empty.source.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/process.empty.source.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/process.source.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/process.source.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/process.source.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/process.source.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.arch.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.arch.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.arch.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.arch.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.attribute.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.attribute.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.attribute.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.attribute.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.audience.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.audience.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.audience.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.audience.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.condition.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.condition.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.condition.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.condition.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.conformance.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.conformance.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.conformance.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.conformance.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.lang.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.lang.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.lang.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.lang.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.os.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.os.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.os.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.os.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.revision.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.revision.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.revision.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.revision.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.revisionflag.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.revisionflag.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.revisionflag.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.revisionflag.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.role.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.role.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.role.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.role.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.security.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.security.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.security.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.security.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.status.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.status.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.status.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.status.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.userlevel.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.userlevel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.userlevel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.userlevel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.value.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.value.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.value.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.value.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.vendor.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.vendor.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.vendor.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.vendor.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/profile.wordsize.xml b/apache-fop/src/test/resources/docbook-xsl/params/profile.wordsize.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/profile.wordsize.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/profile.wordsize.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/punct.honorific.xml b/apache-fop/src/test/resources/docbook-xsl/params/punct.honorific.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/punct.honorific.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/punct.honorific.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/qanda.defaultlabel.xml b/apache-fop/src/test/resources/docbook-xsl/params/qanda.defaultlabel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/qanda.defaultlabel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/qanda.defaultlabel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/qanda.in.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/qanda.in.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/qanda.in.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/qanda.in.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/qanda.inherit.numeration.xml b/apache-fop/src/test/resources/docbook-xsl/params/qanda.inherit.numeration.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/qanda.inherit.numeration.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/qanda.inherit.numeration.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/qanda.nested.in.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/qanda.nested.in.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/qanda.nested.in.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/qanda.nested.in.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/qanda.title.level1.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/qanda.title.level1.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/qanda.title.level1.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/qanda.title.level1.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/qanda.title.level2.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/qanda.title.level2.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/qanda.title.level2.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/qanda.title.level2.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/qanda.title.level3.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/qanda.title.level3.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/qanda.title.level3.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/qanda.title.level3.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/qanda.title.level4.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/qanda.title.level4.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/qanda.title.level4.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/qanda.title.level4.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/qanda.title.level5.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/qanda.title.level5.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/qanda.title.level5.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/qanda.title.level5.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/qanda.title.level6.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/qanda.title.level6.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/qanda.title.level6.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/qanda.title.level6.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/qanda.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/qanda.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/qanda.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/qanda.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/qandadiv.autolabel.xml b/apache-fop/src/test/resources/docbook-xsl/params/qandadiv.autolabel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/qandadiv.autolabel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/qandadiv.autolabel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/rebuild-all.xml b/apache-fop/src/test/resources/docbook-xsl/params/rebuild-all.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/rebuild-all.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/rebuild-all.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refclass.suppress.xml b/apache-fop/src/test/resources/docbook-xsl/params/refclass.suppress.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refclass.suppress.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refclass.suppress.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.date.profile.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.date.profile.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.date.profile.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.date.profile.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.date.profile.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.date.profile.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.date.profile.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.date.profile.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.generate.name.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.generate.name.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.generate.name.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.generate.name.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.generate.title.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.generate.title.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.generate.title.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.generate.title.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.manual.fallback.profile.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.manual.fallback.profile.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.manual.fallback.profile.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.manual.fallback.profile.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.manual.profile.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.manual.profile.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.manual.profile.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.manual.profile.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.manual.profile.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.manual.profile.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.manual.profile.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.manual.profile.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.meta.get.quietly.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.meta.get.quietly.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.meta.get.quietly.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.meta.get.quietly.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.pagebreak.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.pagebreak.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.pagebreak.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.pagebreak.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.source.fallback.profile.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.source.fallback.profile.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.source.fallback.profile.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.source.fallback.profile.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.source.name.profile.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.source.name.profile.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.source.name.profile.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.source.name.profile.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.source.name.profile.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.source.name.profile.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.source.name.profile.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.source.name.profile.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.source.name.suppress.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.source.name.suppress.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.source.name.suppress.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.source.name.suppress.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.version.profile.enabled.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.version.profile.enabled.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.version.profile.enabled.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.version.profile.enabled.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.version.profile.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.version.profile.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.version.profile.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.version.profile.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.version.suppress.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.version.suppress.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.version.suppress.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.version.suppress.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/refentry.xref.manvolnum.xml b/apache-fop/src/test/resources/docbook-xsl/params/refentry.xref.manvolnum.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/refentry.xref.manvolnum.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/refentry.xref.manvolnum.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/reference.autolabel.xml b/apache-fop/src/test/resources/docbook-xsl/params/reference.autolabel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/reference.autolabel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/reference.autolabel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/region.after.extent.xml b/apache-fop/src/test/resources/docbook-xsl/params/region.after.extent.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/region.after.extent.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/region.after.extent.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/region.before.extent.xml b/apache-fop/src/test/resources/docbook-xsl/params/region.before.extent.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/region.before.extent.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/region.before.extent.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/region.inner.extent.xml b/apache-fop/src/test/resources/docbook-xsl/params/region.inner.extent.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/region.inner.extent.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/region.inner.extent.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/region.inner.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/region.inner.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/region.inner.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/region.inner.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/region.outer.extent.xml b/apache-fop/src/test/resources/docbook-xsl/params/region.outer.extent.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/region.outer.extent.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/region.outer.extent.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/region.outer.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/region.outer.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/region.outer.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/region.outer.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/revhistory.table.cell.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/revhistory.table.cell.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/revhistory.table.cell.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/revhistory.table.cell.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/revhistory.table.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/revhistory.table.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/revhistory.table.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/revhistory.table.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/revhistory.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/revhistory.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/revhistory.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/revhistory.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/root.filename.xml b/apache-fop/src/test/resources/docbook-xsl/params/root.filename.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/root.filename.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/root.filename.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/root.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/root.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/root.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/root.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/rootid.xml b/apache-fop/src/test/resources/docbook-xsl/params/rootid.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/rootid.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/rootid.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/runinhead.default.title.end.punct.xml b/apache-fop/src/test/resources/docbook-xsl/params/runinhead.default.title.end.punct.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/runinhead.default.title.end.punct.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/runinhead.default.title.end.punct.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/runinhead.title.end.punct.xml b/apache-fop/src/test/resources/docbook-xsl/params/runinhead.title.end.punct.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/runinhead.title.end.punct.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/runinhead.title.end.punct.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/running.foot.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/running.foot.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/running.foot.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/running.foot.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/s5.controls.xml b/apache-fop/src/test/resources/docbook-xsl/params/s5.controls.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/s5.controls.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/s5.controls.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/s5.defaultview.xml b/apache-fop/src/test/resources/docbook-xsl/params/s5.defaultview.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/s5.defaultview.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/s5.defaultview.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/s5.opera.css.xml b/apache-fop/src/test/resources/docbook-xsl/params/s5.opera.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/s5.opera.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/s5.opera.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/s5.outline.css.xml b/apache-fop/src/test/resources/docbook-xsl/params/s5.outline.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/s5.outline.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/s5.outline.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/s5.path.prefix.xml b/apache-fop/src/test/resources/docbook-xsl/params/s5.path.prefix.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/s5.path.prefix.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/s5.path.prefix.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/s5.print.css.xml b/apache-fop/src/test/resources/docbook-xsl/params/s5.print.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/s5.print.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/s5.print.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/s5.slides.css.xml b/apache-fop/src/test/resources/docbook-xsl/params/s5.slides.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/s5.slides.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/s5.slides.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/s5.slides.js.xml b/apache-fop/src/test/resources/docbook-xsl/params/s5.slides.js.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/s5.slides.js.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/s5.slides.js.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/sans.font.family.xml b/apache-fop/src/test/resources/docbook-xsl/params/sans.font.family.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/sans.font.family.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/sans.font.family.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/saxon.callouts.xml b/apache-fop/src/test/resources/docbook-xsl/params/saxon.callouts.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/saxon.callouts.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/saxon.callouts.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/saxon.character.representation.xml b/apache-fop/src/test/resources/docbook-xsl/params/saxon.character.representation.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/saxon.character.representation.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/saxon.character.representation.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/saxon.linenumbering.xml b/apache-fop/src/test/resources/docbook-xsl/params/saxon.linenumbering.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/saxon.linenumbering.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/saxon.linenumbering.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/saxon.tablecolumns.xml b/apache-fop/src/test/resources/docbook-xsl/params/saxon.tablecolumns.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/saxon.tablecolumns.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/saxon.tablecolumns.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/script.dir.xml b/apache-fop/src/test/resources/docbook-xsl/params/script.dir.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/script.dir.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/script.dir.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.autolabel.max.depth.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.autolabel.max.depth.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.autolabel.max.depth.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.autolabel.max.depth.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.autolabel.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.autolabel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.autolabel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.autolabel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.container.element.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.container.element.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.container.element.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.container.element.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.label.includes.component.label.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.label.includes.component.label.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.label.includes.component.label.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.label.includes.component.label.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.level1.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.level1.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.level1.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.level1.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.level2.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.level2.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.level2.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.level2.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.level3.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.level3.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.level3.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.level3.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.level4.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.level4.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.level4.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.level4.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.level5.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.level5.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.level5.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.level5.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.level6.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.level6.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.level6.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.level6.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.title.level1.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.title.level1.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.title.level1.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.title.level1.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.title.level2.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.title.level2.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.title.level2.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.title.level2.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.title.level3.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.title.level3.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.title.level3.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.title.level3.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.title.level4.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.title.level4.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.title.level4.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.title.level4.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.title.level5.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.title.level5.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.title.level5.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.title.level5.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.title.level6.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.title.level6.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.title.level6.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.title.level6.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/section.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/section.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/section.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/section.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/segmentedlist.as.table.xml b/apache-fop/src/test/resources/docbook-xsl/params/segmentedlist.as.table.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/segmentedlist.as.table.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/segmentedlist.as.table.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/sequential.links.xml b/apache-fop/src/test/resources/docbook-xsl/params/sequential.links.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/sequential.links.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/sequential.links.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/shade.verbatim.style.xml b/apache-fop/src/test/resources/docbook-xsl/params/shade.verbatim.style.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/shade.verbatim.style.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/shade.verbatim.style.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/shade.verbatim.xml b/apache-fop/src/test/resources/docbook-xsl/params/shade.verbatim.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/shade.verbatim.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/shade.verbatim.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/show.comments.xml b/apache-fop/src/test/resources/docbook-xsl/params/show.comments.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/show.comments.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/show.comments.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/show.foil.number.xml b/apache-fop/src/test/resources/docbook-xsl/params/show.foil.number.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/show.foil.number.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/show.foil.number.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/show.revisionflag.xml b/apache-fop/src/test/resources/docbook-xsl/params/show.revisionflag.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/show.revisionflag.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/show.revisionflag.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/showtoc.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/showtoc.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/showtoc.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/showtoc.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/side.float.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/side.float.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/side.float.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/side.float.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/side.region.precedence.xml b/apache-fop/src/test/resources/docbook-xsl/params/side.region.precedence.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/side.region.precedence.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/side.region.precedence.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/sidebar.float.type.xml b/apache-fop/src/test/resources/docbook-xsl/params/sidebar.float.type.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/sidebar.float.type.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/sidebar.float.type.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/sidebar.float.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/sidebar.float.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/sidebar.float.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/sidebar.float.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/sidebar.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/sidebar.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/sidebar.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/sidebar.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/sidebar.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/sidebar.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/sidebar.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/sidebar.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/simplesect.in.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/simplesect.in.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/simplesect.in.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/simplesect.in.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slide.font.family.xml b/apache-fop/src/test/resources/docbook-xsl/params/slide.font.family.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slide.font.family.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slide.font.family.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slide.title.font.family.xml b/apache-fop/src/test/resources/docbook-xsl/params/slide.title.font.family.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slide.title.font.family.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slide.title.font.family.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slides.js.xml b/apache-fop/src/test/resources/docbook-xsl/params/slides.js.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slides.js.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slides.js.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slides.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/slides.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slides.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slides.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slides.titlepage.author.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.author.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slides.titlepage.author.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.author.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slides.titlepage.authorgroup.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.authorgroup.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slides.titlepage.authorgroup.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.authorgroup.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slides.titlepage.corpauthor.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.corpauthor.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slides.titlepage.corpauthor.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.corpauthor.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slides.titlepage.master.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.master.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slides.titlepage.master.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.master.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slides.titlepage.pubdate.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.pubdate.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slides.titlepage.pubdate.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.pubdate.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slides.titlepage.region-body.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.region-body.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slides.titlepage.region-body.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.region-body.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slides.titlepage.subtitle.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.subtitle.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slides.titlepage.subtitle.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.subtitle.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slides.titlepage.title.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.title.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slides.titlepage.title.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slides.titlepage.title.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slidy.duration.xml b/apache-fop/src/test/resources/docbook-xsl/params/slidy.duration.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slidy.duration.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slidy.duration.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slidy.path.prefix.xml b/apache-fop/src/test/resources/docbook-xsl/params/slidy.path.prefix.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slidy.path.prefix.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slidy.path.prefix.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slidy.slidy.css.xml b/apache-fop/src/test/resources/docbook-xsl/params/slidy.slidy.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slidy.slidy.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slidy.slidy.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slidy.slidy.js.xml b/apache-fop/src/test/resources/docbook-xsl/params/slidy.slidy.js.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slidy.slidy.js.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slidy.slidy.js.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/slidy.user.css.xml b/apache-fop/src/test/resources/docbook-xsl/params/slidy.user.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/slidy.user.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/slidy.user.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/spacing.paras.xml b/apache-fop/src/test/resources/docbook-xsl/params/spacing.paras.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/spacing.paras.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/spacing.paras.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/speakernote.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/speakernote.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/speakernote.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/speakernote.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/speakernotes.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/speakernotes.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/speakernotes.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/speakernotes.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/subscript.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/subscript.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/subscript.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/subscript.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/superscript.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/superscript.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/superscript.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/superscript.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/suppress.footer.navigation.xml b/apache-fop/src/test/resources/docbook-xsl/params/suppress.footer.navigation.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/suppress.footer.navigation.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/suppress.footer.navigation.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/suppress.header.navigation.xml b/apache-fop/src/test/resources/docbook-xsl/params/suppress.header.navigation.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/suppress.header.navigation.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/suppress.header.navigation.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/suppress.homepage.title.xml b/apache-fop/src/test/resources/docbook-xsl/params/suppress.homepage.title.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/suppress.homepage.title.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/suppress.homepage.title.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/suppress.navigation.xml b/apache-fop/src/test/resources/docbook-xsl/params/suppress.navigation.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/suppress.navigation.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/suppress.navigation.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/svg.embedding.mode.fo.xml b/apache-fop/src/test/resources/docbook-xsl/params/svg.embedding.mode.fo.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/svg.embedding.mode.fo.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/svg.embedding.mode.fo.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/svg.embedding.mode.xml b/apache-fop/src/test/resources/docbook-xsl/params/svg.embedding.mode.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/svg.embedding.mode.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/svg.embedding.mode.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/symbol.font.family.xml b/apache-fop/src/test/resources/docbook-xsl/params/symbol.font.family.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/symbol.font.family.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/symbol.font.family.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.borders.with.css.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.borders.with.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.borders.with.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.borders.with.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.caption.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.caption.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.caption.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.caption.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.cell.border.color.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.cell.border.color.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.cell.border.color.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.cell.border.color.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.cell.border.style.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.cell.border.style.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.cell.border.style.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.cell.border.style.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.cell.border.thickness.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.cell.border.thickness.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.cell.border.thickness.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.cell.border.thickness.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.cell.padding.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.cell.padding.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.cell.padding.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.cell.padding.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.entry.padding.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.entry.padding.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.entry.padding.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.entry.padding.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.footnote.number.format.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.footnote.number.format.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.footnote.number.format.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.footnote.number.format.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.footnote.number.symbols.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.footnote.number.symbols.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.footnote.number.symbols.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.footnote.number.symbols.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.footnote.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.footnote.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.footnote.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.footnote.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.frame.border.color.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.frame.border.color.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.frame.border.color.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.frame.border.color.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.frame.border.style.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.frame.border.style.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.frame.border.style.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.frame.border.style.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.frame.border.thickness.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.frame.border.thickness.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.frame.border.thickness.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.frame.border.thickness.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.spacer.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.spacer.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.spacer.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.spacer.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/table.table.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/table.table.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/table.table.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/table.table.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/tablecolumns.extension.xml b/apache-fop/src/test/resources/docbook-xsl/params/tablecolumns.extension.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/tablecolumns.extension.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/tablecolumns.extension.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/target.database.document.xml b/apache-fop/src/test/resources/docbook-xsl/params/target.database.document.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/target.database.document.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/target.database.document.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/targets.filename.xml b/apache-fop/src/test/resources/docbook-xsl/params/targets.filename.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/targets.filename.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/targets.filename.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/task.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/task.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/task.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/task.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/template.xml b/apache-fop/src/test/resources/docbook-xsl/params/template.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/template.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/template.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/tex.math.delims.xml b/apache-fop/src/test/resources/docbook-xsl/params/tex.math.delims.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/tex.math.delims.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/tex.math.delims.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/tex.math.file.xml b/apache-fop/src/test/resources/docbook-xsl/params/tex.math.file.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/tex.math.file.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/tex.math.file.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/tex.math.in.alt.xml b/apache-fop/src/test/resources/docbook-xsl/params/tex.math.in.alt.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/tex.math.in.alt.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/tex.math.in.alt.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/text.home.xml b/apache-fop/src/test/resources/docbook-xsl/params/text.home.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/text.home.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/text.home.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/text.next.xml b/apache-fop/src/test/resources/docbook-xsl/params/text.next.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/text.next.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/text.next.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/text.prev.xml b/apache-fop/src/test/resources/docbook-xsl/params/text.prev.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/text.prev.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/text.prev.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/text.toc.xml b/apache-fop/src/test/resources/docbook-xsl/params/text.toc.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/text.toc.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/text.toc.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/text.up.xml b/apache-fop/src/test/resources/docbook-xsl/params/text.up.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/text.up.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/text.up.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/textbgcolor.xml b/apache-fop/src/test/resources/docbook-xsl/params/textbgcolor.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/textbgcolor.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/textbgcolor.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/textdata.default.encoding.xml b/apache-fop/src/test/resources/docbook-xsl/params/textdata.default.encoding.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/textdata.default.encoding.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/textdata.default.encoding.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/textinsert.extension.xml b/apache-fop/src/test/resources/docbook-xsl/params/textinsert.extension.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/textinsert.extension.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/textinsert.extension.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/title.font.family.xml b/apache-fop/src/test/resources/docbook-xsl/params/title.font.family.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/title.font.family.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/title.font.family.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/title.margin.left.xml b/apache-fop/src/test/resources/docbook-xsl/params/title.margin.left.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/title.margin.left.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/title.margin.left.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/titlefoil.html.xml b/apache-fop/src/test/resources/docbook-xsl/params/titlefoil.html.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/titlefoil.html.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/titlefoil.html.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.bg.color.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.bg.color.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.bg.color.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.bg.color.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.blank.graphic.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.blank.graphic.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.blank.graphic.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.blank.graphic.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.blank.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.blank.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.blank.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.blank.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.blank.text.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.blank.text.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.blank.text.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.blank.text.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.hide.show.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.hide.show.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.hide.show.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.hide.show.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.html.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.html.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.html.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.html.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.indent.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.indent.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.indent.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.indent.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.line.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.line.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.line.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.line.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.list.type.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.list.type.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.list.type.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.list.type.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.margin.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.margin.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.margin.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.margin.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.max.depth.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.max.depth.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.max.depth.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.max.depth.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.pointer.graphic.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.pointer.graphic.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.pointer.graphic.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.pointer.graphic.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.pointer.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.pointer.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.pointer.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.pointer.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.pointer.text.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.pointer.text.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.pointer.text.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.pointer.text.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.row.height.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.row.height.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.row.height.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.row.height.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.section.depth.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.section.depth.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.section.depth.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.section.depth.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.spacer.graphic.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.spacer.graphic.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.spacer.graphic.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.spacer.graphic.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.spacer.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.spacer.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.spacer.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.spacer.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.spacer.text.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.spacer.text.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.spacer.text.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.spacer.text.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/toc.width.xml b/apache-fop/src/test/resources/docbook-xsl/params/toc.width.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/toc.width.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/toc.width.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/ua.js.xml b/apache-fop/src/test/resources/docbook-xsl/params/ua.js.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/ua.js.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/ua.js.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/ulink.footnotes.xml b/apache-fop/src/test/resources/docbook-xsl/params/ulink.footnotes.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/ulink.footnotes.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/ulink.footnotes.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/ulink.hyphenate.chars.xml b/apache-fop/src/test/resources/docbook-xsl/params/ulink.hyphenate.chars.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/ulink.hyphenate.chars.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/ulink.hyphenate.chars.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/ulink.hyphenate.xml b/apache-fop/src/test/resources/docbook-xsl/params/ulink.hyphenate.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/ulink.hyphenate.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/ulink.hyphenate.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/ulink.show.xml b/apache-fop/src/test/resources/docbook-xsl/params/ulink.show.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/ulink.show.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/ulink.show.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/ulink.target.xml b/apache-fop/src/test/resources/docbook-xsl/params/ulink.target.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/ulink.target.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/ulink.target.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/up.image.xml b/apache-fop/src/test/resources/docbook-xsl/params/up.image.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/up.image.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/up.image.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/use.embed.for.svg.xml b/apache-fop/src/test/resources/docbook-xsl/params/use.embed.for.svg.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/use.embed.for.svg.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/use.embed.for.svg.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/use.extensions.xml b/apache-fop/src/test/resources/docbook-xsl/params/use.extensions.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/use.extensions.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/use.extensions.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/use.id.as.filename.xml b/apache-fop/src/test/resources/docbook-xsl/params/use.id.as.filename.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/use.id.as.filename.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/use.id.as.filename.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/use.id.function.xml b/apache-fop/src/test/resources/docbook-xsl/params/use.id.function.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/use.id.function.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/use.id.function.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/use.local.olink.style.xml b/apache-fop/src/test/resources/docbook-xsl/params/use.local.olink.style.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/use.local.olink.style.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/use.local.olink.style.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/use.role.as.xrefstyle.xml b/apache-fop/src/test/resources/docbook-xsl/params/use.role.as.xrefstyle.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/use.role.as.xrefstyle.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/use.role.as.xrefstyle.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/use.role.for.mediaobject.xml b/apache-fop/src/test/resources/docbook-xsl/params/use.role.for.mediaobject.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/use.role.for.mediaobject.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/use.role.for.mediaobject.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/use.svg.xml b/apache-fop/src/test/resources/docbook-xsl/params/use.svg.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/use.svg.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/use.svg.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/user.css.xml b/apache-fop/src/test/resources/docbook-xsl/params/user.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/user.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/user.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/variablelist.as.blocks.xml b/apache-fop/src/test/resources/docbook-xsl/params/variablelist.as.blocks.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/variablelist.as.blocks.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/variablelist.as.blocks.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/variablelist.as.table.xml b/apache-fop/src/test/resources/docbook-xsl/params/variablelist.as.table.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/variablelist.as.table.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/variablelist.as.table.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/variablelist.max.termlength.xml b/apache-fop/src/test/resources/docbook-xsl/params/variablelist.max.termlength.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/variablelist.max.termlength.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/variablelist.max.termlength.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/variablelist.term.break.after.xml b/apache-fop/src/test/resources/docbook-xsl/params/variablelist.term.break.after.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/variablelist.term.break.after.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/variablelist.term.break.after.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/variablelist.term.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/variablelist.term.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/variablelist.term.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/variablelist.term.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/variablelist.term.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/variablelist.term.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/variablelist.term.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/variablelist.term.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/verbatim.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/verbatim.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/verbatim.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/verbatim.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/webhelp.autolabel.xml b/apache-fop/src/test/resources/docbook-xsl/params/webhelp.autolabel.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/webhelp.autolabel.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/webhelp.autolabel.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/webhelp.base.dir.xml b/apache-fop/src/test/resources/docbook-xsl/params/webhelp.base.dir.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/webhelp.base.dir.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/webhelp.base.dir.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/webhelp.common.dir.xml b/apache-fop/src/test/resources/docbook-xsl/params/webhelp.common.dir.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/webhelp.common.dir.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/webhelp.common.dir.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/webhelp.default.topic.xml b/apache-fop/src/test/resources/docbook-xsl/params/webhelp.default.topic.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/webhelp.default.topic.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/webhelp.default.topic.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/webhelp.include.search.tab.xml b/apache-fop/src/test/resources/docbook-xsl/params/webhelp.include.search.tab.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/webhelp.include.search.tab.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/webhelp.include.search.tab.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/webhelp.indexer.language.xml b/apache-fop/src/test/resources/docbook-xsl/params/webhelp.indexer.language.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/webhelp.indexer.language.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/webhelp.indexer.language.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/webhelp.start.filename.xml b/apache-fop/src/test/resources/docbook-xsl/params/webhelp.start.filename.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/webhelp.start.filename.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/webhelp.start.filename.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/webhelp.tree.cookie.id.xml b/apache-fop/src/test/resources/docbook-xsl/params/webhelp.tree.cookie.id.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/webhelp.tree.cookie.id.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/webhelp.tree.cookie.id.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/wordml.template.xml b/apache-fop/src/test/resources/docbook-xsl/params/wordml.template.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/wordml.template.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/wordml.template.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/wrap.slidecontent.xml b/apache-fop/src/test/resources/docbook-xsl/params/wrap.slidecontent.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/wrap.slidecontent.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/wrap.slidecontent.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/writing.mode.xml b/apache-fop/src/test/resources/docbook-xsl/params/writing.mode.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/writing.mode.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/writing.mode.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/xbCollapsibleLists.js.xml b/apache-fop/src/test/resources/docbook-xsl/params/xbCollapsibleLists.js.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/xbCollapsibleLists.js.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/xbCollapsibleLists.js.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/xbDOM.js.xml b/apache-fop/src/test/resources/docbook-xsl/params/xbDOM.js.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/xbDOM.js.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/xbDOM.js.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/xbLibrary.js.xml b/apache-fop/src/test/resources/docbook-xsl/params/xbLibrary.js.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/xbLibrary.js.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/xbLibrary.js.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/xbStyle.js.xml b/apache-fop/src/test/resources/docbook-xsl/params/xbStyle.js.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/xbStyle.js.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/xbStyle.js.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/xep.extensions.xml b/apache-fop/src/test/resources/docbook-xsl/params/xep.extensions.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/xep.extensions.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/xep.extensions.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/xep.index.item.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/xep.index.item.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/xep.index.item.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/xep.index.item.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/xref.label-page.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/xref.label-page.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/xref.label-page.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/xref.label-page.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/xref.label-title.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/xref.label-title.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/xref.label-title.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/xref.label-title.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/xref.properties.xml b/apache-fop/src/test/resources/docbook-xsl/params/xref.properties.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/xref.properties.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/xref.properties.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/xref.title-page.separator.xml b/apache-fop/src/test/resources/docbook-xsl/params/xref.title-page.separator.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/xref.title-page.separator.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/xref.title-page.separator.xml
diff --git a/core-java/src/test/resources/docbook-xsl/params/xref.with.number.and.title.xml b/apache-fop/src/test/resources/docbook-xsl/params/xref.with.number.and.title.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/params/xref.with.number.and.title.xml
rename to apache-fop/src/test/resources/docbook-xsl/params/xref.with.number.and.title.xml
diff --git a/core-java/src/test/resources/docbook-xsl/profiling/profile-mode.xsl b/apache-fop/src/test/resources/docbook-xsl/profiling/profile-mode.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/profiling/profile-mode.xsl
rename to apache-fop/src/test/resources/docbook-xsl/profiling/profile-mode.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/profiling/profile.xsl b/apache-fop/src/test/resources/docbook-xsl/profiling/profile.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/profiling/profile.xsl
rename to apache-fop/src/test/resources/docbook-xsl/profiling/profile.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/profiling/strip-attributes.xsl b/apache-fop/src/test/resources/docbook-xsl/profiling/strip-attributes.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/profiling/strip-attributes.xsl
rename to apache-fop/src/test/resources/docbook-xsl/profiling/strip-attributes.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/profiling/xsl2profile.xsl b/apache-fop/src/test/resources/docbook-xsl/profiling/xsl2profile.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/profiling/xsl2profile.xsl
rename to apache-fop/src/test/resources/docbook-xsl/profiling/xsl2profile.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/blocks-spec.xml b/apache-fop/src/test/resources/docbook-xsl/roundtrip/blocks-spec.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/blocks-spec.xml
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/blocks-spec.xml
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/blocks2dbk.dtd b/apache-fop/src/test/resources/docbook-xsl/roundtrip/blocks2dbk.dtd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/blocks2dbk.dtd
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/blocks2dbk.dtd
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/blocks2dbk.xsl b/apache-fop/src/test/resources/docbook-xsl/roundtrip/blocks2dbk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/blocks2dbk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/blocks2dbk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/dbk2ooo.xsl b/apache-fop/src/test/resources/docbook-xsl/roundtrip/dbk2ooo.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/dbk2ooo.xsl
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/dbk2ooo.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/dbk2pages.xsl b/apache-fop/src/test/resources/docbook-xsl/roundtrip/dbk2pages.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/dbk2pages.xsl
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/dbk2pages.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/dbk2wordml.xsl b/apache-fop/src/test/resources/docbook-xsl/roundtrip/dbk2wordml.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/dbk2wordml.xsl
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/dbk2wordml.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/dbk2wp.xsl b/apache-fop/src/test/resources/docbook-xsl/roundtrip/dbk2wp.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/dbk2wp.xsl
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/dbk2wp.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/normalise-common.xsl b/apache-fop/src/test/resources/docbook-xsl/roundtrip/normalise-common.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/normalise-common.xsl
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/normalise-common.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/normalise2sections.xsl b/apache-fop/src/test/resources/docbook-xsl/roundtrip/normalise2sections.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/normalise2sections.xsl
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/normalise2sections.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/pages2normalise.xsl b/apache-fop/src/test/resources/docbook-xsl/roundtrip/pages2normalise.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/pages2normalise.xsl
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/pages2normalise.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/param.xml b/apache-fop/src/test/resources/docbook-xsl/roundtrip/param.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/param.xml
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/param.xml
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/param.xsl b/apache-fop/src/test/resources/docbook-xsl/roundtrip/param.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/param.xsl
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/param.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/sections-spec.xml b/apache-fop/src/test/resources/docbook-xsl/roundtrip/sections-spec.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/sections-spec.xml
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/sections-spec.xml
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/sections2blocks.xsl b/apache-fop/src/test/resources/docbook-xsl/roundtrip/sections2blocks.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/sections2blocks.xsl
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/sections2blocks.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/specifications.xml b/apache-fop/src/test/resources/docbook-xsl/roundtrip/specifications.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/specifications.xml
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/specifications.xml
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/template-pages.xml b/apache-fop/src/test/resources/docbook-xsl/roundtrip/template-pages.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/template-pages.xml
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/template-pages.xml
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/template.dot b/apache-fop/src/test/resources/docbook-xsl/roundtrip/template.dot
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/template.dot
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/template.dot
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/template.xml b/apache-fop/src/test/resources/docbook-xsl/roundtrip/template.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/template.xml
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/template.xml
diff --git a/core-java/src/test/resources/docbook-xsl/roundtrip/wordml2normalise.xsl b/apache-fop/src/test/resources/docbook-xsl/roundtrip/wordml2normalise.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/roundtrip/wordml2normalise.xsl
rename to apache-fop/src/test/resources/docbook-xsl/roundtrip/wordml2normalise.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/slides/README b/apache-fop/src/test/resources/docbook-xsl/slides/README
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/README
rename to apache-fop/src/test/resources/docbook-xsl/slides/README
diff --git a/core-java/src/test/resources/docbook-xsl/slides/RELEASE-NOTES.xml b/apache-fop/src/test/resources/docbook-xsl/slides/RELEASE-NOTES.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/RELEASE-NOTES.xml
rename to apache-fop/src/test/resources/docbook-xsl/slides/RELEASE-NOTES.xml
diff --git a/core-java/src/test/resources/docbook-xsl/slides/common/common.xsl b/apache-fop/src/test/resources/docbook-xsl/slides/common/common.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/common/common.xsl
rename to apache-fop/src/test/resources/docbook-xsl/slides/common/common.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/slides/doc/slides.xml b/apache-fop/src/test/resources/docbook-xsl/slides/doc/slides.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/doc/slides.xml
rename to apache-fop/src/test/resources/docbook-xsl/slides/doc/slides.xml
diff --git a/core-java/src/test/resources/docbook-xsl/slides/doc/user.css b/apache-fop/src/test/resources/docbook-xsl/slides/doc/user.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/doc/user.css
rename to apache-fop/src/test/resources/docbook-xsl/slides/doc/user.css
diff --git a/core-java/src/test/resources/docbook-xsl/slides/fo/param.xml b/apache-fop/src/test/resources/docbook-xsl/slides/fo/param.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/fo/param.xml
rename to apache-fop/src/test/resources/docbook-xsl/slides/fo/param.xml
diff --git a/core-java/src/test/resources/docbook-xsl/slides/fo/param.xsl b/apache-fop/src/test/resources/docbook-xsl/slides/fo/param.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/fo/param.xsl
rename to apache-fop/src/test/resources/docbook-xsl/slides/fo/param.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/slides/fo/plain-titlepage.xml b/apache-fop/src/test/resources/docbook-xsl/slides/fo/plain-titlepage.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/fo/plain-titlepage.xml
rename to apache-fop/src/test/resources/docbook-xsl/slides/fo/plain-titlepage.xml
diff --git a/core-java/src/test/resources/docbook-xsl/slides/fo/plain-titlepage.xsl b/apache-fop/src/test/resources/docbook-xsl/slides/fo/plain-titlepage.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/fo/plain-titlepage.xsl
rename to apache-fop/src/test/resources/docbook-xsl/slides/fo/plain-titlepage.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/slides/fo/plain.xsl b/apache-fop/src/test/resources/docbook-xsl/slides/fo/plain.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/fo/plain.xsl
rename to apache-fop/src/test/resources/docbook-xsl/slides/fo/plain.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/1.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/1.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/1.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/1.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/1.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/1.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/1.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/1.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/10.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/10.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/10.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/10.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/10.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/10.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/10.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/10.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/11.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/11.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/11.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/11.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/11.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/11.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/11.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/11.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/12.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/12.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/12.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/12.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/12.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/12.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/12.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/12.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/13.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/13.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/13.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/13.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/13.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/13.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/13.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/13.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/14.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/14.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/14.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/14.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/14.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/14.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/14.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/14.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/15.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/15.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/15.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/15.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/15.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/15.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/15.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/15.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/16.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/16.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/16.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/16.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/16.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/16.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/16.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/16.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/17.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/17.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/17.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/17.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/17.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/17.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/17.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/17.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/18.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/18.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/18.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/18.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/18.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/18.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/18.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/18.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/19.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/19.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/19.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/19.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/19.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/19.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/19.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/19.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/2.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/2.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/2.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/2.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/2.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/2.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/2.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/2.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/20.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/20.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/20.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/20.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/20.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/20.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/20.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/20.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/21.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/21.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/21.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/21.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/21.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/21.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/21.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/21.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/22.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/22.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/22.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/22.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/22.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/22.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/22.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/22.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/23.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/23.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/23.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/23.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/23.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/23.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/23.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/23.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/24.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/24.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/24.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/24.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/24.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/24.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/24.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/24.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/25.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/25.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/25.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/25.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/25.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/25.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/25.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/25.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/26.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/26.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/26.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/26.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/26.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/26.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/26.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/26.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/27.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/27.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/27.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/27.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/27.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/27.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/27.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/27.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/28.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/28.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/28.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/28.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/28.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/28.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/28.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/28.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/29.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/29.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/29.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/29.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/29.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/29.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/29.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/29.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/3.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/3.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/3.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/3.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/3.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/3.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/3.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/3.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/30.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/30.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/30.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/30.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/30.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/30.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/30.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/30.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/4.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/4.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/4.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/4.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/4.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/4.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/4.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/4.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/5.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/5.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/5.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/5.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/5.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/5.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/5.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/5.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/6.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/6.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/6.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/6.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/6.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/6.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/6.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/6.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/7.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/7.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/7.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/7.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/7.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/7.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/7.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/7.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/8.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/8.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/8.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/8.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/8.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/8.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/8.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/8.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/9.png b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/9.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/9.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/9.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/9.svg b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/9.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/9.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/9.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/callouts/gen.sh b/apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/gen.sh
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/callouts/gen.sh
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/callouts/gen.sh
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/face1.gif b/apache-fop/src/test/resources/docbook-xsl/slides/images/face1.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/face1.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/face1.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/face2.gif b/apache-fop/src/test/resources/docbook-xsl/slides/images/face2.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/face2.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/face2.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/face3.gif b/apache-fop/src/test/resources/docbook-xsl/slides/images/face3.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/face3.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/face3.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/images/face4.gif b/apache-fop/src/test/resources/docbook-xsl/slides/images/face4.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/images/face4.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/images/face4.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/locatingrules.xml b/apache-fop/src/test/resources/docbook-xsl/slides/locatingrules.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/locatingrules.xml
rename to apache-fop/src/test/resources/docbook-xsl/slides/locatingrules.xml
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/index-osf.html b/apache-fop/src/test/resources/docbook-xsl/slides/s5/index-osf.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/index-osf.html
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/index-osf.html
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/index-xoxo.html b/apache-fop/src/test/resources/docbook-xsl/slides/s5/index-xoxo.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/index-xoxo.html
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/index-xoxo.html
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/pix/S501.jpg b/apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/S501.jpg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/pix/S501.jpg
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/S501.jpg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/pix/S502.jpg b/apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/S502.jpg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/pix/S502.jpg
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/S502.jpg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/pix/S503.jpg b/apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/S503.jpg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/pix/S503.jpg
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/S503.jpg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/pix/S504.jpg b/apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/S504.jpg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/pix/S504.jpg
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/S504.jpg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/pix/mememe01.png b/apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/mememe01.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/pix/mememe01.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/mememe01.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/pix/mememe02.png b/apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/mememe02.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/pix/mememe02.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/mememe02.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/pix/mememe03.png b/apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/mememe03.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/pix/mememe03.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/mememe03.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/pix/mememe04.png b/apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/mememe04.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/pix/mememe04.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/mememe04.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/pix/mememe05.png b/apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/mememe05.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/pix/mememe05.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/mememe05.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/pix/s5filemap.png b/apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/s5filemap.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/pix/s5filemap.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/pix/s5filemap.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/bg-shade.png b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/bg-shade.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/bg-shade.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/bg-shade.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/blank.gif b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/blank.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/blank.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/blank.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/bodybg.gif b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/bodybg.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/bodybg.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/bodybg.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/framing.css b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/framing.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/framing.css
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/framing.css
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/iepngfix.htc b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/iepngfix.htc
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/iepngfix.htc
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/iepngfix.htc
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/notes.css b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/notes.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/notes.css
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/notes.css
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/opera.css b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/opera.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/opera.css
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/opera.css
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/outline.css b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/outline.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/outline.css
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/outline.css
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/pretty.css b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/pretty.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/pretty.css
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/pretty.css
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/print.css b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/print.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/print.css
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/print.css
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/s5-core.css b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/s5-core.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/s5-core.css
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/s5-core.css
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/slides.css b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/slides.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/slides.css
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/slides.css
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/slides.js b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/slides.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/default/slides.js
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/default/slides.js
diff --git a/core-java/src/test/resources/docbook-xsl/slides/s5/ui/s5-notes.html b/apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/s5-notes.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/s5/ui/s5-notes.html
rename to apache-fop/src/test/resources/docbook-xsl/slides/s5/ui/s5-notes.html
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/admonitions.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/admonitions.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/admonitions.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/admonitions.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/annotations.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/annotations.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/annotations.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/annotations.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/bibliography.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/bibliography.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/bibliography.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/bibliography.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/callouts.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/callouts.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/callouts.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/callouts.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/calstbl.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/calstbl.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/calstbl.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/calstbl.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/core.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/core.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/core.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/core.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/docbook.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/docbook.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/docbook.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/docbook.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/docbook1.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/docbook1.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/docbook1.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/docbook1.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/ebnf.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/ebnf.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/ebnf.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/ebnf.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/error.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/error.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/error.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/error.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/glossary.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/glossary.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/glossary.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/glossary.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/gui.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/gui.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/gui.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/gui.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/hier.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/hier.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/hier.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/hier.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/htmltbl.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/htmltbl.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/htmltbl.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/htmltbl.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/index.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/index.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/index.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/index.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/keyboard.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/keyboard.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/keyboard.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/keyboard.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/markup.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/markup.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/markup.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/markup.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/math.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/math.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/math.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/math.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/mathml.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/mathml.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/mathml.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/mathml.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/msgset.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/msgset.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/msgset.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/msgset.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/os.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/os.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/os.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/os.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/pool.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/pool.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/pool.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/pool.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/product.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/product.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/product.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/product.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/programming.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/programming.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/programming.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/programming.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/qandaset.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/qandaset.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/qandaset.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/qandaset.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/refentry.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/refentry.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/refentry.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/refentry.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/refsect1.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/refsect1.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/refsect1.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/refsect1.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/sect1.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/sect1.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/sect1.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/sect1.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/slides.rnc b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/slides.rnc
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/slides.rnc
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/slides.rnc
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/slides.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/slides.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/slides.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/slides.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/svg.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/svg.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/svg.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/svg.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/tasks.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/tasks.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/tasks.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/tasks.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/technical.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/technical.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/technical.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/technical.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/toc.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/toc.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/toc.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/toc.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/topic.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/topic.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/topic.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/topic.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/xlink.rng b/apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/xlink.rng
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/relaxng/xlink.rng
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/relaxng/xlink.rng
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/admonitions.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/admonitions.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/admonitions.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/admonitions.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/annotations.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/annotations.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/annotations.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/annotations.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/bibliography.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/bibliography.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/bibliography.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/bibliography.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/callouts.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/callouts.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/callouts.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/callouts.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/calstbl.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/calstbl.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/calstbl.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/calstbl.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/core.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/core.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/core.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/core.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/db.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/db.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/db.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/db.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/docbook.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/docbook.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/docbook.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/docbook.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/docbook1.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/docbook1.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/docbook1.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/docbook1.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/ebnf.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/ebnf.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/ebnf.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/ebnf.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/error.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/error.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/error.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/error.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/glossary.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/glossary.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/glossary.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/glossary.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/gui.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/gui.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/gui.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/gui.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/hier.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/hier.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/hier.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/hier.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/htmltbl.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/htmltbl.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/htmltbl.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/htmltbl.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/index.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/index.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/index.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/index.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/keyboard.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/keyboard.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/keyboard.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/keyboard.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/markup.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/markup.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/markup.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/markup.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/math.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/math.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/math.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/math.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/mathml.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/mathml.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/mathml.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/mathml.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/msgset.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/msgset.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/msgset.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/msgset.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/os.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/os.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/os.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/os.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/pool.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/pool.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/pool.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/pool.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/product.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/product.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/product.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/product.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/programming.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/programming.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/programming.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/programming.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/qandaset.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/qandaset.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/qandaset.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/qandaset.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/refentry.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/refentry.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/refentry.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/refentry.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/refsect1.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/refsect1.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/refsect1.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/refsect1.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/sect1.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/sect1.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/sect1.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/sect1.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/slides.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/slides.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/slides.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/slides.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/svg.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/svg.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/svg.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/svg.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/tasks.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/tasks.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/tasks.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/tasks.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/technical.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/technical.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/technical.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/technical.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/toc.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/toc.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/toc.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/toc.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/topic.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/topic.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/topic.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/topic.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/xlink.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/xlink.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/xlink.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/xlink.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/xlink1.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/xlink1.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/xlink1.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/xlink1.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/schema/xsd/xml.xsd b/apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/xml.xsd
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/schema/xsd/xml.xsd
rename to apache-fop/src/test/resources/docbook-xsl/slides/schema/xsd/xml.xsd
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/.htaccess b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/.htaccess
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/.htaccess
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/.htaccess
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/Overview.html b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/Overview.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/Overview.html
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/Overview.html
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/Overview.xhtml b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/Overview.xhtml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/Overview.xhtml
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/Overview.xhtml
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/blank.html b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/blank.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/blank.html
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/blank.html
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold-dim.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold-dim.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold-dim.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold-dim.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold-dim.png b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold-dim.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold-dim.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold-dim.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold.png b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-fold.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold-dim.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold-dim.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold-dim.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold-dim.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold-dim.png b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold-dim.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold-dim.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold-dim.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold.png b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-nofold.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold-dim.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold-dim.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold-dim.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold-dim.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold-dim.png b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold-dim.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold-dim.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold-dim.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold.png b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet-unfold.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet.png b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/bullet.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/example.png b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/example.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/example.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/example.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/example.svg b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/example.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/example.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/example.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/face1.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/face1.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/face1.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/face1.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/face2.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/face2.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/face2.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/face2.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/face3.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/face3.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/face3.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/face3.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/face4.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/face4.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/face4.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/face4.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/fold-bright.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/fold-bright.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/fold-bright.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/fold-bright.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/fold-dim.bmp b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/fold-dim.bmp
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/fold-dim.bmp
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/fold-dim.bmp
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/fold-dim.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/fold-dim.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/fold-dim.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/fold-dim.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/fold.bmp b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/fold.bmp
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/fold.bmp
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/fold.bmp
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/fold.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/fold.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/fold.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/fold.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/icon-blue.png b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/icon-blue.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/icon-blue.png
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/icon-blue.png
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/keys2.jpg b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/keys2.jpg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/keys2.jpg
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/keys2.jpg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/nofold-dim.bmp b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/nofold-dim.bmp
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/nofold-dim.bmp
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/nofold-dim.bmp
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/nofold-dim.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/nofold-dim.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/nofold-dim.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/nofold-dim.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/nofold.bmp b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/nofold.bmp
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/nofold.bmp
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/nofold.bmp
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold-bright.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold-bright.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold-bright.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold-bright.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold-dim.bmp b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold-dim.bmp
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold-dim.bmp
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold-dim.bmp
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold-dim.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold-dim.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold-dim.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold-dim.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold.bmp b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold.bmp
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold.bmp
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold.bmp
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/unfold.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-blue.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-blue.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-blue.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-blue.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-blue.svg b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-blue.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-blue.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-blue.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-slanted.jpg b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-slanted.jpg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-slanted.jpg
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-slanted.jpg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-white.gif b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-white.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-white.gif
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-white.gif
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-white.svg b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-white.svg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-white.svg
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/graphics/w3c-logo-white.svg
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/.htaccess b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/.htaccess
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/.htaccess
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/.htaccess
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.ca b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.ca
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.ca
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.ca
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.de b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.de
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.de
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.de
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.en b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.en
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.en
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.en
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.es b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.es
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.es
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.es
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.fr b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.fr
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.fr
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.fr
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.hu b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.hu
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.hu
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.hu
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.nl b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.nl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.nl
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.nl
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.pl b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.pl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.pl
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.pl
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.pt-br b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.pt-br
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.pt-br
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.pt-br
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.pt_br b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.pt_br
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.pt_br
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.pt_br
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.sv b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.sv
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.html.sv
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.html.sv
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.pt-br.html b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.pt-br.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/help/help.pt-br.html
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/help/help.pt-br.html
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/scripts/.htaccess b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/scripts/.htaccess
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/scripts/.htaccess
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/scripts/.htaccess
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/scripts/slidy.js b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/scripts/slidy.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/scripts/slidy.js
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/scripts/slidy.js
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/scripts/slidy.js.gz b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/scripts/slidy.js.gz
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/scripts/slidy.js.gz
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/scripts/slidy.js.gz
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/styles/.htaccess b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/styles/.htaccess
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/styles/.htaccess
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/styles/.htaccess
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/styles/slidy.css b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/styles/slidy.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/styles/slidy.css
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/styles/slidy.css
diff --git a/core-java/src/test/resources/docbook-xsl/slides/slidy/styles/w3c-blue.css b/apache-fop/src/test/resources/docbook-xsl/slides/slidy/styles/w3c-blue.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/slidy/styles/w3c-blue.css
rename to apache-fop/src/test/resources/docbook-xsl/slides/slidy/styles/w3c-blue.css
diff --git a/core-java/src/test/resources/docbook-xsl/slides/tools/dbs3-upgrade.xsl b/apache-fop/src/test/resources/docbook-xsl/slides/tools/dbs3-upgrade.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/tools/dbs3-upgrade.xsl
rename to apache-fop/src/test/resources/docbook-xsl/slides/tools/dbs3-upgrade.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/slides/xhtml/param.xml b/apache-fop/src/test/resources/docbook-xsl/slides/xhtml/param.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/xhtml/param.xml
rename to apache-fop/src/test/resources/docbook-xsl/slides/xhtml/param.xml
diff --git a/core-java/src/test/resources/docbook-xsl/slides/xhtml/param.xsl b/apache-fop/src/test/resources/docbook-xsl/slides/xhtml/param.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/xhtml/param.xsl
rename to apache-fop/src/test/resources/docbook-xsl/slides/xhtml/param.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/slides/xhtml/plain-titlepage.xml b/apache-fop/src/test/resources/docbook-xsl/slides/xhtml/plain-titlepage.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/xhtml/plain-titlepage.xml
rename to apache-fop/src/test/resources/docbook-xsl/slides/xhtml/plain-titlepage.xml
diff --git a/core-java/src/test/resources/docbook-xsl/slides/xhtml/plain-titlepage.xsl b/apache-fop/src/test/resources/docbook-xsl/slides/xhtml/plain-titlepage.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/xhtml/plain-titlepage.xsl
rename to apache-fop/src/test/resources/docbook-xsl/slides/xhtml/plain-titlepage.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/slides/xhtml/plain.xsl b/apache-fop/src/test/resources/docbook-xsl/slides/xhtml/plain.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/xhtml/plain.xsl
rename to apache-fop/src/test/resources/docbook-xsl/slides/xhtml/plain.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/slides/xhtml/s5.xsl b/apache-fop/src/test/resources/docbook-xsl/slides/xhtml/s5.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/xhtml/s5.xsl
rename to apache-fop/src/test/resources/docbook-xsl/slides/xhtml/s5.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/slides/xhtml/slidy.xsl b/apache-fop/src/test/resources/docbook-xsl/slides/xhtml/slidy.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/slides/xhtml/slidy.xsl
rename to apache-fop/src/test/resources/docbook-xsl/slides/xhtml/slidy.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/svn-commit.tmp b/apache-fop/src/test/resources/docbook-xsl/svn-commit.tmp
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/svn-commit.tmp
rename to apache-fop/src/test/resources/docbook-xsl/svn-commit.tmp
diff --git a/core-java/src/test/resources/docbook-xsl/template/titlepage.xml b/apache-fop/src/test/resources/docbook-xsl/template/titlepage.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/template/titlepage.xml
rename to apache-fop/src/test/resources/docbook-xsl/template/titlepage.xml
diff --git a/core-java/src/test/resources/docbook-xsl/template/titlepage.xsl b/apache-fop/src/test/resources/docbook-xsl/template/titlepage.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/template/titlepage.xsl
rename to apache-fop/src/test/resources/docbook-xsl/template/titlepage.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/tests/refentry.007.ns.xml b/apache-fop/src/test/resources/docbook-xsl/tests/refentry.007.ns.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/tests/refentry.007.ns.xml
rename to apache-fop/src/test/resources/docbook-xsl/tests/refentry.007.ns.xml
diff --git a/core-java/src/test/resources/docbook-xsl/tests/refentry.007.xml b/apache-fop/src/test/resources/docbook-xsl/tests/refentry.007.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/tests/refentry.007.xml
rename to apache-fop/src/test/resources/docbook-xsl/tests/refentry.007.xml
diff --git a/core-java/src/test/resources/docbook-xsl/tools/bin/docbook-xsl-update b/apache-fop/src/test/resources/docbook-xsl/tools/bin/docbook-xsl-update
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/tools/bin/docbook-xsl-update
rename to apache-fop/src/test/resources/docbook-xsl/tools/bin/docbook-xsl-update
diff --git a/core-java/src/test/resources/docbook-xsl/tools/make/Makefile.DocBook b/apache-fop/src/test/resources/docbook-xsl/tools/make/Makefile.DocBook
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/tools/make/Makefile.DocBook
rename to apache-fop/src/test/resources/docbook-xsl/tools/make/Makefile.DocBook
diff --git a/core-java/src/test/resources/docbook-xsl/tools/make/Makefile.combine b/apache-fop/src/test/resources/docbook-xsl/tools/make/Makefile.combine
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/tools/make/Makefile.combine
rename to apache-fop/src/test/resources/docbook-xsl/tools/make/Makefile.combine
diff --git a/core-java/src/test/resources/docbook-xsl/tools/make/Makefile.docParam b/apache-fop/src/test/resources/docbook-xsl/tools/make/Makefile.docParam
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/tools/make/Makefile.docParam
rename to apache-fop/src/test/resources/docbook-xsl/tools/make/Makefile.docParam
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/LICENSE b/apache-fop/src/test/resources/docbook-xsl/webhelp/LICENSE
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/LICENSE
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/LICENSE
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/Makefile.sample b/apache-fop/src/test/resources/docbook-xsl/webhelp/Makefile.sample
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/Makefile.sample
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/Makefile.sample
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/build.properties b/apache-fop/src/test/resources/docbook-xsl/webhelp/build.properties
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/build.properties
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/build.properties
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/build.xml b/apache-fop/src/test/resources/docbook-xsl/webhelp/build.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/build.xml
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/build.xml
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch01.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch01.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch01.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch01.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02s01.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02s01.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02s01.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02s01.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02s02.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02s02.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02s02.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02s02.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02s02s01.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02s02s01.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02s02s01.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02s02s01.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02s03.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02s03.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02s03.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02s03.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02s04.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02s04.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02s04.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02s04.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02s05.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02s05.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch02s05.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch02s05.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch03.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch03.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch03.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch03.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch03s01.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch03s01.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch03s01.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch03s01.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch03s02.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch03s02.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch03s02.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch03s02.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch03s02s01.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch03s02s01.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch03s02s01.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch03s02s01.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch04.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch04.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch04.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch04.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch05.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch05.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch05.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch05.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch05s01.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch05s01.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch05s01.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch05s01.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ch05s02.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch05s02.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ch05s02.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ch05s02.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/browserDetect.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/browserDetect.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/browserDetect.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/browserDetect.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/css/ie.css b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/css/ie.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/css/ie.css
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/css/ie.css
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/css/positioning.css b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/css/positioning.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/css/positioning.css
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/css/positioning.css
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/caution.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/caution.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/caution.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/caution.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/important.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/important.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/important.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/important.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/note.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/note.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/note.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/note.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/tip.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/tip.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/tip.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/tip.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/warning.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/warning.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/warning.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/admon/warning.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/1.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/1.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/1.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/1.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/10.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/10.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/10.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/10.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/11.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/11.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/11.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/11.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/12.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/12.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/12.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/12.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/13.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/13.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/13.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/13.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/14.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/14.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/14.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/14.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/15.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/15.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/15.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/15.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/16.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/16.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/16.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/16.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/17.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/17.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/17.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/17.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/18.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/18.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/18.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/18.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/19.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/19.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/19.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/19.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/2.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/2.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/2.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/2.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/20.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/20.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/20.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/20.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/21.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/21.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/21.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/21.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/22.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/22.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/22.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/22.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/23.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/23.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/23.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/23.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/24.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/24.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/24.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/24.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/25.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/25.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/25.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/25.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/26.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/26.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/26.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/26.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/27.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/27.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/27.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/27.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/28.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/28.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/28.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/28.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/29.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/29.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/29.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/29.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/3.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/3.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/3.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/3.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/30.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/30.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/30.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/30.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/4.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/4.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/4.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/4.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/5.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/5.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/5.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/5.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/6.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/6.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/6.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/6.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/7.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/7.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/7.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/7.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/8.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/8.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/8.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/8.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/9.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/9.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/9.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/callouts/9.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/header-bg.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/header-bg.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/header-bg.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/header-bg.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/header-bg.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/header-bg.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/header-bg.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/header-bg.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/highlight-blue.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/highlight-blue.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/highlight-blue.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/highlight-blue.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/highlight-yellow.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/highlight-yellow.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/highlight-yellow.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/highlight-yellow.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/loading.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/loading.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/loading.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/loading.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/logo.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/logo.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/logo.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/logo.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/next-arrow.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/next-arrow.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/next-arrow.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/next-arrow.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/previous-arrow.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/previous-arrow.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/previous-arrow.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/previous-arrow.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/search-icon.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/search-icon.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/search-icon.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/search-icon.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/showHideTreeIcons.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/showHideTreeIcons.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/showHideTreeIcons.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/showHideTreeIcons.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/sidebar.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/sidebar.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/sidebar.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/sidebar.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/starsSmall.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/starsSmall.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/starsSmall.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/starsSmall.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/toc-icon.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/toc-icon.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/images/toc-icon.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/images/toc-icon.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery-1.7.2.min.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery-1.7.2.min.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery-1.7.2.min.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery-1.7.2.min.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery-ui-1.8.2.custom.min.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery-ui-1.8.2.custom.min.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery-ui-1.8.2.custom.min.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery-ui-1.8.2.custom.min.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery.cookie.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery.cookie.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery.cookie.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery.cookie.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery.ui.all.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery.ui.all.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery.ui.all.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/jquery.ui.all.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/layout/jquery.layout.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/layout/jquery.layout.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/layout/jquery.layout.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/layout/jquery.layout.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/jquery-ui-1.8.21.custom.css b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/jquery-ui-1.8.21.custom.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/jquery-ui-1.8.21.custom.css
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/theme-redmond/jquery-ui-1.8.21.custom.css
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/file.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/file.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/file.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/file.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder-closed.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder-closed.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder-closed.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder-closed.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder-closed2.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder-closed2.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder-closed2.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder-closed2.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder2.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder2.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder2.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/folder2.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/minus.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/minus.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/minus.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/minus.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/plus.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/plus.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/plus.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/plus.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-black-line.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-black-line.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-black-line.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-black-line.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-black.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-black.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-black.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-black.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-default-line.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-default-line.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-default-line.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-default-line.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-default.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-default.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-default.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-default.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-famfamfam-line.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-famfamfam-line.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-famfamfam-line.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-famfamfam-line.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-famfamfam.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-famfamfam.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-famfamfam.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-famfamfam.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-gray-line.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-gray-line.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-gray-line.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-gray-line.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-gray.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-gray.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-gray.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-gray.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-red-line.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-red-line.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-red-line.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-red-line.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-red.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-red.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-red.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/images/treeview-red.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/jquery.treeview.css b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/jquery.treeview.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/jquery.treeview.css
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/jquery.treeview.css
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/jquery.treeview.min.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/jquery.treeview.min.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/jquery.treeview.min.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/jquery/treeview/jquery.treeview.min.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/main.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/main.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/main.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/main.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/common/splitterInit.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/splitterInit.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/common/splitterInit.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/common/splitterInit.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/favicon.ico b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/favicon.ico
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/favicon.ico
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/favicon.ico
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/images/sample.jpg b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/images/sample.jpg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/images/sample.jpg
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/images/sample.jpg
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/index.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/index.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/index.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/index.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/ix01.html b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ix01.html
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/ix01.html
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/ix01.html
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/default.props b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/default.props
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/default.props
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/default.props
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/en-us.props b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/en-us.props
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/en-us.props
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/en-us.props
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/es-es.props b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/es-es.props
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/es-es.props
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/es-es.props
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/htmlFileInfoList.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/htmlFileInfoList.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/htmlFileInfoList.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/htmlFileInfoList.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/index-1.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/index-1.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/index-1.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/index-1.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/index-2.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/index-2.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/index-2.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/index-2.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/index-3.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/index-3.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/index-3.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/index-3.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/ja-jp.props b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/ja-jp.props
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/ja-jp.props
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/ja-jp.props
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/l10n.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/l10n.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/l10n.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/l10n.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/nwSearchFnt.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/nwSearchFnt.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/nwSearchFnt.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/nwSearchFnt.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/punctuation.props b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/punctuation.props
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/punctuation.props
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/punctuation.props
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/stemmers/de_stemmer.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/stemmers/de_stemmer.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/stemmers/de_stemmer.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/stemmers/de_stemmer.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/stemmers/en_stemmer.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/stemmers/en_stemmer.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/stemmers/en_stemmer.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/stemmers/en_stemmer.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docs/search/stemmers/fr_stemmer.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/stemmers/fr_stemmer.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docs/search/stemmers/fr_stemmer.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docs/search/stemmers/fr_stemmer.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docsrc/images/sample.jpg b/apache-fop/src/test/resources/docbook-xsl/webhelp/docsrc/images/sample.jpg
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docsrc/images/sample.jpg
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docsrc/images/sample.jpg
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docsrc/readme.xml b/apache-fop/src/test/resources/docbook-xsl/webhelp/docsrc/readme.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docsrc/readme.xml
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docsrc/readme.xml
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/docsrc/xinclude-test.xml b/apache-fop/src/test/resources/docbook-xsl/webhelp/docsrc/xinclude-test.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/docsrc/xinclude-test.xml
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/docsrc/xinclude-test.xml
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/browserDetect.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/browserDetect.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/browserDetect.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/browserDetect.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/css/ie.css b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/css/ie.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/css/ie.css
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/css/ie.css
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/css/positioning.css b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/css/positioning.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/css/positioning.css
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/css/positioning.css
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/caution.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/caution.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/caution.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/caution.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/important.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/important.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/important.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/important.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/note.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/note.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/note.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/note.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/tip.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/tip.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/tip.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/tip.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/warning.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/warning.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/warning.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/admon/warning.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/1.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/1.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/1.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/1.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/10.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/10.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/10.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/10.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/11.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/11.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/11.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/11.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/12.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/12.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/12.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/12.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/13.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/13.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/13.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/13.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/14.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/14.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/14.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/14.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/15.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/15.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/15.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/15.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/16.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/16.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/16.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/16.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/17.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/17.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/17.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/17.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/18.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/18.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/18.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/18.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/19.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/19.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/19.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/19.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/2.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/2.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/2.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/2.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/20.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/20.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/20.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/20.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/21.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/21.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/21.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/21.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/22.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/22.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/22.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/22.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/23.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/23.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/23.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/23.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/24.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/24.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/24.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/24.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/25.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/25.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/25.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/25.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/26.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/26.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/26.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/26.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/27.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/27.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/27.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/27.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/28.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/28.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/28.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/28.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/29.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/29.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/29.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/29.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/3.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/3.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/3.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/3.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/30.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/30.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/30.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/30.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/4.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/4.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/4.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/4.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/5.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/5.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/5.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/5.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/6.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/6.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/6.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/6.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/7.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/7.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/7.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/7.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/8.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/8.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/8.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/8.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/9.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/9.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/9.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/callouts/9.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/header-bg.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/header-bg.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/header-bg.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/header-bg.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/header-bg.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/header-bg.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/header-bg.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/header-bg.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/highlight-blue.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/highlight-blue.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/highlight-blue.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/highlight-blue.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/highlight-yellow.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/highlight-yellow.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/highlight-yellow.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/highlight-yellow.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/loading.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/loading.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/loading.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/loading.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/logo.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/logo.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/logo.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/logo.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/next-arrow.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/next-arrow.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/next-arrow.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/next-arrow.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/previous-arrow.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/previous-arrow.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/previous-arrow.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/previous-arrow.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/search-icon.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/search-icon.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/search-icon.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/search-icon.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/showHideTreeIcons.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/showHideTreeIcons.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/showHideTreeIcons.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/showHideTreeIcons.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/sidebar.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/sidebar.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/sidebar.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/sidebar.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/starsSmall.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/starsSmall.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/starsSmall.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/starsSmall.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/toc-icon.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/toc-icon.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/images/toc-icon.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/images/toc-icon.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery-1.7.2.min.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery-1.7.2.min.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery-1.7.2.min.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery-1.7.2.min.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery-ui-1.8.2.custom.min.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery-ui-1.8.2.custom.min.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery-ui-1.8.2.custom.min.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery-ui-1.8.2.custom.min.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery.cookie.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery.cookie.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery.cookie.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery.cookie.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery.ui.all.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery.ui.all.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery.ui.all.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/jquery.ui.all.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/layout/jquery.layout.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/layout/jquery.layout.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/layout/jquery.layout.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/layout/jquery.layout.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.21.custom.css b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.21.custom.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.21.custom.css
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.21.custom.css
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/file.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/file.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/file.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/file.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder-closed.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder-closed.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder-closed.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder-closed.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder-closed2.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder-closed2.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder-closed2.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder-closed2.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder2.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder2.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder2.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/folder2.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/minus.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/minus.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/minus.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/minus.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/plus.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/plus.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/plus.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/plus.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-black-line.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-black-line.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-black-line.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-black-line.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-black.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-black.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-black.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-black.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-default-line.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-default-line.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-default-line.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-default-line.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-default.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-default.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-default.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-default.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-famfamfam-line.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-famfamfam-line.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-famfamfam-line.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-famfamfam-line.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-famfamfam.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-famfamfam.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-famfamfam.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-famfamfam.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-gray-line.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-gray-line.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-gray-line.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-gray-line.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-gray.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-gray.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-gray.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-gray.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-red-line.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-red-line.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-red-line.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-red-line.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-red.gif b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-red.gif
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-red.gif
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/images/treeview-red.gif
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/jquery.treeview.css b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/jquery.treeview.css
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/jquery.treeview.css
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/jquery.treeview.css
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/jquery.treeview.min.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/jquery.treeview.min.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/jquery.treeview.min.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/jquery/treeview/jquery.treeview.min.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/main.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/main.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/main.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/main.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/common/splitterInit.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/splitterInit.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/common/splitterInit.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/common/splitterInit.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/favicon.ico b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/favicon.ico
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/favicon.ico
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/favicon.ico
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/search/default.props b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/default.props
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/search/default.props
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/default.props
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/search/en-us.props b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/en-us.props
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/search/en-us.props
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/en-us.props
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/search/es-es.props b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/es-es.props
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/search/es-es.props
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/es-es.props
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/search/ja-jp.props b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/ja-jp.props
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/search/ja-jp.props
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/ja-jp.props
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/search/nwSearchFnt.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/nwSearchFnt.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/search/nwSearchFnt.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/nwSearchFnt.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/search/punctuation.props b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/punctuation.props
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/search/punctuation.props
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/punctuation.props
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/search/stemmers/de_stemmer.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/stemmers/de_stemmer.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/search/stemmers/de_stemmer.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/stemmers/de_stemmer.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/search/stemmers/en_stemmer.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/stemmers/en_stemmer.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/search/stemmers/en_stemmer.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/stemmers/en_stemmer.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/template/search/stemmers/fr_stemmer.js b/apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/stemmers/fr_stemmer.js
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/template/search/stemmers/fr_stemmer.js
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/template/search/stemmers/fr_stemmer.js
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/xsl/titlepage.templates.xml b/apache-fop/src/test/resources/docbook-xsl/webhelp/xsl/titlepage.templates.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/xsl/titlepage.templates.xml
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/xsl/titlepage.templates.xml
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/xsl/titlepage.templates.xsl b/apache-fop/src/test/resources/docbook-xsl/webhelp/xsl/titlepage.templates.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/xsl/titlepage.templates.xsl
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/xsl/titlepage.templates.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/xsl/webhelp-common.xsl b/apache-fop/src/test/resources/docbook-xsl/webhelp/xsl/webhelp-common.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/xsl/webhelp-common.xsl
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/xsl/webhelp-common.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/webhelp/xsl/webhelp.xsl b/apache-fop/src/test/resources/docbook-xsl/webhelp/xsl/webhelp.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/webhelp/xsl/webhelp.xsl
rename to apache-fop/src/test/resources/docbook-xsl/webhelp/xsl/webhelp.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/autolayout.xsl b/apache-fop/src/test/resources/docbook-xsl/website/autolayout.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/autolayout.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/autolayout.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/chunk-common.xsl b/apache-fop/src/test/resources/docbook-xsl/website/chunk-common.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/chunk-common.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/chunk-common.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/chunk-tabular.xsl b/apache-fop/src/test/resources/docbook-xsl/website/chunk-tabular.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/chunk-tabular.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/chunk-tabular.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/chunk-website.xsl b/apache-fop/src/test/resources/docbook-xsl/website/chunk-website.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/chunk-website.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/chunk-website.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/head.xsl b/apache-fop/src/test/resources/docbook-xsl/website/head.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/head.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/head.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/makefile-dep.xsl b/apache-fop/src/test/resources/docbook-xsl/website/makefile-dep.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/makefile-dep.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/makefile-dep.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/olink.xsl b/apache-fop/src/test/resources/docbook-xsl/website/olink.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/olink.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/olink.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/param.xml b/apache-fop/src/test/resources/docbook-xsl/website/param.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/param.xml
rename to apache-fop/src/test/resources/docbook-xsl/website/param.xml
diff --git a/core-java/src/test/resources/docbook-xsl/website/param.xsl b/apache-fop/src/test/resources/docbook-xsl/website/param.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/param.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/param.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/rss.xsl b/apache-fop/src/test/resources/docbook-xsl/website/rss.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/rss.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/rss.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/tabular.xsl b/apache-fop/src/test/resources/docbook-xsl/website/tabular.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/tabular.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/tabular.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/toc-tabular.xsl b/apache-fop/src/test/resources/docbook-xsl/website/toc-tabular.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/toc-tabular.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/toc-tabular.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/toc.xsl b/apache-fop/src/test/resources/docbook-xsl/website/toc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/toc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/toc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/website-common.xsl b/apache-fop/src/test/resources/docbook-xsl/website/website-common.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/website-common.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/website-common.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/website-targets.xsl b/apache-fop/src/test/resources/docbook-xsl/website/website-targets.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/website-targets.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/website-targets.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/website.xsl b/apache-fop/src/test/resources/docbook-xsl/website/website.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/website.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/website.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/website/xbel.xsl b/apache-fop/src/test/resources/docbook-xsl/website/xbel.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/website/xbel.xsl
rename to apache-fop/src/test/resources/docbook-xsl/website/xbel.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/admon.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/admon.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/admon.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/admon.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/annotations.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/annotations.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/annotations.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/annotations.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/autoidx-kimber.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/autoidx-kimber.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/autoidx-kimber.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/autoidx-kimber.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/autoidx-kosek.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/autoidx-kosek.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/autoidx-kosek.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/autoidx-kosek.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/autoidx-ng.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/autoidx-ng.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/autoidx-ng.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/autoidx-ng.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/autoidx.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/autoidx.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/autoidx.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/autoidx.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/autotoc.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/autotoc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/autotoc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/autotoc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/biblio-iso690.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/biblio-iso690.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/biblio-iso690.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/biblio-iso690.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/biblio.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/biblio.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/biblio.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/biblio.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/block.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/block.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/block.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/block.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/callout.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/callout.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/callout.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/callout.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/changebars.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/changebars.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/changebars.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/changebars.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunk-changebars.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunk-changebars.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunk-changebars.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunk-changebars.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunk-code.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunk-code.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunk-code.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunk-code.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunk-common.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunk-common.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunk-common.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunk-common.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunk.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunker.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunker.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunker.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunker.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunkfast.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunkfast.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunkfast.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunkfast.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunktoc.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunktoc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/chunktoc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/chunktoc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/component.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/component.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/component.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/component.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/division.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/division.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/division.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/division.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/docbook.css.xml b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/docbook.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/docbook.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/docbook.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/ebnf.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/ebnf.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/ebnf.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/ebnf.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/footnote.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/footnote.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/footnote.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/footnote.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/formal.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/formal.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/formal.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/formal.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/glossary.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/glossary.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/glossary.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/glossary.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/graphics.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/graphics.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/graphics.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/graphics.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/highlight.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/highlight.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/highlight.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/highlight.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/html-rtf.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/html-rtf.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/html-rtf.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/html-rtf.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/html.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/html.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/html.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/html.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/htmltbl.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/htmltbl.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/htmltbl.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/htmltbl.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/index.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/index.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/index.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/index.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/info.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/info.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/info.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/info.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/inline.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/inline.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/inline.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/inline.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/keywords.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/keywords.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/keywords.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/keywords.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/lists.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/lists.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/lists.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/lists.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/maketoc.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/maketoc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/maketoc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/maketoc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/manifest.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/manifest.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/manifest.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/manifest.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/math.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/math.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/math.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/math.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/oldchunker.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/oldchunker.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/oldchunker.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/oldchunker.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/onechunk.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/onechunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/onechunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/onechunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/param.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/param.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/param.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/param.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/pi.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/pi.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/pi.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/pi.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/profile-chunk-code.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/profile-chunk-code.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/profile-chunk-code.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/profile-chunk-code.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/profile-chunk.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/profile-chunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/profile-chunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/profile-chunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/profile-docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/profile-docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/profile-docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/profile-docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/profile-onechunk.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/profile-onechunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/profile-onechunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/profile-onechunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/qandaset.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/qandaset.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/qandaset.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/qandaset.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/refentry.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/refentry.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/refentry.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/refentry.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/sections.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/sections.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/sections.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/sections.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/synop.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/synop.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/synop.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/synop.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/table.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/table.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/table.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/table.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/task.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/task.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/task.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/task.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/titlepage.templates.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/titlepage.templates.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/titlepage.templates.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/titlepage.templates.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/titlepage.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/titlepage.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/titlepage.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/titlepage.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/toc.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/toc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/toc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/toc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/verbatim.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/verbatim.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/verbatim.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/verbatim.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml-1_1/xref.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/xref.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml-1_1/xref.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml-1_1/xref.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/admon.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/admon.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/admon.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/admon.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/annotations.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/annotations.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/annotations.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/annotations.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/autoidx-kimber.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/autoidx-kimber.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/autoidx-kimber.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/autoidx-kimber.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/autoidx-kosek.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/autoidx-kosek.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/autoidx-kosek.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/autoidx-kosek.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/autoidx-ng.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/autoidx-ng.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/autoidx-ng.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/autoidx-ng.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/autoidx.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/autoidx.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/autoidx.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/autoidx.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/autotoc.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/autotoc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/autotoc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/autotoc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/biblio-iso690.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/biblio-iso690.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/biblio-iso690.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/biblio-iso690.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/biblio.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/biblio.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/biblio.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/biblio.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/block.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/block.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/block.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/block.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/callout.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/callout.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/callout.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/callout.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/changebars.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/changebars.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/changebars.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/changebars.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/chunk-changebars.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/chunk-changebars.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/chunk-changebars.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/chunk-changebars.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/chunk-code.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/chunk-code.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/chunk-code.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/chunk-code.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/chunk-common.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/chunk-common.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/chunk-common.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/chunk-common.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/chunk.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/chunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/chunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/chunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/chunker.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/chunker.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/chunker.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/chunker.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/chunkfast.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/chunkfast.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/chunkfast.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/chunkfast.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/chunktoc.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/chunktoc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/chunktoc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/chunktoc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/component.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/component.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/component.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/component.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/division.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/division.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/division.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/division.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/docbook-no-doctype.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/docbook-no-doctype.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/docbook-no-doctype.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/docbook-no-doctype.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/docbook.css.xml b/apache-fop/src/test/resources/docbook-xsl/xhtml/docbook.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/docbook.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/docbook.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/ebnf.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/ebnf.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/ebnf.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/ebnf.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/footnote.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/footnote.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/footnote.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/footnote.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/formal.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/formal.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/formal.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/formal.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/glossary.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/glossary.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/glossary.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/glossary.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/graphics.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/graphics.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/graphics.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/graphics.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/highlight.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/highlight.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/highlight.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/highlight.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/html-rtf.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/html-rtf.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/html-rtf.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/html-rtf.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/html.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/html.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/html.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/html.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/htmltbl.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/htmltbl.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/htmltbl.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/htmltbl.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/index.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/index.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/index.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/index.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/info.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/info.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/info.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/info.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/inline.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/inline.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/inline.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/inline.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/keywords.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/keywords.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/keywords.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/keywords.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/lists.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/lists.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/lists.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/lists.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/maketoc.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/maketoc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/maketoc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/maketoc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/manifest.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/manifest.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/manifest.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/manifest.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/math.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/math.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/math.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/math.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/oldchunker.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/oldchunker.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/oldchunker.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/oldchunker.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/onechunk.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/onechunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/onechunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/onechunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/param.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/param.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/param.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/param.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/pi.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/pi.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/pi.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/pi.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/profile-chunk-code.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/profile-chunk-code.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/profile-chunk-code.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/profile-chunk-code.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/profile-chunk.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/profile-chunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/profile-chunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/profile-chunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/profile-docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/profile-docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/profile-docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/profile-docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/profile-onechunk.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/profile-onechunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/profile-onechunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/profile-onechunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/qandaset.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/qandaset.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/qandaset.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/qandaset.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/refentry.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/refentry.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/refentry.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/refentry.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/sections.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/sections.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/sections.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/sections.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/synop.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/synop.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/synop.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/synop.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/table.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/table.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/table.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/table.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/task.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/task.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/task.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/task.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/titlepage.templates.xml b/apache-fop/src/test/resources/docbook-xsl/xhtml/titlepage.templates.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/titlepage.templates.xml
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/titlepage.templates.xml
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/titlepage.templates.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/titlepage.templates.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/titlepage.templates.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/titlepage.templates.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/titlepage.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/titlepage.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/titlepage.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/titlepage.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/toc.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/toc.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/toc.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/toc.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/verbatim.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/verbatim.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/verbatim.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/verbatim.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml/xref.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml/xref.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml/xref.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml/xref.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml5/README b/apache-fop/src/test/resources/docbook-xsl/xhtml5/README
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml5/README
rename to apache-fop/src/test/resources/docbook-xsl/xhtml5/README
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml5/chunk.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml5/chunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml5/chunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml5/chunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml5/chunkfast.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml5/chunkfast.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml5/chunkfast.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml5/chunkfast.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml5/docbook.css.xml b/apache-fop/src/test/resources/docbook-xsl/xhtml5/docbook.css.xml
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml5/docbook.css.xml
rename to apache-fop/src/test/resources/docbook-xsl/xhtml5/docbook.css.xml
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml5/docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml5/docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml5/docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml5/docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml5/html5-chunk-mods.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml5/html5-chunk-mods.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml5/html5-chunk-mods.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml5/html5-chunk-mods.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml5/html5-element-mods.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml5/html5-element-mods.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml5/html5-element-mods.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml5/html5-element-mods.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml5/onechunk.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml5/onechunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml5/onechunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml5/onechunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml5/profile-chunk.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml5/profile-chunk.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml5/profile-chunk.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml5/profile-chunk.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml5/profile-docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml5/profile-docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml5/profile-docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml5/profile-docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml5/xhtml-docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml5/xhtml-docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml5/xhtml-docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml5/xhtml-docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml5/xhtml-profile-docbook.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml5/xhtml-profile-docbook.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml5/xhtml-profile-docbook.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml5/xhtml-profile-docbook.xsl
diff --git a/core-java/src/test/resources/docbook-xsl/xhtml5/xhtml2xhtml5.xsl b/apache-fop/src/test/resources/docbook-xsl/xhtml5/xhtml2xhtml5.xsl
similarity index 100%
rename from core-java/src/test/resources/docbook-xsl/xhtml5/xhtml2xhtml5.xsl
rename to apache-fop/src/test/resources/docbook-xsl/xhtml5/xhtml2xhtml5.xsl
diff --git a/core-java/src/test/resources/hello.fo b/apache-fop/src/test/resources/hello.fo
similarity index 100%
rename from core-java/src/test/resources/hello.fo
rename to apache-fop/src/test/resources/hello.fo
diff --git a/core-java/src/test/resources/hello.html b/apache-fop/src/test/resources/hello.html
similarity index 100%
rename from core-java/src/test/resources/hello.html
rename to apache-fop/src/test/resources/hello.html
diff --git a/apache-fop/src/test/resources/hello.pdf b/apache-fop/src/test/resources/hello.pdf
new file mode 100644
index 0000000000..4f5f126797
Binary files /dev/null and b/apache-fop/src/test/resources/hello.pdf differ
diff --git a/core-java/src/test/resources/hello.xml b/apache-fop/src/test/resources/hello.xml
similarity index 100%
rename from core-java/src/test/resources/hello.xml
rename to apache-fop/src/test/resources/hello.xml
diff --git a/apache-fop/src/test/resources/hello1.pdf b/apache-fop/src/test/resources/hello1.pdf
new file mode 100644
index 0000000000..946263df89
Binary files /dev/null and b/apache-fop/src/test/resources/hello1.pdf differ
diff --git a/apache-fop/src/test/resources/hello2.pdf b/apache-fop/src/test/resources/hello2.pdf
new file mode 100644
index 0000000000..65d1caa56d
Binary files /dev/null and b/apache-fop/src/test/resources/hello2.pdf differ
diff --git a/core-java/src/test/resources/xhtml2fo.xsl b/apache-fop/src/test/resources/xhtml2fo.xsl
similarity index 100%
rename from core-java/src/test/resources/xhtml2fo.xsl
rename to apache-fop/src/test/resources/xhtml2fo.xsl
diff --git a/core-java-8/.classpath b/core-java-8/.classpath
index 5efa587d72..31caff7e82 100644
--- a/core-java-8/.classpath
+++ b/core-java-8/.classpath
@@ -32,5 +32,9 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/commons-io-2.4/commons-io-2.4.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/guava-18.0.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/hamcrest-all-1.3.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/core-java/.classpath b/core-java/.classpath
index 0720e4851b..5c87415e27 100644
--- a/core-java/.classpath
+++ b/core-java/.classpath
@@ -27,10 +27,21 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/commons-io-2.4/commons-io-2.4.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/guava-18.0.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/fop-1.1/build/fop.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/jtidy-r938.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/herold-6.1.0-188/herold/jars/herold.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/fop-1.1/lib/avalon-framework-4.2.0.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/fop-1.1/lib/batik-all-1.7.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/fop-1.1/lib/commons-io-1.3.1.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/fop-1.1/lib/commons-logging-1.0.4.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/fop-1.1/lib/serializer-2.7.0.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/fop-1.1/lib/xalan-2.7.0.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/fop-1.1/lib/xercesImpl-2.7.1.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/fop-1.1/lib/xml-apis-1.3.04.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/fop-1.1/lib/xml-apis-ext-1.3.04.jar"/>
+	<classpathentry kind="lib" path="/Users/ESSAM/Desktop/fop-1.1/lib/xmlgraphics-commons-1.5.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/core-java/.settings/org.eclipse.jdt.core.prefs b/core-java/.settings/org.eclipse.jdt.core.prefs
index 723e5b1245..718a62c499 100644
--- a/core-java/.settings/org.eclipse.jdt.core.prefs
+++ b/core-java/.settings/org.eclipse.jdt.core.prefs
@@ -1,13 +1,14 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -47,6 +48,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
@@ -67,6 +69,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
@@ -90,6 +93,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/core-java/output1.pdf b/core-java/output1.pdf
new file mode 100644
index 0000000000..e69de29bb2