diff --git a/build.third_step0-jdk11.gradle b/build.third_step0-jdk11.gradle
index 8885765cd..2cbcf2b15 100644
--- a/build.third_step0-jdk11.gradle
+++ b/build.third_step0-jdk11.gradle
@@ -50,8 +50,8 @@ def maven_version="${version}-${MVN_BRANCH}-SNAPSHOT"
 def jar_version = version
 
 configurations {
-    thirdjar
-	sigar
+    // thirdjar
+	// sigar
 }
 
 dependencies {
diff --git a/build.third_step0.gradle b/build.third_step0.gradle
index 15c38807b..5e6412bc0 100644
--- a/build.third_step0.gradle
+++ b/build.third_step0.gradle
@@ -50,8 +50,8 @@ def maven_version="${version}-${MVN_BRANCH}-SNAPSHOT"
 def jar_version = version
 
 configurations {
-    thirdjar
-	sigar
+    // thirdjar
+	// sigar
 }
 
 dependencies {
diff --git a/fine-third-jdk8/xml-apis/README.md b/fine-third-jdk8/xml-apis/README.md
index 6e1102448..9f22c102b 100644
--- a/fine-third-jdk8/xml-apis/README.md
+++ b/fine-third-jdk8/xml-apis/README.md
@@ -1,2 +1,3 @@
 源码地址:https://www.mvnjar.com/xml-apis/xml-apis/1.4.01/detail.html <br>
-版本:1.4.01
\ No newline at end of file
+版本:1.4.01 <br>
+注：一部分源码已经挪到了 fine-xmlgraphics/xmlgraphics-batik 中
\ No newline at end of file
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/apache/xmlcommons/Version.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/apache/xmlcommons/Version.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/apache/xmlcommons/Version.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/apache/xmlcommons/Version.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/apache/xmlcommons/Version.src b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/apache/xmlcommons/Version.src
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/apache/xmlcommons/Version.src
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/apache/xmlcommons/Version.src
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/AttributeCondition.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/AttributeCondition.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/AttributeCondition.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/AttributeCondition.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/CSSException.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/CSSException.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/CSSException.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/CSSException.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/CSSParseException.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/CSSParseException.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/CSSParseException.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/CSSParseException.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/CharacterDataSelector.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/CharacterDataSelector.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/CharacterDataSelector.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/CharacterDataSelector.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/CombinatorCondition.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/CombinatorCondition.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/CombinatorCondition.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/CombinatorCondition.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/Condition.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/Condition.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/Condition.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/Condition.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/ConditionFactory.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/ConditionFactory.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/ConditionFactory.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/ConditionFactory.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/ConditionalSelector.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/ConditionalSelector.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/ConditionalSelector.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/ConditionalSelector.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/ContentCondition.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/ContentCondition.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/ContentCondition.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/ContentCondition.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/DescendantSelector.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/DescendantSelector.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/DescendantSelector.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/DescendantSelector.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/DocumentHandler.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/DocumentHandler.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/DocumentHandler.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/DocumentHandler.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/ElementSelector.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/ElementSelector.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/ElementSelector.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/ElementSelector.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/ErrorHandler.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/ErrorHandler.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/ErrorHandler.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/ErrorHandler.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/InputSource.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/InputSource.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/InputSource.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/InputSource.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/LangCondition.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/LangCondition.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/LangCondition.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/LangCondition.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/LexicalUnit.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/LexicalUnit.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/LexicalUnit.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/LexicalUnit.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/Locator.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/Locator.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/Locator.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/Locator.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/NegativeCondition.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/NegativeCondition.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/NegativeCondition.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/NegativeCondition.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/NegativeSelector.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/NegativeSelector.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/NegativeSelector.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/NegativeSelector.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/Parser.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/Parser.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/Parser.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/Parser.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/PositionalCondition.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/PositionalCondition.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/PositionalCondition.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/PositionalCondition.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/ProcessingInstructionSelector.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/ProcessingInstructionSelector.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/ProcessingInstructionSelector.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/ProcessingInstructionSelector.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/SACMediaList.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/SACMediaList.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/SACMediaList.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/SACMediaList.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/Selector.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/Selector.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/Selector.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/Selector.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/SelectorFactory.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/SelectorFactory.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/SelectorFactory.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/SelectorFactory.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/SelectorList.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/SelectorList.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/SelectorList.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/SelectorList.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/SiblingSelector.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/SiblingSelector.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/SiblingSelector.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/SiblingSelector.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/SimpleSelector.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/SimpleSelector.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/SimpleSelector.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/SimpleSelector.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/helpers/ParserFactory.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/helpers/ParserFactory.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/css/sac/helpers/ParserFactory.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/css/sac/helpers/ParserFactory.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/smil/ElementTimeControl.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/smil/ElementTimeControl.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/smil/ElementTimeControl.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/smil/ElementTimeControl.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/smil/TimeEvent.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/smil/TimeEvent.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/smil/TimeEvent.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/smil/TimeEvent.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/EventListenerInitializer.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/EventListenerInitializer.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/EventListenerInitializer.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/EventListenerInitializer.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/GetSVGDocument.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/GetSVGDocument.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/GetSVGDocument.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/GetSVGDocument.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAltGlyphDefElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAltGlyphDefElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAltGlyphDefElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAltGlyphDefElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAltGlyphElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAltGlyphElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAltGlyphElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAltGlyphElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAltGlyphItemElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAltGlyphItemElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAltGlyphItemElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAltGlyphItemElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAngle.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAngle.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAngle.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAngle.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimateColorElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimateColorElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimateColorElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimateColorElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimateElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimateElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimateElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimateElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimateMotionElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimateMotionElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimateMotionElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimateMotionElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimateTransformElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimateTransformElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimateTransformElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimateTransformElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedAngle.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedAngle.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedAngle.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedAngle.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedBoolean.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedBoolean.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedBoolean.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedBoolean.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedEnumeration.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedEnumeration.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedEnumeration.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedEnumeration.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedInteger.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedInteger.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedInteger.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedInteger.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedLength.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedLength.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedLength.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedLength.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedLengthList.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedLengthList.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedLengthList.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedLengthList.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedNumber.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedNumber.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedNumber.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedNumber.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedNumberList.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedNumberList.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedNumberList.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedNumberList.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedPathData.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedPathData.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedPathData.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedPathData.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedPoints.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedPoints.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedPoints.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedPoints.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedPreserveAspectRatio.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedPreserveAspectRatio.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedPreserveAspectRatio.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedPreserveAspectRatio.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedRect.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedRect.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedRect.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedRect.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedString.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedString.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedString.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedString.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedTransformList.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedTransformList.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimatedTransformList.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimatedTransformList.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimationElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimationElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGAnimationElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGAnimationElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGCSSRule.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGCSSRule.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGCSSRule.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGCSSRule.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGCircleElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGCircleElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGCircleElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGCircleElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGClipPathElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGClipPathElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGClipPathElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGClipPathElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGColor.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGColor.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGColor.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGColor.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGColorProfileElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGColorProfileElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGColorProfileElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGColorProfileElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGColorProfileRule.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGColorProfileRule.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGColorProfileRule.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGColorProfileRule.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGComponentTransferFunctionElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGComponentTransferFunctionElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGComponentTransferFunctionElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGComponentTransferFunctionElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGCursorElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGCursorElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGCursorElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGCursorElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGDefinitionSrcElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGDefinitionSrcElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGDefinitionSrcElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGDefinitionSrcElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGDefsElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGDefsElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGDefsElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGDefsElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGDescElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGDescElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGDescElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGDescElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGDocument.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGDocument.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGDocument.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGDocument.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGElementInstance.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGElementInstance.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGElementInstance.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGElementInstance.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGElementInstanceList.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGElementInstanceList.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGElementInstanceList.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGElementInstanceList.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGEllipseElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGEllipseElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGEllipseElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGEllipseElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGEvent.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGEvent.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGEvent.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGEvent.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGException.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGException.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGException.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGException.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGExternalResourcesRequired.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGExternalResourcesRequired.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGExternalResourcesRequired.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGExternalResourcesRequired.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEBlendElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEBlendElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEBlendElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEBlendElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEColorMatrixElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEColorMatrixElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEColorMatrixElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEColorMatrixElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEComponentTransferElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEComponentTransferElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEComponentTransferElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEComponentTransferElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFECompositeElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFECompositeElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFECompositeElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFECompositeElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEConvolveMatrixElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEConvolveMatrixElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEConvolveMatrixElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEConvolveMatrixElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEDiffuseLightingElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEDiffuseLightingElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEDiffuseLightingElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEDiffuseLightingElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEDisplacementMapElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEDisplacementMapElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEDisplacementMapElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEDisplacementMapElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEDistantLightElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEDistantLightElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEDistantLightElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEDistantLightElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEFloodElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEFloodElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEFloodElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEFloodElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEFuncAElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEFuncAElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEFuncAElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEFuncAElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEFuncBElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEFuncBElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEFuncBElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEFuncBElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEFuncGElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEFuncGElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEFuncGElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEFuncGElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEFuncRElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEFuncRElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEFuncRElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEFuncRElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEGaussianBlurElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEGaussianBlurElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEGaussianBlurElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEGaussianBlurElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEImageElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEImageElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEImageElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEImageElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEMergeElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEMergeElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEMergeElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEMergeElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEMergeNodeElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEMergeNodeElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEMergeNodeElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEMergeNodeElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEMorphologyElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEMorphologyElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEMorphologyElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEMorphologyElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEOffsetElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEOffsetElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEOffsetElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEOffsetElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEPointLightElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEPointLightElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFEPointLightElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFEPointLightElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFESpecularLightingElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFESpecularLightingElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFESpecularLightingElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFESpecularLightingElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFESpotLightElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFESpotLightElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFESpotLightElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFESpotLightElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFETileElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFETileElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFETileElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFETileElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFETurbulenceElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFETurbulenceElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFETurbulenceElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFETurbulenceElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFilterElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFilterElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFilterElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFilterElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFilterPrimitiveStandardAttributes.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFilterPrimitiveStandardAttributes.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFilterPrimitiveStandardAttributes.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFilterPrimitiveStandardAttributes.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFitToViewBox.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFitToViewBox.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFitToViewBox.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFitToViewBox.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFontElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFontElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFontElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFontElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFontFaceElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFontFaceElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFontFaceElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFontFaceElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFontFaceFormatElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFontFaceFormatElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFontFaceFormatElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFontFaceFormatElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFontFaceNameElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFontFaceNameElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFontFaceNameElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFontFaceNameElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFontFaceSrcElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFontFaceSrcElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFontFaceSrcElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFontFaceSrcElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFontFaceUriElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFontFaceUriElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGFontFaceUriElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGFontFaceUriElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGForeignObjectElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGForeignObjectElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGForeignObjectElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGForeignObjectElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGGElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGGElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGGElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGGElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGGlyphElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGGlyphElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGGlyphElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGGlyphElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGGlyphRefElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGGlyphRefElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGGlyphRefElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGGlyphRefElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGGradientElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGGradientElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGGradientElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGGradientElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGHKernElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGHKernElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGHKernElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGHKernElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGICCColor.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGICCColor.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGICCColor.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGICCColor.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGImageElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGImageElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGImageElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGImageElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGLangSpace.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGLangSpace.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGLangSpace.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGLangSpace.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGLength.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGLength.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGLength.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGLength.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGLengthList.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGLengthList.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGLengthList.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGLengthList.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGLineElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGLineElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGLineElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGLineElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGLinearGradientElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGLinearGradientElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGLinearGradientElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGLinearGradientElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGLocatable.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGLocatable.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGLocatable.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGLocatable.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGMPathElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGMPathElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGMPathElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGMPathElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGMarkerElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGMarkerElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGMarkerElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGMarkerElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGMaskElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGMaskElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGMaskElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGMaskElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGMatrix.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGMatrix.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGMatrix.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGMatrix.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGMetadataElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGMetadataElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGMetadataElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGMetadataElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGMissingGlyphElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGMissingGlyphElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGMissingGlyphElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGMissingGlyphElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGNumber.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGNumber.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGNumber.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGNumber.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGNumberList.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGNumberList.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGNumberList.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGNumberList.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPaint.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPaint.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPaint.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPaint.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSeg.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSeg.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSeg.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSeg.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegArcAbs.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegArcAbs.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegArcAbs.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegArcAbs.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegArcRel.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegArcRel.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegArcRel.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegArcRel.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegClosePath.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegClosePath.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegClosePath.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegClosePath.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicAbs.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicAbs.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicAbs.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicAbs.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicRel.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicRel.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicRel.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicRel.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicSmoothAbs.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicSmoothAbs.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicSmoothAbs.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicSmoothAbs.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicSmoothRel.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicSmoothRel.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicSmoothRel.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoCubicSmoothRel.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticAbs.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticAbs.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticAbs.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticAbs.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticRel.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticRel.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticRel.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticRel.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticSmoothAbs.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticSmoothAbs.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticSmoothAbs.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticSmoothAbs.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticSmoothRel.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticSmoothRel.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticSmoothRel.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegCurvetoQuadraticSmoothRel.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoAbs.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoAbs.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoAbs.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoAbs.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoHorizontalAbs.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoHorizontalAbs.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoHorizontalAbs.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoHorizontalAbs.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoHorizontalRel.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoHorizontalRel.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoHorizontalRel.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoHorizontalRel.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoRel.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoRel.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoRel.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoRel.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoVerticalAbs.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoVerticalAbs.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoVerticalAbs.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoVerticalAbs.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoVerticalRel.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoVerticalRel.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoVerticalRel.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegLinetoVerticalRel.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegList.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegList.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegList.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegList.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegMovetoAbs.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegMovetoAbs.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegMovetoAbs.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegMovetoAbs.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegMovetoRel.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegMovetoRel.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPathSegMovetoRel.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPathSegMovetoRel.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPatternElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPatternElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPatternElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPatternElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPoint.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPoint.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPoint.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPoint.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPointList.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPointList.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPointList.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPointList.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPolygonElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPolygonElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPolygonElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPolygonElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPolylineElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPolylineElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPolylineElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPolylineElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPreserveAspectRatio.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPreserveAspectRatio.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGPreserveAspectRatio.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGPreserveAspectRatio.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGRadialGradientElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGRadialGradientElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGRadialGradientElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGRadialGradientElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGRect.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGRect.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGRect.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGRect.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGRectElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGRectElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGRectElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGRectElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGRenderingIntent.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGRenderingIntent.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGRenderingIntent.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGRenderingIntent.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGSVGElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGSVGElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGSVGElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGSVGElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGScriptElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGScriptElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGScriptElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGScriptElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGSetElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGSetElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGSetElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGSetElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGStopElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGStopElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGStopElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGStopElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGStringList.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGStringList.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGStringList.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGStringList.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGStylable.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGStylable.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGStylable.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGStylable.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGStyleElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGStyleElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGStyleElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGStyleElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGSwitchElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGSwitchElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGSwitchElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGSwitchElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGSymbolElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGSymbolElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGSymbolElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGSymbolElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTRefElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTRefElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTRefElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTRefElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTSpanElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTSpanElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTSpanElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTSpanElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTests.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTests.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTests.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTests.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTextContentElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTextContentElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTextContentElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTextContentElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTextElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTextElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTextElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTextElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTextPathElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTextPathElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTextPathElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTextPathElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTextPositioningElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTextPositioningElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTextPositioningElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTextPositioningElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTitleElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTitleElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTitleElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTitleElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTransform.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTransform.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTransform.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTransform.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTransformList.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTransformList.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTransformList.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTransformList.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTransformable.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTransformable.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGTransformable.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGTransformable.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGURIReference.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGURIReference.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGURIReference.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGURIReference.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGUnitTypes.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGUnitTypes.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGUnitTypes.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGUnitTypes.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGUseElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGUseElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGUseElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGUseElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGVKernElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGVKernElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGVKernElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGVKernElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGViewElement.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGViewElement.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGViewElement.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGViewElement.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGViewSpec.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGViewSpec.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGViewSpec.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGViewSpec.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGZoomAndPan.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGZoomAndPan.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGZoomAndPan.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGZoomAndPan.java
diff --git a/fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGZoomEvent.java b/fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGZoomEvent.java
similarity index 100%
rename from fine-third-jdk8/xml-apis/src/main/java/org/w3c/dom/svg/SVGZoomEvent.java
rename to fine-xmlgraphics/xmlgraphics-batik/src/main/java/org/w3c/dom/svg/SVGZoomEvent.java