diff --git a/jaxp/make/BuildJaxp.gmk b/jaxp/make/BuildJaxp.gmk
deleted file mode 100644
index 4efd49f4921..00000000000
--- a/jaxp/make/BuildJaxp.gmk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This must be the first rule
-default: all
-
--include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-
-DISABLE_JAXP_WARNINGS := -Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough
-
-# The generate new bytecode uses the new compiler for to generate bytecode
-# for the new jdk that is being built. The code compiled by this setup
-# cannot necessarily be run with the boot jdk.
-$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \
- JVM := $(JAVA), \
- JAVAC := $(NEW_JAVAC), \
- FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXP_WARNINGS), \
- SERVER_DIR := $(SJAVAC_SERVER_DIR), \
- SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
-
-$(eval $(call SetupJavaCompilation,BUILD_JAXP, \
- SETUP := GENERATE_NEWBYTECODE, \
- SRC := $(JAXP_TOPDIR)/src, \
- CLEAN := .properties, \
- BIN := $(JAXP_OUTPUTDIR)/classes, \
- SRCZIP := $(JAXP_OUTPUTDIR)/dist/lib/src.zip, \
- JAR := $(JAXP_OUTPUTDIR)/dist/lib/classes.jar))
-
-all: $(BUILD_JAXP)
-
-.PHONY: default all
diff --git a/jaxp/make/Makefile b/jaxp/make/Makefile
deleted file mode 100644
index 4570070f45b..00000000000
--- a/jaxp/make/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Locate this Makefile
-ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
- makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
- makefile_path := $(lastword $(MAKEFILE_LIST))
-endif
-repo_dir := $(patsubst %/make/Makefile, %, $(makefile_path))
-
-# What is the name of this subsystem (langtools, corba, etc)?
-subsystem_name := $(notdir $(repo_dir))
-
-# Try to locate top-level makefile
-top_level_makefile := $(repo_dir)/../Makefile
-ifneq ($(wildcard $(top_level_makefile)), )
- $(info Will run $(subsystem_name) target on top-level Makefile)
- $(info WARNING: This is a non-recommended way of building!)
- $(info ===================================================)
-else
- $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
- $(error Build from top-level Makefile instead)
-endif
-
-all:
- @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup
deleted file mode 100644
index 12bfa2a82e1..00000000000
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup
+++ /dev/null
@@ -1,1116 +0,0 @@
-/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
- */
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * $Id: xpath.cup,v 1.51 2004/12/15 17:35:39 jycli Exp $
- */
-
-/*
- * @author Jacek Ambroziak
- * @author Santiago Pericas-Geertsen
- * @author Morten Jorgensen
- * @author G. Todd Miller
- */
-
-package com.sun.org.apache.xalan.internal.xsltc.compiler;
-
-import java.util.Stack;
-import java.util.Vector;
-import java.io.StringReader;
-import com.sun.java_cup.internal.runtime.*;
-
-import com.sun.org.apache.xml.internal.dtm.DTM;
-import com.sun.org.apache.xalan.internal.xsltc.DOM;
-import com.sun.org.apache.xml.internal.dtm.Axis;
-import com.sun.org.apache.xalan.internal.xsltc.runtime.Operators;
-import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
-
-parser code {:
- /**
- * Used by function calls with no args.
- */
- static public final Vector EmptyArgs = new Vector(0);
-
- /**
- * Reference to non-existing variable.
- */
- static public final VariableRef DummyVarRef = null;
-
- /**
- * Reference to the Parser class.
- */
- private Parser _parser;
- private XSLTC _xsltc;
-
- /**
- * String representation of the expression being parsed.
- */
- private String _expression;
-
- /**
- * Line number where this expression/pattern was declared.
- */
- private int _lineNumber = 0;
-
- /**
- * Reference to the symbol table.
- */
- public SymbolTable _symbolTable;
-
- public XPathParser(Parser parser) {
- _parser = parser;
- _xsltc = parser.getXSLTC();
- _symbolTable = parser.getSymbolTable();
- }
-
- public int getLineNumber() {
- return _lineNumber;
- }
-
- public QName getQNameIgnoreDefaultNs(String name) {
- return _parser.getQNameIgnoreDefaultNs(name);
- }
-
- public QName getQName(String namespace, String prefix, String localname) {
- return _parser.getQName(namespace, prefix, localname);
- }
-
- public void setMultiDocument(boolean flag) {
- _xsltc.setMultiDocument(flag);
- }
-
- public void setCallsNodeset(boolean flag) {
- _xsltc.setCallsNodeset(flag);
- }
-
- public void setHasIdCall(boolean flag) {
- _xsltc.setHasIdCall(flag);
- }
-
-
- /**
- * This method is similar to findNodeType(int, Object) except that it
- * creates a StepPattern instead of just returning a node type. It also
- * differs in the way it handles "{uri}:*" and "{uri}:@*". The last two
- * patterns are expanded as "*[namespace-uri() = 'uri']" and
- * "@*[namespace-uri() = 'uri']", respectively. This expansion considerably
- * simplifies the grouping of patterns in the Mode class. For this
- * expansion to be correct, the priority of the pattern/template must be
- * set to -0.25 (when no other predicates are present).
- */
- public StepPattern createStepPattern(int axis, Object test, Vector predicates) {
- int nodeType;
-
- if (test == null) { // "*"
- nodeType = (axis == Axis.ATTRIBUTE) ? NodeTest.ATTRIBUTE :
- (axis == Axis.NAMESPACE) ? -1 : NodeTest.ELEMENT;
-
- return new StepPattern(axis, nodeType, predicates);
- }
- else if (test instanceof Integer) {
- nodeType = ((Integer) test).intValue();
-
- return new StepPattern(axis, nodeType, predicates);
- }
- else {
- QName name = (QName)test;
- boolean setPriority = false;
-
- if (axis == Axis.NAMESPACE) {
- nodeType = (name.toString().equals("*")) ? -1
- : _xsltc.registerNamespacePrefix(name);;
- }
- else {
- final String uri = name.getNamespace();
- final String local = name.getLocalPart();
- final QName namespace_uri =
- _parser.getQNameIgnoreDefaultNs("namespace-uri");
-
- // Expand {uri}:* to *[namespace-uri() = 'uri'] - same for @*
- if (uri != null && (local.equals("*") || local.equals("@*"))) {
- if (predicates == null) {
- predicates = new Vector(2);
- }
-
- // Priority is set by hand if no other predicates exist
- setPriority = (predicates.size() == 0);
-
- predicates.add(
- new Predicate(
- new EqualityExpr(Operators.EQ,
- new NamespaceUriCall(namespace_uri),
- new LiteralExpr(uri))));
- }
-
- if (local.equals("*")) {
- nodeType = (axis == Axis.ATTRIBUTE) ? NodeTest.ATTRIBUTE
- : NodeTest.ELEMENT;
- }
- else if (local.equals("@*")) {
- nodeType = NodeTest.ATTRIBUTE;
- }
- else {
- nodeType = (axis == Axis.ATTRIBUTE) ? _xsltc.registerAttribute(name)
- : _xsltc.registerElement(name);
- }
- }
-
- final StepPattern result = new StepPattern(axis, nodeType, predicates);
-
- // Set priority for case prefix:* and prefix:@* (no predicates)
- if (setPriority) {
- result.setPriority(-0.25);
- }
-
- return result;
- }
- }
-
- public int findNodeType(int axis, Object test) {
- if (test == null) { // *
- return (axis == Axis.ATTRIBUTE) ?
- NodeTest.ATTRIBUTE :
- (axis == Axis.NAMESPACE) ? -1 : NodeTest.ELEMENT;
- }
- else if (test instanceof Integer) {
- return ((Integer)test).intValue();
- }
- else {
- QName name = (QName)test;
-
- if (axis == Axis.NAMESPACE) {
- return (name.toString().equals("*")) ? -1
- : _xsltc.registerNamespacePrefix(name);
- }
-
- if (name.getNamespace() == null) {
- final String local = name.getLocalPart();
-
- if (local.equals("*")) {
- return (axis == Axis.ATTRIBUTE) ? NodeTest.ATTRIBUTE
- : NodeTest.ELEMENT;
- }
- else if (local.equals("@*")) {
- return NodeTest.ATTRIBUTE;
- }
- }
-
- return (axis == Axis.ATTRIBUTE) ? _xsltc.registerAttribute(name)
- : _xsltc.registerElement(name);
- }
- }
-
- /**
- * Parse the expression passed to the current scanner. If this
- * expression contains references to local variables and it will be
- * compiled in an external module (not in the main class) request
- * the current template to create a new variable stack frame.
- *
- * @param lineNumber Line where the current expression is defined.
- * @param external Set to true if this expression is
- * compiled in a separate module.
- *
- */
- public Symbol parse(String expression, int lineNumber) throws Exception {
- try {
- _expression = expression;
- _lineNumber = lineNumber;
- return super.parse();
- }
- catch (IllegalCharException e) {
- ErrorMsg err = new ErrorMsg(ErrorMsg.ILLEGAL_CHAR_ERR,
- lineNumber, e.getMessage());
- _parser.reportError(Constants.FATAL, err);
- }
- return null;
- }
-
- /**
- * Lookup a variable or parameter in the symbol table given its name.
- *
- * @param name Name of the symbol being looked up.
- */
- final SyntaxTreeNode lookupName(QName name) {
- // Is it a local var or param ?
- final SyntaxTreeNode result = _parser.lookupVariable(name);
- if (result != null)
- return(result);
- else
- return(_symbolTable.lookupName(name));
- }
-
- public final void addError(ErrorMsg error) {
- _parser.reportError(Constants.ERROR, error);
- }
-
- public void report_error(String message, Object info) {
- final ErrorMsg err = new ErrorMsg(ErrorMsg.SYNTAX_ERR, _lineNumber,
- _expression);
- _parser.reportError(Constants.FATAL, err);
- }
-
- public void report_fatal_error(String message, Object info) {
- // empty
- }
-
- public RelativeLocationPath insertStep(Step step, RelativeLocationPath rlp) {
- if (rlp instanceof Step) {
- return new ParentLocationPath(step, (Step) rlp);
- }
- else if (rlp instanceof ParentLocationPath) {
- final ParentLocationPath plp = (ParentLocationPath) rlp;
- final RelativeLocationPath newrlp = insertStep(step, plp.getPath());
- return new ParentLocationPath(newrlp, plp.getStep());
- }
- else {
- addError(new ErrorMsg(ErrorMsg.INTERNAL_ERR, "XPathParser.insertStep"));
- return rlp;
- }
- }
-
- /**
- * Returns true if the axis applies to elements only. The axes
- * child, attribute, namespace, descendant result in non-empty
- * nodesets only if the context node is of type element.
- */
- public boolean isElementAxis(int axis) {
- return (axis == Axis.CHILD || axis == Axis.ATTRIBUTE ||
- axis == Axis.NAMESPACE || axis == Axis.DESCENDANT);
- }
-:}
-
-terminal SLASH, DOT, LBRACK, RBRACK, VBAR, LPAREN, RPAREN, STAR, COMMA;
-terminal DOLLAR, ATSIGN;
-terminal DDOT, DCOLON, DSLASH;
-terminal EQ, NE;
-terminal LT, GT, LE, GE;
-terminal PLUS, MINUS, DIV, MOD, MULT;
-terminal String Literal;
-terminal String QNAME;
-terminal ID, KEY, TEXT, NODE, OR, AND, COMMENT, PI, PIPARAM, PRECEDINGSIBLING;
-terminal SELF, PARENT, CHILD, ATTRIBUTE, ANCESTOR, ANCESTORORSELF, DESCENDANT;
-terminal DESCENDANTORSELF, FOLLOWING, FOLLOWINGSIBLING, NAMESPACE, PRECEDING;
-terminal Double REAL;
-terminal Long INT;
-terminal PATTERN, EXPRESSION;
-
-non terminal SyntaxTreeNode TopLevel;
-
-non terminal Expression Expr, Argument, LocationPath;
-non terminal Expression Predicate, FilterExpr, Step;
-non terminal Expression OrExpr, AndExpr, EqualityExpr;
-non terminal Expression RelationalExpr, AdditiveExpr;
-non terminal Expression MultiplicativeExpr, UnaryExpr;
-non terminal Expression VariableReference, FunctionCall;
-non terminal Expression PrimaryExpr, UnionExpr, PathExpr, AbbreviatedStep;
-non terminal Expression RelativeLocationPath, AbbreviatedRelativeLocationPath;
-non terminal Expression AbsoluteLocationPath, AbbreviatedAbsoluteLocationPath;
-
-non terminal Object NodeTest, NameTest;
-
-non terminal IdKeyPattern IdKeyPattern;
-non terminal Pattern Pattern;
-non terminal Pattern LocationPathPattern;
-non terminal StepPattern ProcessingInstructionPattern;
-non terminal RelativePathPattern RelativePathPattern;
-non terminal StepPattern StepPattern;
-non terminal Object NodeTestPattern, NameTestPattern;
-
-non terminal Vector Predicates, NonemptyArgumentList;
-non terminal QName QName, FunctionName, VariableName;
-non terminal Integer AxisName, AxisSpecifier;
-non terminal Integer ChildOrAttributeAxisSpecifier;
-
-precedence left VBAR;
-precedence left OR;
-precedence left AND;
-precedence nonassoc EQ, NE;
-precedence left LT, GT, LE, GE;
-
-precedence left PLUS, MINUS;
-precedence left DIV, MOD, MULT;
-precedence left DOLLAR;
-precedence left ATSIGN;
-precedence right DCOLON;
-
-start with TopLevel;
-
-TopLevel ::= PATTERN Pattern:pattern
- {: RESULT = pattern; :}
-
- | EXPRESSION Expr:expr
- {: RESULT = expr; :};
-
-/* --------------------------- Patterns ----------------------------------- */
-
-Pattern ::= LocationPathPattern:lpp
- {: RESULT = lpp; :}
-
- | LocationPathPattern:lpp VBAR Pattern:p
- {: RESULT = new AlternativePattern(lpp, p); :};
-
-LocationPathPattern ::= SLASH
- {: RESULT = new AbsolutePathPattern(null); :}
-
- | SLASH RelativePathPattern:rpp
- {: RESULT = new AbsolutePathPattern(rpp); :}
-
- | IdKeyPattern:ikp
- {: RESULT = ikp; :}
-
- | IdKeyPattern:ikp SLASH RelativePathPattern:rpp
- {: RESULT = new ParentPattern(ikp, rpp); :}
-
- | IdKeyPattern:ikp DSLASH RelativePathPattern:rpp
- {: RESULT = new AncestorPattern(ikp, rpp); :}
-
- | DSLASH RelativePathPattern:rpp
- {: RESULT = new AncestorPattern(rpp); :}
-
- | RelativePathPattern:rpp
- {: RESULT = rpp; :};
-
-IdKeyPattern ::= ID LPAREN Literal:l RPAREN
- {: RESULT = new IdPattern(l);
- parser.setHasIdCall(true);
- :}
-
- | KEY LPAREN Literal:l1 COMMA Literal:l2 RPAREN
- {: RESULT = new KeyPattern(l1, l2); :};
-
-ProcessingInstructionPattern ::= PIPARAM LPAREN Literal:l RPAREN
- {: RESULT = new ProcessingInstructionPattern(l); :};
-
-RelativePathPattern ::= StepPattern:sp
- {: RESULT = sp; :}
-
- | StepPattern:sp SLASH RelativePathPattern:rpp
- {: RESULT = new ParentPattern(sp, rpp); :}
-
- | StepPattern:sp DSLASH RelativePathPattern:rpp
- {: RESULT = new AncestorPattern(sp, rpp); :};
-
-StepPattern ::= NodeTestPattern:nt
- {:
- RESULT = parser.createStepPattern(Axis.CHILD, nt, null);
- :}
-
- | NodeTestPattern:nt Predicates:pp
- {:
- RESULT = parser.createStepPattern(Axis.CHILD, nt, pp);
- :}
-
- | ProcessingInstructionPattern:pip
- {: RESULT = pip; :}
-
- | ProcessingInstructionPattern:pip Predicates:pp
- {: RESULT = (ProcessingInstructionPattern)pip.setPredicates(pp); :}
-
- | ChildOrAttributeAxisSpecifier:axis NodeTestPattern:nt
- {:
- RESULT = parser.createStepPattern(axis.intValue(), nt, null);
- :}
-
- | ChildOrAttributeAxisSpecifier:axis
- NodeTestPattern:nt Predicates:pp
- {:
- RESULT = parser.createStepPattern(axis.intValue(), nt, pp);
- :}
-
- | ChildOrAttributeAxisSpecifier:axis ProcessingInstructionPattern:pip
- {:
- RESULT = pip; // TODO: report error if axis is attribute
- :}
-
- | ChildOrAttributeAxisSpecifier:axis ProcessingInstructionPattern:pip
- Predicates:pp
- {:
- // TODO: report error if axis is attribute
- RESULT = (ProcessingInstructionPattern)pip.setPredicates(pp);
- :};
-
-NodeTestPattern ::= NameTestPattern:nt
- {: RESULT = nt; :}
-
- | NODE
- {: RESULT = new Integer(NodeTest.ANODE); :}
-
- | TEXT
- {: RESULT = new Integer(NodeTest.TEXT); :}
-
- | COMMENT
- {: RESULT = new Integer(NodeTest.COMMENT); :}
-
- | PI
- {: RESULT = new Integer(NodeTest.PI); :};
-
-NameTestPattern ::= STAR
- {: RESULT = null; :}
-
- | QName:qn
- {: RESULT = qn; :};
-
-ChildOrAttributeAxisSpecifier ::= ATSIGN
- {: RESULT = new Integer(Axis.ATTRIBUTE); :}
-
- | CHILD DCOLON
- {: RESULT = new Integer(Axis.CHILD); :}
-
- | ATTRIBUTE DCOLON
- {: RESULT = new Integer(Axis.ATTRIBUTE); :};
-
-Predicates ::= Predicate:p
- {:
- Vector temp = new Vector();
- temp.addElement(p);
- RESULT = temp;
- :}
-
- | Predicate:p Predicates:pp
- {: pp.insertElementAt(p, 0); RESULT = pp; :};
-
-Predicate ::= LBRACK Expr:e RBRACK
- {:
- RESULT = new Predicate(e);
- :};
-
-/* --------------------------- Expressions --------------------------------- */
-
-Expr ::= OrExpr:ex
- {: RESULT = ex; :};
-
-OrExpr ::= AndExpr:ae
- {: RESULT = ae; :}
-
- | OrExpr:oe OR AndExpr:ae
- {: RESULT = new LogicalExpr(LogicalExpr.OR, oe, ae); :};
-
-AndExpr ::= EqualityExpr:e
- {: RESULT = e; :}
-
- | AndExpr:ae AND EqualityExpr:ee
- {: RESULT = new LogicalExpr(LogicalExpr.AND, ae, ee); :};
-
-EqualityExpr ::= RelationalExpr:re
- {: RESULT = re; :}
-
- | EqualityExpr:ee EQ RelationalExpr:re
- {: RESULT = new EqualityExpr(Operators.EQ, ee, re); :}
-
- | EqualityExpr:ee NE RelationalExpr:re
- {: RESULT = new EqualityExpr(Operators.NE, ee, re); :};
-
-RelationalExpr ::= AdditiveExpr:ae
- {: RESULT = ae; :}
-
- | RelationalExpr:re LT AdditiveExpr:ae
- {: RESULT = new RelationalExpr(Operators.LT, re, ae); :}
-
- | RelationalExpr:re GT AdditiveExpr:ae
- {: RESULT = new RelationalExpr(Operators.GT, re, ae); :}
-
- | RelationalExpr:re LE AdditiveExpr:ae
- {: RESULT = new RelationalExpr(Operators.LE, re, ae); :}
-
- | RelationalExpr:re GE AdditiveExpr:ae
- {: RESULT = new RelationalExpr(Operators.GE, re, ae); :};
-
-AdditiveExpr ::= MultiplicativeExpr:me
- {: RESULT = me; :}
-
- | AdditiveExpr:ae PLUS MultiplicativeExpr:me
- {: RESULT = new BinOpExpr(BinOpExpr.PLUS, ae, me); :}
-
- | AdditiveExpr:ae MINUS MultiplicativeExpr:me
- {: RESULT = new BinOpExpr(BinOpExpr.MINUS, ae, me); :};
-
-MultiplicativeExpr ::= UnaryExpr:ue
- {: RESULT = ue; :}
-
- | MultiplicativeExpr:me MULT UnaryExpr:ue
- {: RESULT = new BinOpExpr(BinOpExpr.TIMES, me, ue); :}
-
- | MultiplicativeExpr:me DIV UnaryExpr:ue
- {: RESULT = new BinOpExpr(BinOpExpr.DIV, me, ue); :}
-
- | MultiplicativeExpr:me MOD UnaryExpr:ue
- {: RESULT = new BinOpExpr(BinOpExpr.MOD, me, ue); :};
-
-UnaryExpr ::= UnionExpr:ue
- {: RESULT = ue; :}
-
- | MINUS UnaryExpr:ue
- {: RESULT = new UnaryOpExpr(ue); :};
-
-UnionExpr ::= PathExpr:pe
- {: RESULT = pe; :}
-
- | PathExpr:pe VBAR UnionExpr:rest
- {: RESULT = new UnionPathExpr(pe, rest); :};
-
-PathExpr ::= LocationPath:lp
- {: RESULT = lp; :}
-
- | FilterExpr:fexp
- {: RESULT = fexp; :}
-
- | FilterExpr:fexp SLASH RelativeLocationPath:rlp
- {: RESULT = new FilterParentPath(fexp, rlp); :}
-
- | FilterExpr:fexp DSLASH RelativeLocationPath:rlp
- {:
- //
- // Expand '//' into '/descendant-or-self::node()/' or
- // into /descendant-or-self::*/
- //
- int nodeType = DOM.NO_TYPE;
- if (rlp instanceof Step &&
- parser.isElementAxis(((Step) rlp).getAxis()))
- {
- nodeType = DTM.ELEMENT_NODE;
- }
- final Step step = new Step(Axis.DESCENDANTORSELF, nodeType, null);
- FilterParentPath fpp = new FilterParentPath(fexp, step);
- fpp = new FilterParentPath(fpp, rlp);
- if (fexp instanceof KeyCall == false) {
- fpp.setDescendantAxis();
- }
- RESULT = fpp;
- :};
-
-LocationPath ::= RelativeLocationPath:rlp
- {: RESULT = rlp; :}
-
- | AbsoluteLocationPath:alp
- {: RESULT = alp; :};
-
-RelativeLocationPath ::= Step:step
- {: RESULT = step; :}
-
- | RelativeLocationPath:rlp SLASH Step:step
- {:
- if (rlp instanceof Step && ((Step) rlp).isAbbreviatedDot()) {
- RESULT = step; // Remove './' from the middle
- }
- else if (((Step) step).isAbbreviatedDot()) {
- RESULT = rlp; // Remove '/.' from the end
- }
- else {
- RESULT =
- new ParentLocationPath((RelativeLocationPath) rlp, step);
- }
- :}
-
- | AbbreviatedRelativeLocationPath:arlp
- {: RESULT = arlp; :};
-
-AbsoluteLocationPath ::= SLASH
- {: RESULT = new AbsoluteLocationPath(); :}
-
- | SLASH RelativeLocationPath:rlp
- {: RESULT = new AbsoluteLocationPath(rlp); :}
-
- | AbbreviatedAbsoluteLocationPath:aalp
- {: RESULT = aalp; :};
-
-AbbreviatedRelativeLocationPath ::= RelativeLocationPath:rlp DSLASH Step:step
- {:
- final Step right = (Step)step;
- final int axis = right.getAxis();
- final int type = right.getNodeType();
- final Vector predicates = right.getPredicates();
-
- if ((axis == Axis.CHILD) && (type != NodeTest.ATTRIBUTE)) {
- // Compress './/child:E' into 'descendant::E' - if possible
- if (predicates == null) {
- right.setAxis(Axis.DESCENDANT);
- if (rlp instanceof Step && ((Step)rlp).isAbbreviatedDot()) {
- RESULT = right;
- }
- else {
- // Expand 'rlp//child::E' into 'rlp/descendant::E'
- RelativeLocationPath left = (RelativeLocationPath)rlp;
- RESULT = new ParentLocationPath(left, right);
- }
- }
- else {
- // Expand './/step' -> 'descendant-or-self::*/step'
- if (rlp instanceof Step && ((Step)rlp).isAbbreviatedDot()) {
- Step left = new Step(Axis.DESCENDANTORSELF,
- DTM.ELEMENT_NODE, null);
- RESULT = new ParentLocationPath(left, right);
- }
- else {
- // Expand 'rlp//step' -> 'rlp/descendant-or-self::*/step'
- RelativeLocationPath left = (RelativeLocationPath)rlp;
- Step mid = new Step(Axis.DESCENDANTORSELF,
- DTM.ELEMENT_NODE, null);
- ParentLocationPath ppl = new ParentLocationPath(mid, right);
- RESULT = new ParentLocationPath(left, ppl);
- }
- }
- }
- else if ((axis == Axis.ATTRIBUTE) || (type == NodeTest.ATTRIBUTE)) {
- // Expand 'rlp//step' -> 'rlp/descendant-or-self::*/step'
- RelativeLocationPath left = (RelativeLocationPath)rlp;
- Step middle = new Step(Axis.DESCENDANTORSELF,
- DTM.ELEMENT_NODE, null);
- ParentLocationPath ppl = new ParentLocationPath(middle, right);
- RESULT = new ParentLocationPath(left, ppl);
- }
- else {
- // Expand 'rlp//step' -> 'rlp/descendant-or-self::node()/step'
- RelativeLocationPath left = (RelativeLocationPath)rlp;
- Step middle = new Step(Axis.DESCENDANTORSELF,
- DOM.NO_TYPE, null);
- ParentLocationPath ppl = new ParentLocationPath(middle, right);
- RESULT = new ParentLocationPath(left, ppl);
- }
- :};
-
-
-AbbreviatedAbsoluteLocationPath ::= DSLASH RelativeLocationPath:rlp
- {:
- //
- // Expand '//' into '/descendant-or-self::node()/' or
- // into /descendant-or-self::*/
- //
- int nodeType = DOM.NO_TYPE;
- if (rlp instanceof Step &&
- parser.isElementAxis(((Step) rlp).getAxis()))
- {
- nodeType = DTM.ELEMENT_NODE;
- }
- final Step step = new Step(Axis.DESCENDANTORSELF, nodeType, null);
- RESULT = new AbsoluteLocationPath(parser.insertStep(step,
- (RelativeLocationPath) rlp));
- :};
-
-Step ::= NodeTest:ntest
- {:
- if (ntest instanceof Step) {
- RESULT = (Step)ntest;
- }
- else {
- RESULT = new Step(Axis.CHILD,
- parser.findNodeType(Axis.CHILD, ntest),
- null);
- }
- :}
-
- | NodeTest:ntest Predicates:pp
- {:
- if (ntest instanceof Step) {
- Step step = (Step)ntest;
- step.addPredicates(pp);
- RESULT = (Step)ntest;
- }
- else {
- RESULT = new Step(Axis.CHILD,
- parser.findNodeType(Axis.CHILD, ntest), pp);
- }
- :}
-
- | AxisSpecifier:axis NodeTest:ntest Predicates:pp
- {: RESULT = new Step(axis.intValue(),
- parser.findNodeType(axis.intValue(), ntest),
- pp);
- :}
-
- | AxisSpecifier:axis NodeTest:ntest
- {: RESULT = new Step(axis.intValue(),
- parser.findNodeType(axis.intValue(), ntest),
- null);
- :}
-
- | AbbreviatedStep:abbrev
- {: RESULT = abbrev; :};
-
-AxisSpecifier ::= AxisName:an DCOLON
- {: RESULT = an; :}
-
- | ATSIGN
- {: RESULT = new Integer(Axis.ATTRIBUTE); :};
-
-AxisName ::= ANCESTOR
- {: RESULT = new Integer(Axis.ANCESTOR); :}
-
- | ANCESTORORSELF
- {: RESULT = new Integer(Axis.ANCESTORORSELF); :}
-
- | ATTRIBUTE
- {: RESULT = new Integer(Axis.ATTRIBUTE); :}
-
- | CHILD
- {: RESULT = new Integer(Axis.CHILD); :}
-
- | DESCENDANT
- {: RESULT = new Integer(Axis.DESCENDANT); :}
-
- | DESCENDANTORSELF
- {: RESULT = new Integer(Axis.DESCENDANTORSELF); :}
-
- | FOLLOWING
- {: RESULT = new Integer(Axis.FOLLOWING); :}
-
- | FOLLOWINGSIBLING
- {: RESULT = new Integer(Axis.FOLLOWINGSIBLING); :}
-
- | NAMESPACE
- {: RESULT = new Integer(Axis.NAMESPACE); :}
-
- | PARENT
- {: RESULT = new Integer(Axis.PARENT); :}
-
- | PRECEDING
- {: RESULT = new Integer(Axis.PRECEDING); :}
-
- | PRECEDINGSIBLING
- {: RESULT = new Integer(Axis.PRECEDINGSIBLING); :}
-
- | SELF
- {: RESULT = new Integer(Axis.SELF); :};
-
-AbbreviatedStep ::= DOT
- {: RESULT = new Step(Axis.SELF, NodeTest.ANODE, null); :}
-
- | DDOT
- {: RESULT = new Step(Axis.PARENT, NodeTest.ANODE, null); :};
-
-FilterExpr ::= PrimaryExpr:primary
- {: RESULT = primary; :}
-
- | PrimaryExpr:primary Predicates:pp
- {: RESULT = new FilterExpr(primary, pp); :};
-
-PrimaryExpr ::= VariableReference:vr
- {: RESULT = vr; :}
-
- | LPAREN Expr:ex RPAREN
- {: RESULT = ex; :}
-
- | Literal:string
- {:
- /*
- * If the string appears to have the syntax of a QName, store
- * namespace info in the literal expression. This is used for
- * element-available and function-available functions, among
- * others. Also, the default namespace must be ignored.
- */
- String namespace = null;
- final int index = string.lastIndexOf(':');
-
- if (index > 0) {
- final String prefix = string.substring(0, index);
- namespace = parser._symbolTable.lookupNamespace(prefix);
- }
- RESULT = (namespace == null) ? new LiteralExpr(string)
- : new LiteralExpr(string, namespace);
- :}
-
- | INT:num
- {:
- long value = num.longValue();
- if (value < Integer.MIN_VALUE || value > Integer.MAX_VALUE) {
- RESULT = new RealExpr(value);
- }
- else {
- if (num.doubleValue() == -0)
- RESULT = new RealExpr(num.doubleValue());
- else if (num.intValue() == 0)
- RESULT = new IntExpr(num.intValue());
- else if (num.doubleValue() == 0.0)
- RESULT = new RealExpr(num.doubleValue());
- else
- RESULT = new IntExpr(num.intValue());
- }
- :}
-
- | REAL:num
- {: RESULT = new RealExpr(num.doubleValue()); :}
-
- | FunctionCall:fc
- {: RESULT = fc; :};
-
-VariableReference ::= DOLLAR VariableName:varName
- {:
- // An empty qname prefix for a variable or parameter reference
- // should map to the null namespace and not the default URI.
- SyntaxTreeNode node = parser.lookupName(varName);
-
- if (node != null) {
- if (node instanceof Variable) {
- RESULT = new VariableRef((Variable)node);
- }
- else if (node instanceof Param) {
- RESULT = new ParameterRef((Param)node);
- }
- else {
- RESULT = new UnresolvedRef(varName);
- }
- }
-
- if (node == null) {
- RESULT = new UnresolvedRef(varName);
- }
- :};
-
-FunctionCall ::= FunctionName:fname LPAREN RPAREN
- {:
-
- if (parser.getQNameIgnoreDefaultNs("current").equals(fname)) {
- RESULT = new CurrentCall(fname);
- }
- else if (parser.getQNameIgnoreDefaultNs("number").equals(fname)) {
- RESULT = new NumberCall(fname, parser.EmptyArgs);
- }
- else if (parser.getQNameIgnoreDefaultNs("string").equals(fname)) {
- RESULT = new StringCall(fname, parser.EmptyArgs);
- }
- else if (parser.getQNameIgnoreDefaultNs("concat").equals(fname)) {
- RESULT = new ConcatCall(fname, parser.EmptyArgs);
- }
- else if (parser.getQNameIgnoreDefaultNs("true").equals(fname)) {
- RESULT = new BooleanExpr(true);
- }
- else if (parser.getQNameIgnoreDefaultNs("false").equals(fname)) {
- RESULT = new BooleanExpr(false);
- }
- else if (parser.getQNameIgnoreDefaultNs("name").equals(fname)) {
- RESULT = new NameCall(fname);
- }
- else if (parser.getQNameIgnoreDefaultNs("generate-id").equals(fname)) {
- RESULT = new GenerateIdCall(fname, parser.EmptyArgs);
- }
- else if (parser.getQNameIgnoreDefaultNs("string-length").equals(fname)) {
- RESULT = new StringLengthCall(fname, parser.EmptyArgs);
- }
- else if (parser.getQNameIgnoreDefaultNs("position").equals(fname)) {
- RESULT = new PositionCall(fname);
- }
- else if (parser.getQNameIgnoreDefaultNs("last").equals(fname)) {
- RESULT = new LastCall(fname);
- }
- else if (parser.getQNameIgnoreDefaultNs("local-name").equals(fname)) {
- RESULT = new LocalNameCall(fname);
- }
- else if (parser.getQNameIgnoreDefaultNs("namespace-uri").equals(fname)) {
- RESULT = new NamespaceUriCall(fname);
- }
- else {
- RESULT = new FunctionCall(fname, parser.EmptyArgs);
- }
- :}
-
- | FunctionName:fname LPAREN NonemptyArgumentList:argl RPAREN
- {:
- if (parser.getQNameIgnoreDefaultNs("concat").equals(fname)) {
- RESULT = new ConcatCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("number").equals(fname)) {
- RESULT = new NumberCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("document").equals(fname)) {
- parser.setMultiDocument(true);
- RESULT = new DocumentCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("string").equals(fname)) {
- RESULT = new StringCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("boolean").equals(fname)) {
- RESULT = new BooleanCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("name").equals(fname)) {
- RESULT = new NameCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("generate-id").equals(fname)) {
- RESULT = new GenerateIdCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("not").equals(fname)) {
- RESULT = new NotCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("format-number").equals(fname)) {
- RESULT = new FormatNumberCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("unparsed-entity-uri").equals(fname)) {
- RESULT = new UnparsedEntityUriCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("key").equals(fname)) {
- RESULT = new KeyCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("id").equals(fname)) {
- RESULT = new KeyCall(fname, argl);
- parser.setHasIdCall(true);
- }
- else if (parser.getQNameIgnoreDefaultNs("ceiling").equals(fname)) {
- RESULT = new CeilingCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("round").equals(fname)) {
- RESULT = new RoundCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("floor").equals(fname)) {
- RESULT = new FloorCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("contains").equals(fname)) {
- RESULT = new ContainsCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("string-length").equals(fname)) {
- RESULT = new StringLengthCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("starts-with").equals(fname)) {
- RESULT = new StartsWithCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("function-available").equals(fname)) {
- RESULT = new FunctionAvailableCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("element-available").equals(fname)) {
- RESULT = new ElementAvailableCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("local-name").equals(fname)) {
- RESULT = new LocalNameCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("lang").equals(fname)) {
- RESULT = new LangCall(fname, argl);
- }
- else if (parser.getQNameIgnoreDefaultNs("namespace-uri").equals(fname)) {
- RESULT = new NamespaceUriCall(fname, argl);
- }
- else if (parser.getQName(Constants.TRANSLET_URI, "xsltc", "cast").equals(fname)) {
- RESULT = new CastCall(fname, argl);
- }
- // Special case for extension function nodeset()
- else if (fname.getLocalPart().equals("nodeset") || fname.getLocalPart().equals("node-set")) {
- parser.setCallsNodeset(true); // implies MultiDOM
- RESULT = new FunctionCall(fname, argl);
- }
- else {
- RESULT = new FunctionCall(fname, argl);
- }
- :};
-
-NonemptyArgumentList ::= Argument:arg
- {:
- Vector temp = new Vector();
- temp.addElement(arg);
- RESULT = temp;
- :}
-
- | Argument:arg COMMA NonemptyArgumentList:argl
- {: argl.insertElementAt(arg, 0); RESULT = argl; :};
-
-FunctionName ::= QName:fname
- {:
- RESULT = fname;
- :};
-
-VariableName ::= QName:vname
- {:
- RESULT = vname;
- :};
-
-Argument ::= Expr:ex
- {: RESULT = ex; :};
-
-NodeTest ::= NameTest:nt
- {: RESULT = nt; :}
-
- | NODE
- {: RESULT = new Integer(NodeTest.ANODE); :}
-
- | TEXT
- {: RESULT = new Integer(NodeTest.TEXT); :}
-
- | COMMENT
- {: RESULT = new Integer(NodeTest.COMMENT); :}
-
- | PIPARAM LPAREN Literal:l RPAREN
- {:
- QName name = parser.getQNameIgnoreDefaultNs("name");
- Expression exp = new EqualityExpr(Operators.EQ,
- new NameCall(name),
- new LiteralExpr(l));
- Vector predicates = new Vector();
- predicates.addElement(new Predicate(exp));
- RESULT = new Step(Axis.CHILD, NodeTest.PI, predicates);
- :}
-
- | PI
- {: RESULT = new Integer(NodeTest.PI); :};
-
-NameTest ::= STAR
- {: RESULT = null; :}
-
- | QName:qn
- {: RESULT = qn; :};
-
-QName ::= QNAME:qname
- {: RESULT = parser.getQNameIgnoreDefaultNs(qname); :}
-
- | DIV
- {: RESULT = parser.getQNameIgnoreDefaultNs("div"); :}
-
- | MOD
- {: RESULT = parser.getQNameIgnoreDefaultNs("mod"); :}
-
- | KEY
- {: RESULT = parser.getQNameIgnoreDefaultNs("key"); :}
-
- | ANCESTOR
- {: RESULT = parser.getQNameIgnoreDefaultNs("child"); :}
-
- | ANCESTORORSELF
- {: RESULT = parser.getQNameIgnoreDefaultNs("ancestor-or-self"); :}
-
- | ATTRIBUTE
- {: RESULT = parser.getQNameIgnoreDefaultNs("attribute"); :}
-
- | CHILD
- {: RESULT = parser.getQNameIgnoreDefaultNs("child"); :}
-
- | DESCENDANT
- {: RESULT = parser.getQNameIgnoreDefaultNs("decendant"); :}
-
- | DESCENDANTORSELF
- {: RESULT = parser.getQNameIgnoreDefaultNs("decendant-or-self"); :}
-
- | FOLLOWING
- {: RESULT = parser.getQNameIgnoreDefaultNs("following"); :}
-
- | FOLLOWINGSIBLING
- {: RESULT = parser.getQNameIgnoreDefaultNs("following-sibling"); :}
-
- | NAMESPACE
- {: RESULT = parser.getQNameIgnoreDefaultNs("namespace"); :}
-
- | PARENT
- {: RESULT = parser.getQNameIgnoreDefaultNs("parent"); :}
-
- | PRECEDING
- {: RESULT = parser.getQNameIgnoreDefaultNs("preceding"); :}
-
- | PRECEDINGSIBLING
- {: RESULT = parser.getQNameIgnoreDefaultNs("preceding-sibling"); :}
-
- | SELF
- {: RESULT = parser.getQNameIgnoreDefaultNs("self"); :}
-
- | ID
- {: RESULT = parser.getQNameIgnoreDefaultNs("id"); :};
-
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex
deleted file mode 100644
index f1013f38eba..00000000000
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
- */
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * $Id: xpath.lex,v 1.12 2005/08/02 02:59:03 mcnamara Exp $
- */
-
-/*
- * @author Jacek Ambroziak
- * @author Santiago Pericas-Geertsen
- * @author Morten Jorgensen
- *
- */
-
-package com.sun.org.apache.xalan.internal.xsltc.compiler;
-
-import com.sun.java_cup.internal.runtime.Symbol;
-%%
-%cup
-%unicode
-%class XPathLexer
-%yyeof
-
-%{
- int last;
-
- void initialize() {
- last = -1;
- }
-
- static boolean isWhitespace(int c) {
- return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\f');
- }
-
- /**
- * If symbol is not followed by '::' or '(', then treat it as a
- * name instead of an axis or function (Jira-1912).
- */
- Symbol disambiguateAxisOrFunction(int ss) throws Exception {
- // Peek in the input buffer without changing the internal state
- int index = yy_buffer_index;
-
- // Skip whitespace
- while (index < yy_buffer_read && isWhitespace(yy_buffer[index])) {
- index++;
- }
-
- // If end of buffer, can't disambiguate :(
- if (index >= yy_buffer_read) {
- // Can't disambiguate, so return as symbol
- return new Symbol(ss);
- }
-
- // Return symbol if next token is '::' or '('
- return (yy_buffer[index] == ':' && yy_buffer[index+1] == ':' ||
- yy_buffer[index] == '(') ?
- newSymbol(ss) : newSymbol(sym.QNAME, yytext());
- }
-
- /**
- * If symbol is first token or if it follows any of the operators
- * listed in http://www.w3.org/TR/xpath#exprlex then treat as a
- * name instead of a keyword (Jira-1912).
- */
- Symbol disambiguateOperator(int ss) throws Exception {
- switch (last) {
- case -1: // first token
- case sym.ATSIGN:
- case sym.DCOLON:
- case sym.LPAREN:
- case sym.LBRACK:
- case sym.COMMA:
- case sym.AND:
- case sym.OR:
- case sym.MOD:
- case sym.DIV:
- case sym.MULT:
- case sym.SLASH:
- case sym.DSLASH:
- case sym.VBAR:
- case sym.PLUS:
- case sym.MINUS:
- case sym.EQ:
- case sym.NE:
- case sym.LT:
- case sym.LE:
- case sym.GT:
- case sym.GE:
- return newSymbol(sym.QNAME, yytext());
- }
- return newSymbol(ss);
- }
-
- /**
- * If symbol is first token or if it follows any of the operators
- * listed in http://www.w3.org/TR/xpath#exprlex then treat as a
- * wildcard instead of a multiplication operator
- */
- Symbol disambiguateStar() throws Exception {
- switch (last) {
- case -1: // first token
- case sym.ATSIGN:
- case sym.DCOLON:
- case sym.LPAREN:
- case sym.LBRACK:
- case sym.COMMA:
- case sym.AND:
- case sym.OR:
- case sym.MOD:
- case sym.DIV:
- case sym.MULT:
- case sym.SLASH:
- case sym.DSLASH:
- case sym.VBAR:
- case sym.PLUS:
- case sym.MINUS:
- case sym.EQ:
- case sym.NE:
- case sym.LT:
- case sym.LE:
- case sym.GT:
- case sym.GE:
- return newSymbol(sym.STAR);
- }
- return newSymbol(sym.MULT);
- }
-
- Symbol newSymbol(int ss) {
- last = ss;
- return new Symbol(ss);
- }
-
- Symbol newSymbol(int ss, String value) {
- last = ss;
- return new Symbol(ss, value);
- }
-
- Symbol newSymbol(int ss, Long value) {
- last = ss;
- return new Symbol(ss, value);
- }
-
- Symbol newSymbol(int ss, Double value) {
- last = ss;
- return new Symbol(ss, value);
- }
-%}
-
-%eofval{
-return newSymbol(sym.EOF);
-%eofval}
-
-%yylexthrow{
-Exception
-%yylexthrow}
-
-Letter={BaseChar}|{Ideographic}
-
-BaseChar=[\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\u0131\u0134-\u013E\u0141-\u0148\u014A-\u017E\u0180-\u01C3\u01CD-\u01F0\u01F4-\u01F5\u01FA-\u0217\u0250-\u02A8\u02BB-\u02C1\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03CE\u03D0-\u03D6\u03DA\u03DC\u03DE\u03E0\u03E2-\u03F3\u0401-\u040C\u040E-\u044F\u0451-\u045C\u045E-\u0481\u0490-\u04C4\u04C7-\u04C8\u04CB-\u04CC\u04D0-\u04EB\u04EE-\u04F5\u04F8-\u04F9\u0531-\u0556\u0559\u0561-\u0586\u05D0-\u05EA\u05F0-\u05F2\u0621-\u063A\u0641-\u064A\u0671-\u06B7\u06BA-\u06BE\u06C0-\u06CE\u06D0-\u06D3\u06D5\u06E5-\u06E6\u0905-\u0939\u093D\u0958-\u0961\u0985-\u098C\u098F-\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09DC-\u09DD\u09DF-\u09E1\u09F0-\u09F1\u0A05-\u0A0A\u0A0F-\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32-\u0A33\u0A35-\u0A36\u0A38-\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8B\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2-\u0AB3\u0AB5-\u0AB9\u0ABD\u0AE0\u0B05-\u0B0C\u0B0F-\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32-\u0B33\u0B36-\u0B39\u0B3D\u0B5C-\u0B5D\u0B5F-\u0B61\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99-\u0B9A\u0B9C\u0B9E-\u0B9F\u0BA3-\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB5\u0BB7-\u0BB9\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C60-\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CDE\u0CE0-\u0CE1\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D28\u0D2A-\u0D39\u0D60-\u0D61\u0E01-\u0E2E\u0E30\u0E32-\u0E33\u0E40-\u0E45\u0E81-\u0E82\u0E84\u0E87-\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA-\u0EAB\u0EAD-\u0EAE\u0EB0\u0EB2-\u0EB3\u0EBD\u0EC0-\u0EC4\u0F40-\u0F47\u0F49-\u0F69\u10A0-\u10C5\u10D0-\u10F6\u1100\u1102-\u1103\u1105-\u1107\u1109\u110B-\u110C\u110E-\u1112\u113C\u113E\u1140\u114C\u114E\u1150\u1154-\u1155\u1159\u115F-\u1161\u1163\u1165\u1167\u1169\u116D-\u116E\u1172-\u1173\u1175\u119E\u11A8\u11AB\u11AE-\u11AF\u11B7-\u11B8\u11BA\u11BC-\u11C2\u11EB\u11F0\u11F9\u1E00-\u1E9B\u1EA0-\u1EF9\u1F00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2126\u212A-\u212B\u212E\u2180-\u2182\u3041-\u3094\u30A1-\u30FA\u3105-\u312C\uAC00-\uD7A3]
-
-Ideographic=[\u4E00-\u9FA5\u3007\u3021-\u3029]
-
-CombiningChar=[\u0300-\u0345\u0360-\u0361\u0483-\u0486\u0591-\u05A1\u05A3-\u05B9\u05BB-\u05BD\u05BF\u05C1-\u05C2\u05C4\u064B-\u0652\u0670\u06D6-\u06DC\u06DD-\u06DF\u06E0-\u06E4\u06E7-\u06E8\u06EA-\u06ED\u0901-\u0903\u093C\u093E-\u094C\u094D\u0951-\u0954\u0962-\u0963\u0981-\u0983\u09BC\u09BE\u09BF\u09C0-\u09C4\u09C7-\u09C8\u09CB-\u09CD\u09D7\u09E2-\u09E3\u0A02\u0A3C\u0A3E\u0A3F\u0A40-\u0A42\u0A47-\u0A48\u0A4B-\u0A4D\u0A70-\u0A71\u0A81-\u0A83\u0ABC\u0ABE-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0B01-\u0B03\u0B3C\u0B3E-\u0B43\u0B47-\u0B48\u0B4B-\u0B4D\u0B56-\u0B57\u0B82-\u0B83\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD7\u0C01-\u0C03\u0C3E-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55-\u0C56\u0C82-\u0C83\u0CBE-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5-\u0CD6\u0D02-\u0D03\u0D3E-\u0D43\u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0E31\u0E34-\u0E3A\u0E47-\u0E4E\u0EB1\u0EB4-\u0EB9\u0EBB-\u0EBC\u0EC8-\u0ECD\u0F18-\u0F19\u0F35\u0F37\u0F39\u0F3E\u0F3F\u0F71-\u0F84\u0F86-\u0F8B\u0F90-\u0F95\u0F97\u0F99-\u0FAD\u0FB1-\u0FB7\u0FB9\u20D0-\u20DC\u20E1\u302A-\u302F\u3099\u309A]
-
-Digit=[\u0030-\u0039\u0660-\u0669\u06F0-\u06F9\u0966-\u096F\u09E6-\u09EF\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0BE7-\u0BEF\u0C66-\u0C6F\u0CE6-\u0CEF\u0D66-\u0D6F\u0E50-\u0E59\u0ED0-\u0ED9\u0F20-\u0F29]
-
-Extender=[\u00B7\u02D0\u02D1\u0387\u0640\u0E46\u0EC6\u3005\u3031-\u3035\u309D-\u309E\u30FC-\u30FE]
-
-NCName=({Letter}|"_"|{NCNameStartChar})({NCNameChar})*
-
-NCNameChar={Letter}|{Digit}|"."|"-"|"_"|{CombiningChar}|{Extender}|{NCNameStartChar}| \u00B7 | [\u0300-\u036F] | [\u203F-\u2040] | [\u0130-\u0136]
-
-NCNameStartChar=[\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD] | \u005F |({HighSurrogate}{LowSurrogate})
-
-HighSurrogate=[\uD800-\uDBFF]
-
-LowSurrogate=[\uDC00-\uDFFF]
-
-%%
-
-"*" { return disambiguateStar(); }
-"/" { return newSymbol(sym.SLASH); }
-"+" { return newSymbol(sym.PLUS); }
-"-" { return newSymbol(sym.MINUS); }
-"div" { return disambiguateOperator(sym.DIV); }
-"mod" { return disambiguateOperator(sym.MOD); }
-"::" { return newSymbol(sym.DCOLON); }
-"," { return newSymbol(sym.COMMA); }
-"@" { return newSymbol(sym.ATSIGN); }
-".." { return newSymbol(sym.DDOT); }
-"|" { return newSymbol(sym.VBAR); }
-"$" { return newSymbol(sym.DOLLAR); }
-"//" { return newSymbol(sym.DSLASH); }
-"=" { return newSymbol(sym.EQ); }
-"!=" { return newSymbol(sym.NE); }
-"<" { return newSymbol(sym.LT); }
-">" { return newSymbol(sym.GT); }
-"<=" { return newSymbol(sym.LE); }
-">=" { return newSymbol(sym.GE); }
-"id" { return disambiguateAxisOrFunction(sym.ID); }
-"key" { return disambiguateAxisOrFunction(sym.KEY); }
-"text()" { return newSymbol(sym.TEXT); }
-"text"+[ \t\r\n\f]+"()" { return newSymbol(sym.TEXT); }
-"node()" { return newSymbol(sym.NODE); }
-"node"+[ \t\r\n\f]+"()" { return newSymbol(sym.NODE); }
-"comment()" { return newSymbol(sym.COMMENT); }
-"comment"+[ \t\r\n\f]+"()" { return newSymbol(sym.COMMENT); }
-"processing-instruction" { return disambiguateAxisOrFunction(sym.PIPARAM); }
-"processing-instruction()" { return newSymbol(sym.PI); }
-"processing-instruction"+[ \t\r\n\f]+"()" { return newSymbol(sym.PI); }
-"or" { return disambiguateOperator(sym.OR); }
-"and" { return disambiguateOperator(sym.AND); }
-"child" { return disambiguateAxisOrFunction(sym.CHILD); }
-"attribute" { return disambiguateAxisOrFunction(sym.ATTRIBUTE); }
-"ancestor" { return disambiguateAxisOrFunction(sym.ANCESTOR); }
-"ancestor-or-self" { return disambiguateAxisOrFunction(sym.ANCESTORORSELF); }
-"descendant" { return disambiguateAxisOrFunction(sym.DESCENDANT); }
-"descendant-or-self" { return disambiguateAxisOrFunction(sym.DESCENDANTORSELF); }
-"following" { return disambiguateAxisOrFunction(sym.FOLLOWING); }
-"following-sibling" { return disambiguateAxisOrFunction(sym.FOLLOWINGSIBLING); }
-"namespace" { return disambiguateAxisOrFunction(sym.NAMESPACE); }
-"parent" { return disambiguateAxisOrFunction(sym.PARENT); }
-"preceding" { return disambiguateAxisOrFunction(sym.PRECEDING); }
-"preceding-sibling" { return disambiguateAxisOrFunction(sym.PRECEDINGSIBLING); }
-"self" { return disambiguateAxisOrFunction(sym.SELF); }
-"[" { return newSymbol(sym.LBRACK); }
-"]" { return newSymbol(sym.RBRACK); }
-"(" { return newSymbol(sym.LPAREN); }
-")" { return newSymbol(sym.RPAREN); }
-"" { initialize(); return new Symbol(sym.PATTERN); }
-"" { initialize(); return new Symbol(sym.EXPRESSION); }
-\"[^\"]*\" { return newSymbol(sym.Literal,
- yytext().substring(1, yytext().length() - 1)); }
-\'[^\']*\' { return newSymbol(sym.Literal,
- yytext().substring(1, yytext().length() - 1)); }
-{Digit}+ { return newSymbol(sym.INT, new Long(yytext())); }
-{Digit}+("."{Digit}*)? { return newSymbol(sym.REAL, new Double(yytext())); }
-"."{Digit}+ { return newSymbol(sym.REAL, new Double(yytext())); }
-"." { return newSymbol(sym.DOT); }
-({NCName}":")?{NCName} { return newSymbol(sym.QNAME, yytext()); }
-({NCName}":")?"*" { return newSymbol(sym.QNAME, yytext()); }
-({NCName}":")?"@*" { return newSymbol(sym.QNAME, yytext()); }
-[ \t\r\n\f] { /* ignore white space. */ }
-. { throw new Exception(yytext()); }
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res b/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res
deleted file mode 100644
index 0423630112d..00000000000
--- a/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res
+++ /dev/null
@@ -1,290 +0,0 @@
-# $Id: HTMLEntities.res,v 1.3 2000/08/30 18:59:20 arkin Exp $
-#
-# @author Assaf Arkin
-#
-# Character entity references for markup-significant
-#
-quot 34
-amp 38
-lt 60
-gt 62
-nbsp 160
-#
-# Character entity references for ISO 8859-1 characters
-#
-iexcl 161
-cent 162
-pound 163
-curren 164
-yen 165
-brvbar 166
-sect 167
-uml 168
-copy 169
-ordf 170
-laquo 171
-not 172
-shy 173
-reg 174
-macr 175
-deg 176
-plusmn 177
-sup2 178
-sup3 179
-acute 180
-micro 181
-para 182
-middot 183
-cedil 184
-sup1 185
-ordm 186
-raquo 187
-frac14 188
-frac12 189
-frac34 190
-iquest 191
-Agrave 192
-Aacute 193
-Acirc 194
-Atilde 195
-Auml 196
-Aring 197
-AElig 198
-Ccedil 199
-Egrave 200
-Eacute 201
-Ecirc 202
-Euml 203
-Igrave 204
-Iacute 205
-Icirc 206
-Iuml 207
-ETH 208
-Ntilde 209
-Ograve 210
-Oacute 211
-Ocirc 212
-Otilde 213
-Ouml 214
-times 215
-Oslash 216
-Ugrave 217
-Uacute 218
-Ucirc 219
-Uuml 220
-Yacute 221
-THORN 222
-szlig 223
-agrave 224
-aacute 225
-acirc 226
-atilde 227
-auml 228
-aring 229
-aelig 230
-ccedil 231
-egrave 232
-eacute 233
-ecirc 234
-euml 235
-igrave 236
-iacute 237
-icirc 238
-iuml 239
-eth 240
-ntilde 241
-ograve 242
-oacute 243
-ocirc 244
-otilde 245
-ouml 246
-divide 247
-oslash 248
-ugrave 249
-uacute 250
-ucirc 251
-uuml 252
-yacute 253
-thorn 254
-yuml 255
-#
-# Character entity references for symbols, mathematical symbols, and Greek letters
-#
-# Latin Extended
-fnof 402
-#
-# Greek
-Alpha 913
-Beta 914
-Gamma 915
-Delta 916
-Epsilon 917
-Zeta 918
-Eta 919
-Theta 920
-Iota 921
-Kappa 922
-Lambda 923
-Mu 924
-Nu 925
-Xi 926
-Omicron 927
-Pi 928
-Rho 929
-Sigma 931
-Tau 932
-Upsilon 933
-Phi 934
-Chi 935
-Psi 936
-Omega 937
-alpha 945
-beta 946
-gamma 947
-delta 948
-epsilon 949
-zeta 950
-eta 951
-theta 952
-iota 953
-kappa 954
-lambda 955
-mu 956
-nu 957
-xi 958
-omicron 959
-pi 960
-rho 961
-sigmaf 962
-sigma 963
-tau 964
-upsilon 965
-phi 966
-chi 967
-psi 968
-omega 969
-thetasym 977
-upsih 978
-piv 982
-#
-# General Punctuation
-bull 8226
-hellip 8230
-prime 8242
-Prime 8243
-oline 8254
-frasl 8260
-#
-# Letterlike Symbols
-weierp 8472
-image 8465
-real 8476
-trade 8482
-alefsym 8501
-#
-# Arrows
-larr 8592
-uarr 8593
-rarr 8594
-darr 8595
-harr 8596
-crarr 8629
-lArr 8656
-uArr 8657
-rArr 8658
-dArr 8659
-hArr 8660
-#
-# Mathematical Operators
-forall 8704
-part 8706
-exist 8707
-empty 8709
-nabla 8711
-isin 8712
-notin 8713
-ni 8715
-prod 8719
-sum 8721
-minus 8722
-lowast 8727
-radic 8730
-prop 8733
-infin 8734
-ang 8736
-and 8743
-or 8744
-cap 8745
-cup 8746
-int 8747
-there4 8756
-sim 8764
-cong 8773
-asymp 8776
-ne 8800
-equiv 8801
-le 8804
-ge 8805
-sub 8834
-sup 8835
-nsub 8836
-sube 8838
-supe 8839
-oplus 8853
-otimes 8855
-perp 8869
-sdot 8901
-#
-# Miscellaneous Technical
-lceil 8968
-rceil 8969
-lfloor 8970
-rfloor 8971
-lang 9001
-rang 9002
-#
-# Geometric Shapes
-loz 9674
-#
-# Miscellaneous Symbols
-spades 9824
-clubs 9827
-hearts 9829
-diams 9830
-#
-# Character entity references for internationalization characters
-#
-# Latin Extended-A
-OElig 338
-oelig 339
-#-- Commented out. NN 4.7 does not seem to support these --
-#Scaron 352
-#scaron 353
-Yuml 376
-#
-# Spacing Modifier Letters
-circ 710
-tilde 732
-#
-# General Punctuation
-ensp 8194
-emsp 8195
-thinsp 8201
-zwnj 8204
-zwj 8205
-lrm 8206
-rlm 8207
-ndash 8211
-mdash 8212
-lsquo 8216
-rsquo 8217
-sbquo 8218
-ldquo 8220
-rdquo 8221
-bdquo 8222
-dagger 8224
-Dagger 8225
-permil 8240
-lsaquo 8249
-rsaquo 8250
-euro 8364
diff --git a/jaxp/src/com/sun/java_cup/internal/runtime/Scanner.java b/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Scanner.java
similarity index 100%
rename from jaxp/src/com/sun/java_cup/internal/runtime/Scanner.java
rename to jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Scanner.java
diff --git a/jaxp/src/com/sun/java_cup/internal/runtime/Symbol.java b/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Symbol.java
similarity index 100%
rename from jaxp/src/com/sun/java_cup/internal/runtime/Symbol.java
rename to jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/Symbol.java
diff --git a/jaxp/src/com/sun/java_cup/internal/runtime/lr_parser.java b/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/lr_parser.java
similarity index 100%
rename from jaxp/src/com/sun/java_cup/internal/runtime/lr_parser.java
rename to jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/lr_parser.java
diff --git a/jaxp/src/com/sun/java_cup/internal/runtime/virtual_parse_stack.java b/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/virtual_parse_stack.java
similarity index 100%
rename from jaxp/src/com/sun/java_cup/internal/runtime/virtual_parse_stack.java
rename to jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/virtual_parse_stack.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/Constants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Constants.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/Constants.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Constants.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/ExceptionConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConstants.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/ExceptionConstants.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConstants.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/Repository.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Repository.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/Repository.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/Repository.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Attribute.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Attribute.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ClassParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ClassParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassParser.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Code.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Code.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Code.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Code.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/CodeException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/CodeException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/CodeException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/CodeException.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Constant.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Constant.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Constant.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Constant.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantString.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantString.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantString.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantString.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Deprecated.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Deprecated.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Field.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Field.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Field.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Field.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/InnerClass.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/InnerClass.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LineNumber.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumber.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/LineNumber.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumber.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Method.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Method.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Method.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Method.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Node.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Node.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Node.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Node.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/PMGClass.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/PMGClass.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/PMGClass.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/PMGClass.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Signature.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Signature.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Signature.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Signature.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/SourceFile.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/SourceFile.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/SourceFile.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/SourceFile.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMap.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMap.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMap.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMapType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMapType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapType.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Synthetic.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Synthetic.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Synthetic.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Synthetic.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Unknown.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Unknown.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Unknown.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Unknown.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Utility.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Utility.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Visitor.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Visitor.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/classfile/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/package.html
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/AALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AALOAD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/AALOAD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AALOAD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/AASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/AASTORE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ALOAD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ALOAD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ALOAD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ARETURN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARETURN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ARETURN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARETURN.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ASTORE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ASTORE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ASTORE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ATHROW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ATHROW.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ArrayType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ArrayType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayType.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BALOAD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BALOAD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BALOAD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BASTORE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BIPUSH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BIPUSH.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BasicType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BasicType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BasicType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BasicType.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BranchHandle.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchHandle.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BranchHandle.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchHandle.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/CALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CALOAD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/CALOAD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CALOAD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/CASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CASTORE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/CASTORE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CASTORE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/CPInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CPInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/CPInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CPInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGen.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassGen.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGen.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassGenException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGenException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassGenException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGenException.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassObserver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassObserver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassObserver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ClassObserver.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/D2F.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2F.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/D2F.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2F.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/D2I.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2I.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/D2I.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2I.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/D2L.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2L.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/D2L.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/D2L.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DADD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DADD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DADD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DADD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DALOAD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DALOAD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DALOAD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DASTORE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DCMPG.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPG.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DCMPG.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPG.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DCMPL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DCMPL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPL.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DCONST.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DCONST.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DDIV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DDIV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DDIV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DDIV.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DLOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DLOAD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DLOAD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DLOAD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DMUL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DMUL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DMUL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DMUL.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DNEG.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DNEG.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DNEG.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DNEG.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DREM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DREM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DREM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DREM.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DRETURN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DRETURN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DRETURN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DRETURN.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DSTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSTORE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DSTORE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSTORE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DSUB.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DSUB.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP_X1.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X1.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP_X1.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X1.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP_X2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X2.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP_X2.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X2.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/F2D.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2D.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/F2D.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2D.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/F2I.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2I.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/F2I.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2I.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/F2L.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2L.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/F2L.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/F2L.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FADD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FADD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FADD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FADD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FALOAD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FALOAD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FALOAD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FASTORE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FASTORE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FASTORE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FCMPG.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPG.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FCMPG.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPG.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FCMPL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FCMPL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPL.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FCONST.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FCONST.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FDIV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FDIV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FDIV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FDIV.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FLOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FLOAD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FLOAD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FLOAD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FMUL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FMUL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FNEG.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FNEG.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FNEG.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FNEG.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FREM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FREM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FREM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FREM.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FRETURN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FRETURN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FRETURN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FRETURN.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FSTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FSTORE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FSUB.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSUB.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FSUB.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FSUB.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldGen.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldObserver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldObserver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldObserver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldObserver.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/GETFIELD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETFIELD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/GETFIELD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETFIELD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/GOTO.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/GOTO.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/GOTO_W.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO_W.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/GOTO_W.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO_W.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2B.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2B.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/I2B.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2B.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2C.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2C.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/I2C.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2C.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2D.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2D.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/I2D.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2D.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2F.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2F.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/I2F.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2F.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2L.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2L.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/I2L.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2L.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2S.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2S.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/I2S.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/I2S.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IADD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IADD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IADD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IADD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IALOAD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IALOAD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IALOAD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IAND.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IAND.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IASTORE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IASTORE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IASTORE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ICONST.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ICONST.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IDIV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IDIV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFEQ.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFEQ.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFEQ.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFEQ.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFGE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFGE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFGT.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGT.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFGT.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFGT.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFLE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFLE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFLT.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLT.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFLT.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFLT.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNULL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNULL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNULL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IFNULL.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IINC.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IINC.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IINC.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IINC.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ILOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ILOAD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ILOAD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ILOAD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IMUL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMUL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IMUL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IMUL.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/INEG.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INEG.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/INEG.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INEG.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IOR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IOR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IOR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IOR.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IREM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IREM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IRETURN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IRETURN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IRETURN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IRETURN.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ISHL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ISHL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHL.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ISHR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ISHR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISHR.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ISTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISTORE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ISTORE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISTORE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ISUB.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISUB.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ISUB.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ISUB.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IUSHR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IUSHR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IUSHR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IUSHR.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IXOR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IXOR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IfInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IfInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IfInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IfInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/Instruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/Instruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionList.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/JSR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/JSR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/JSR_W.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR_W.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/JSR_W.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JSR_W.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/L2D.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2D.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/L2D.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2D.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/L2F.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2F.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/L2F.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2F.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/L2I.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2I.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/L2I.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/L2I.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LADD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LADD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LADD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LADD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LALOAD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LALOAD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LALOAD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LAND.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LAND.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LAND.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LAND.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LASTORE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LCMP.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCMP.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LCMP.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCMP.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LCONST.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LCONST.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC2_W.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC2_W.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC_W.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC_W.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC_W.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC_W.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LDIV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LDIV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LLOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LLOAD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LLOAD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LLOAD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LMUL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LMUL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LMUL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LMUL.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LNEG.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LNEG.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LNEG.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LNEG.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LOR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LOR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LOR.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LREM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LREM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LRETURN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LRETURN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LRETURN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LRETURN.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LSHL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LSHL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LSHR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LSHR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSHR.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LSTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSTORE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LSTORE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSTORE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LSUB.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSUB.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LSUB.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LSUB.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LUSHR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LUSHR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LXOR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LXOR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LXOR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LXOR.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LoadClass.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadClass.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LoadClass.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadClass.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodObserver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodObserver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodObserver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodObserver.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/NEW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEW.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/NEW.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEW.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/NOP.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NOP.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/NOP.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NOP.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ObjectType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ObjectType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ObjectType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ObjectType.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/POP.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/POP.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/POP2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/POP2.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/PUSH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUSH.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/PUSH.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUSH.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/PopInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PopInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/PopInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PopInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/PushInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PushInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/PushInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/PushInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/RET.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RET.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/RET.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RET.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/RETURN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RETURN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/RETURN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/RETURN.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ReferenceType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ReferenceType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/SALOAD.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SALOAD.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/SALOAD.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SALOAD.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/SASTORE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SASTORE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/SASTORE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SASTORE.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/SIPUSH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/SIPUSH.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/SWAP.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWAP.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/SWAP.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWAP.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/SWITCH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWITCH.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/SWITCH.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SWITCH.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/Select.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/Select.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/StackConsumer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackConsumer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/StackConsumer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackConsumer.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/StackInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/StackInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/StackProducer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackProducer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/StackProducer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StackProducer.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/TargetLostException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TargetLostException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/TargetLostException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TargetLostException.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/Type.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/Type.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/Visitor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Visitor.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/Visitor.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Visitor.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/generic/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/generic/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/package.html
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/package.html
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/AttributeHTML.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/AttributeHTML.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/AttributeHTML.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/AttributeHTML.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/BCELFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/BCELFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/BCELifier.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELifier.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/BCELifier.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELifier.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ByteSequence.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ByteSequence.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ByteSequence.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ByteSequence.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Class2HTML.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Class2HTML.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassLoader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassLoader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassLoader.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassPath.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassPath.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassPath.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassQueue.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassQueue.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassQueue.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassQueue.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassSet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassSet.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassSet.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassSet.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassStack.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassStack.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassStack.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassVector.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ClassVector.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ClassVector.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/CodeHTML.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/CodeHTML.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/CodeHTML.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/CodeHTML.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/ConstantHTML.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ConstantHTML.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/ConstantHTML.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/ConstantHTML.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/InstructionFinder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/InstructionFinder.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/JavaWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/JavaWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/MethodHTML.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/MethodHTML.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/MethodHTML.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/MethodHTML.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/Repository.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Repository.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/Repository.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/Repository.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/SecuritySupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SecuritySupport.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/SecuritySupport.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SecuritySupport.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java
diff --git a/jaxp/src/com/sun/org/apache/bcel/internal/util/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/bcel/internal/util/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/package.html
diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java
diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/CharacterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/CharacterIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/regexp/internal/CharacterIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/CharacterIterator.java
diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/RE.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RE.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/regexp/internal/RE.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RE.java
diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/RECompiler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RECompiler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/regexp/internal/RECompiler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RECompiler.java
diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/REDebugCompiler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/REDebugCompiler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/regexp/internal/REDebugCompiler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/REDebugCompiler.java
diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/REProgram.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/REProgram.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/regexp/internal/REProgram.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/REProgram.java
diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/RESyntaxException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RESyntaxException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/regexp/internal/RESyntaxException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RESyntaxException.java
diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/RETest.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RETest.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/regexp/internal/RETest.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/RETest.java
diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/REUtil.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/REUtil.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/regexp/internal/REUtil.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/REUtil.java
diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java
diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java
diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/StringCharacterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/StringCharacterIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/regexp/internal/StringCharacterIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/StringCharacterIterator.java
diff --git a/jaxp/src/com/sun/org/apache/regexp/internal/recompile.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/recompile.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/regexp/internal/recompile.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal/recompile.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/Version.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/Version.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/Version.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/Version.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/XalanConstants.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/XalanConstants.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/extensions/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/extensions/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/extensions/package.html
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltBase.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltBase.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltBase.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltMath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltMath.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltMath.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltMath.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltSets.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltSets.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/Extensions.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/Extensions.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/Extensions.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/Extensions.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/NodeInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/NodeInfo.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/NodeInfo.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/NodeInfo.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/lib/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/lib/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/package.html
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLMessages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLMessages.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/res/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/package.html
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/templates/Constants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/Constants.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/templates/Constants.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/Constants.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/templates/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/templates/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/templates/package.html
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/FeatureManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FeatureManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/FeatureManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FeatureManager.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xslt/Process.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/Process.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xslt/Process.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/Process.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xslt/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xslt/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xslt/package.html
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOM.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/Translet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/Translet.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/TransletException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/TransletException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/TransletException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/TransletException.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttributeMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/AttributeMap.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ChildNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ChildNode.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/ChildNode.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ChildNode.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/CommentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CommentImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/CommentImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CommentImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNode.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredNode.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNode.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/EntityImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/EntityImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/LCount.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/LCount.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeListCache.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeListCache.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeListCache.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NodeListCache.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/NotationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NotationImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/NotationImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NotationImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ParentNode.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ParentNode.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/RangeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/RangeImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/TextImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TextImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/TextImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TextImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/Version.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Version.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/Version.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Version.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDParser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/AttributesProxy.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AttributesProxy.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/AttributesProxy.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AttributesProxy.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMInputSource.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DOMInputSource.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMInputSource.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMUtil.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMUtil.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EncodingMap.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EncodingMap.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/FeatureState.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/FeatureState.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/FeatureState.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/FeatureState.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/IntStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/IntStack.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/IntStack.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/IntStack.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/LocatorProxy.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorProxy.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/LocatorProxy.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorProxy.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/MessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/MessageFormatter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/MessageFormatter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/MessageFormatter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/PropertyState.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/PropertyState.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/PropertyState.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/PropertyState.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SAX2XNI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SAX2XNI.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SAXInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXInputSource.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SAXInputSource.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXInputSource.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SecurityManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SecurityManager.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/StAXInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXInputSource.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/StAXInputSource.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXInputSource.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/Status.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/Status.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/Status.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/Status.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolTable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolTable.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/URI.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/URI.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XML11Char.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XML11Char.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XML11Char.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XML11Char.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLChar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLChar.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLChar.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLChar.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLSymbols.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLSymbols.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/util/XMLSymbols.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLSymbols.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/Augmentations.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/Augmentations.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/QName.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/QName.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/QName.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/QName.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLLocator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLLocator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLLocator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLLocator.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLString.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLString.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLString.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLString.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XNIException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XNIException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/XNIException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XNIException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/LSInputList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/LSInputList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/ShortList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/ShortList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/StringList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/StringList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSConstants.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSConstants.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSConstants.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSException.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSFacet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSFacet.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSFacet.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSFacet.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSImplementation.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSImplementation.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSImplementation.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSImplementation.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSLoader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSLoader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSLoader.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModel.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModel.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModel.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModel.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSObject.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObject.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSObject.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObject.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSObjectList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSObjectList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSParticle.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSParticle.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSParticle.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSParticle.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSTerm.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTerm.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSTerm.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTerm.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSWildcard.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSWildcard.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/XSWildcard.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSWildcard.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/package.html
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/Axis.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/Axis.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/Axis.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/Axis.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTM.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMException.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMManager.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLMessages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/res/XMLMessages.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Catalog.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Catalog.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogException.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogManager.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/Resolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Resolver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/Resolver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Resolver.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/ElementState.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/ElementState.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/ElementState.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/ElementState.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/Encodings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/Encodings.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/LineSeparator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/LineSeparator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/LineSeparator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/LineSeparator.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/Method.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Method.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/Method.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Method.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/OutputFormat.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/OutputFormat.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/OutputFormat.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/OutputFormat.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/Printer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Printer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/Printer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Printer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/Serializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Serializer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/Serializer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Serializer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/TextSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/TextSerializer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/TextSerializer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/TextSerializer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/DOM3Serializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOM3Serializer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/DOM3Serializer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOM3Serializer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ElemContext.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemContext.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ElemContext.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemContext.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ElemDesc.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemDesc.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ElemDesc.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ElemDesc.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.properties
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Method.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Method.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/Method.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Method.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Serializer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Serializer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/Serializer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Serializer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerBase.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerBase.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToStream.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToStream.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextStream.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextStream.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TreeWalker.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/TreeWalker.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Utils.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Utils.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/Utils.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Utils.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Version.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Version.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/Version.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Version.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterChain.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterChain.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterChain.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterChain.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XMLEntities.properties
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOM3SerializerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3SerializerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOM3SerializerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3SerializerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMConstants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMConstants.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMConstants.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMConstants.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorHandlerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorHandlerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorHandlerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorHandlerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMErrorImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMLocatorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMLocatorImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMLocatorImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMLocatorImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMOutputImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMOutputImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMOutputImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMOutputImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/LSSerializerImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/LSSerializerImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/LSSerializerImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/LSSerializerImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/output_html.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/output_html.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/output_text.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_text.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/output_text.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_text.properties
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/output_unknown.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_unknown.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/output_unknown.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_unknown.properties
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/output_xml.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_xml.properties
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/output_xml.properties
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_xml.properties
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/package.html
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/AttList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/AttList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/AttList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/AttList.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/URI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/URI.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/Utils.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Utils.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/Utils.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Utils.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/AttList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/AttList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/AttList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/AttList.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/BoolStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/BoolStack.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/BoolStack.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/BoolStack.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/CharKey.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/CharKey.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/CharKey.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/CharKey.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/Constants.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Constants.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/Constants.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Constants.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/DOM2Helper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOM2Helper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/DOM2Helper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOM2Helper.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMBuilder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/DOMBuilder.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMHelper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMHelper.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMOrder.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMOrder.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/DOMOrder.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMOrder.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ElemDesc.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ElemDesc.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/IntStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntStack.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/IntStack.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntStack.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/IntVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntVector.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/IntVector.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/IntVector.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/LocaleUtility.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/LocaleUtility.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/LocaleUtility.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/LocaleUtility.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/NSInfo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NSInfo.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/NSInfo.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NSInfo.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/NameSpace.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NameSpace.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/NameSpace.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NameSpace.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/NodeConsumer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeConsumer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/NodeConsumer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeConsumer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/NodeVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeVector.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/NodeVector.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/NodeVector.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectStack.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectStack.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectStack.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectVector.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectVector.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectVector.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/PrefixResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/PrefixResolver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolver.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/QName.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/QName.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StopParseException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StopParseException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StopParseException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StopParseException.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StringBufferPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringBufferPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StringBufferPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringBufferPool.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StringComparable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StringComparable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StringToIntTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToIntTable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StringToIntTable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToIntTable.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StringToStringTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StringToStringTable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTable.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StringVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringVector.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StringVector.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringVector.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/TreeWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/TreeWalker.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/TreeWalker.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/TreeWalker.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/Trie.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Trie.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/Trie.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/Trie.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/URI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/URI.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/UnImplNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/UnImplNode.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/UnImplNode.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/UnImplNode.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/WrongParserException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrongParserException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/WrongParserException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/WrongParserException.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XML11Char.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XML11Char.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XML11Char.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XML11Char.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLChar.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLChar.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLChar.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLChar.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLString.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLString.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLString.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLString.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/package.html
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_de.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_de.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_de.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_en.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_en.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_en.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_en.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_es.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_es.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_es.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_it.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_it.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_it.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/Arg.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Arg.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/Arg.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Arg.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/CachedXPathAPI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/CachedXPathAPI.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/CachedXPathAPI.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/CachedXPathAPI.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/Expression.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/Expression.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/ExpressionNode.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionNode.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/ExpressionNode.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionNode.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/ExpressionOwner.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionOwner.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/ExpressionOwner.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExpressionOwner.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/ExtensionsProvider.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/ExtensionsProvider.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/FoundIndex.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/FoundIndex.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/FoundIndex.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/FoundIndex.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/NodeSet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/NodeSet.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/NodeSetDTM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSetDTM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/NodeSetDTM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSetDTM.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/SourceTree.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTree.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/SourceTree.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTree.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/SourceTreeManager.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/SourceTreeManager.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/VariableStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/VariableStack.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPath.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/XPath.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathAPI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathAPI.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathAPI.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathAPI.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathProcessorException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathProcessorException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathProcessorException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathProcessorException.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathVisitable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathVisitable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitable.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathVisitor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitor.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/XPathVisitor.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathVisitor.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/AxesWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/AxesWalker.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/ChildIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/ChildIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/IteratorPool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/IteratorPool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/NodeSequence.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/NodeSequence.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/PathComponent.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PathComponent.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/PathComponent.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PathComponent.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/RTFIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/RTFIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/RTFIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/RTFIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/SubContextList.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SubContextList.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/SubContextList.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/SubContextList.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/axes/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/axes/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/package.html
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Compiler.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Compiler.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Keywords.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Keywords.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Lexer.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/Lexer.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpCodes.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpCodes.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpCodes.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpCodes.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpMap.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpMap.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/compiler/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/compiler/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/package.html
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/domapi/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/domapi/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/package.html
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncConcat.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncConcat.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncConcat.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncConcat.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncContains.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncContains.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncContains.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncContains.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCount.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCount.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCount.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCount.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncFalse.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncFalse.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncFloor.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFloor.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncFloor.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFloor.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncId.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncId.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncId.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncId.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLang.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLang.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLang.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLang.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLast.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLast.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNot.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNot.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNot.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNot.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNumber.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNumber.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNumber.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNumber.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncPosition.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncPosition.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncQname.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncQname.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncQname.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncQname.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncRound.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncRound.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncRound.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncRound.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncString.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncString.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncString.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncString.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSum.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSum.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSum.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSum.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncTrue.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncTrue.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/Function.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/Function.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/Function2Args.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/Function2Args.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/Function3Args.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/Function3Args.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/functions/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/functions/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/package.html
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XBoolean.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBoolean.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XBoolean.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBoolean.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XNodeSet.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XNodeSet.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XNull.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNull.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XNull.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNull.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XNumber.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNumber.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XNumber.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNumber.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XObject.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XObject.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XString.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XString.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XString.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XString.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XStringForChars.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForChars.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XStringForChars.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForChars.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/objects/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/objects/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/package.html
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/And.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/And.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/And.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/And.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Bool.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Bool.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Bool.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Bool.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Div.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Div.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Div.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Div.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Equals.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Equals.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Equals.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Equals.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Gt.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gt.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Gt.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gt.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Gte.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gte.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Gte.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Gte.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Lt.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lt.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Lt.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lt.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Lte.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lte.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Lte.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Lte.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Minus.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Minus.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Minus.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Minus.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Mod.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mod.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Mod.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mod.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Mult.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mult.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Mult.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Mult.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Neg.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Neg.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Neg.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Neg.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/NotEquals.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/NotEquals.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/NotEquals.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/NotEquals.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Number.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Number.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Number.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Number.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Operation.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Operation.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Or.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Or.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Or.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Or.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Plus.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Plus.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Plus.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Plus.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Quo.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Quo.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Quo.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Quo.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/String.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/String.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/String.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/String.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/Variable.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/Variable.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/operations/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/operations/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/package.html
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/package.html
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/NodeTest.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/NodeTest.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/StepPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/StepPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/patterns/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/patterns/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/package.html
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHMessages.java
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHMessages.java
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/package.html b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/package.html
similarity index 100%
rename from jaxp/src/com/sun/org/apache/xpath/internal/res/package.html
rename to jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/package.html
diff --git a/jaxp/src/com/sun/xml/internal/stream/Entity.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/Entity.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/Entity.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/Entity.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/EventFilterSupport.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/EventFilterSupport.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/EventFilterSupport.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/EventFilterSupport.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/StaxErrorReporter.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxErrorReporter.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/StaxErrorReporter.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxErrorReporter.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/StaxXMLInputSource.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxXMLInputSource.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/StaxXMLInputSource.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/StaxXMLInputSource.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/XMLBufferListener.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/XMLBufferListener.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/XMLEntityReader.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityReader.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/XMLEntityReader.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityReader.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityStorage.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEntityStorage.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/XMLEventReaderImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEventReaderImpl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/XMLEventReaderImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLEventReaderImpl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/XMLInputFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLInputFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/XMLInputFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLInputFactoryImpl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/AttributeImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/AttributeImpl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/AttributeImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/AttributeImpl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/CharacterEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CharacterEvent.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/CharacterEvent.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CharacterEvent.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/CommentEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CommentEvent.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/CommentEvent.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/CommentEvent.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/DTDEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DTDEvent.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/DTDEvent.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DTDEvent.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/DummyEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DummyEvent.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/DummyEvent.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/DummyEvent.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/EndDocumentEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndDocumentEvent.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/EndDocumentEvent.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndDocumentEvent.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/EndElementEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndElementEvent.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/EndElementEvent.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EndElementEvent.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/EntityReferenceEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityReferenceEvent.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/EntityReferenceEvent.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/EntityReferenceEvent.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/LocationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/LocationImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/NamedEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamedEvent.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/NamedEvent.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamedEvent.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/NamespaceImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/NamespaceImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/StartDocumentEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartDocumentEvent.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/StartDocumentEvent.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartDocumentEvent.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/StartElementEvent.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartElementEvent.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/StartElementEvent.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/StartElementEvent.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/util/BufferAllocator.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/util/BufferAllocator.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/util/ReadOnlyIterator.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ReadOnlyIterator.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/util/ReadOnlyIterator.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ReadOnlyIterator.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/WriterUtility.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/WriterUtility.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/writers/WriterUtility.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/WriterUtility.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/XMLOutputSource.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLOutputSource.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/writers/XMLOutputSource.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLOutputSource.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java
diff --git a/jaxp/src/com/sun/xml/internal/stream/writers/XMLWriter.java b/jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLWriter.java
similarity index 100%
rename from jaxp/src/com/sun/xml/internal/stream/writers/XMLWriter.java
rename to jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLWriter.java
diff --git a/jaxp/src/javax/xml/XMLConstants.java b/jaxp/src/java.xml/share/classes/javax/xml/XMLConstants.java
similarity index 100%
rename from jaxp/src/javax/xml/XMLConstants.java
rename to jaxp/src/java.xml/share/classes/javax/xml/XMLConstants.java
diff --git a/jaxp/src/javax/xml/datatype/DatatypeConfigurationException.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java
similarity index 100%
rename from jaxp/src/javax/xml/datatype/DatatypeConfigurationException.java
rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java
diff --git a/jaxp/src/javax/xml/datatype/DatatypeConstants.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java
similarity index 100%
rename from jaxp/src/javax/xml/datatype/DatatypeConstants.java
rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java
diff --git a/jaxp/src/javax/xml/datatype/DatatypeFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java
similarity index 100%
rename from jaxp/src/javax/xml/datatype/DatatypeFactory.java
rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java
diff --git a/jaxp/src/javax/xml/datatype/Duration.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/Duration.java
similarity index 100%
rename from jaxp/src/javax/xml/datatype/Duration.java
rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/Duration.java
diff --git a/jaxp/src/javax/xml/datatype/FactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java
similarity index 100%
rename from jaxp/src/javax/xml/datatype/FactoryFinder.java
rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java
diff --git a/jaxp/src/javax/xml/datatype/SecuritySupport.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/SecuritySupport.java
similarity index 100%
rename from jaxp/src/javax/xml/datatype/SecuritySupport.java
rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/SecuritySupport.java
diff --git a/jaxp/src/javax/xml/datatype/XMLGregorianCalendar.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java
similarity index 100%
rename from jaxp/src/javax/xml/datatype/XMLGregorianCalendar.java
rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java
diff --git a/jaxp/src/javax/xml/datatype/package.html b/jaxp/src/java.xml/share/classes/javax/xml/datatype/package.html
similarity index 100%
rename from jaxp/src/javax/xml/datatype/package.html
rename to jaxp/src/java.xml/share/classes/javax/xml/datatype/package.html
diff --git a/jaxp/src/javax/xml/namespace/NamespaceContext.java b/jaxp/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java
similarity index 100%
rename from jaxp/src/javax/xml/namespace/NamespaceContext.java
rename to jaxp/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java
diff --git a/jaxp/src/javax/xml/namespace/QName.java b/jaxp/src/java.xml/share/classes/javax/xml/namespace/QName.java
similarity index 100%
rename from jaxp/src/javax/xml/namespace/QName.java
rename to jaxp/src/java.xml/share/classes/javax/xml/namespace/QName.java
diff --git a/jaxp/src/javax/xml/namespace/package.html b/jaxp/src/java.xml/share/classes/javax/xml/namespace/package.html
similarity index 100%
rename from jaxp/src/javax/xml/namespace/package.html
rename to jaxp/src/java.xml/share/classes/javax/xml/namespace/package.html
diff --git a/jaxp/src/javax/xml/parsers/DocumentBuilder.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java
similarity index 100%
rename from jaxp/src/javax/xml/parsers/DocumentBuilder.java
rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java
diff --git a/jaxp/src/javax/xml/parsers/DocumentBuilderFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java
similarity index 100%
rename from jaxp/src/javax/xml/parsers/DocumentBuilderFactory.java
rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java
diff --git a/jaxp/src/javax/xml/parsers/FactoryConfigurationError.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java
similarity index 100%
rename from jaxp/src/javax/xml/parsers/FactoryConfigurationError.java
rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java
diff --git a/jaxp/src/javax/xml/parsers/FactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java
similarity index 100%
rename from jaxp/src/javax/xml/parsers/FactoryFinder.java
rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java
diff --git a/jaxp/src/javax/xml/parsers/ParserConfigurationException.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java
similarity index 100%
rename from jaxp/src/javax/xml/parsers/ParserConfigurationException.java
rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java
diff --git a/jaxp/src/javax/xml/parsers/SAXParser.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java
similarity index 100%
rename from jaxp/src/javax/xml/parsers/SAXParser.java
rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java
diff --git a/jaxp/src/javax/xml/parsers/SAXParserFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java
similarity index 100%
rename from jaxp/src/javax/xml/parsers/SAXParserFactory.java
rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java
diff --git a/jaxp/src/javax/xml/parsers/SecuritySupport.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/SecuritySupport.java
similarity index 100%
rename from jaxp/src/javax/xml/parsers/SecuritySupport.java
rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/SecuritySupport.java
diff --git a/jaxp/src/javax/xml/parsers/package.html b/jaxp/src/java.xml/share/classes/javax/xml/parsers/package.html
similarity index 100%
rename from jaxp/src/javax/xml/parsers/package.html
rename to jaxp/src/java.xml/share/classes/javax/xml/parsers/package.html
diff --git a/jaxp/src/javax/xml/stream/EventFilter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/EventFilter.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/EventFilter.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/EventFilter.java
diff --git a/jaxp/src/javax/xml/stream/FactoryConfigurationError.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/FactoryConfigurationError.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java
diff --git a/jaxp/src/javax/xml/stream/FactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/FactoryFinder.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java
diff --git a/jaxp/src/javax/xml/stream/Location.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/Location.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/Location.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/Location.java
diff --git a/jaxp/src/javax/xml/stream/SecuritySupport.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/SecuritySupport.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/SecuritySupport.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/SecuritySupport.java
diff --git a/jaxp/src/javax/xml/stream/StreamFilter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/StreamFilter.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/StreamFilter.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/StreamFilter.java
diff --git a/jaxp/src/javax/xml/stream/XMLEventFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/XMLEventFactory.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java
diff --git a/jaxp/src/javax/xml/stream/XMLEventReader.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventReader.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/XMLEventReader.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventReader.java
diff --git a/jaxp/src/javax/xml/stream/XMLEventWriter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/XMLEventWriter.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java
diff --git a/jaxp/src/javax/xml/stream/XMLInputFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/XMLInputFactory.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java
diff --git a/jaxp/src/javax/xml/stream/XMLOutputFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/XMLOutputFactory.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java
diff --git a/jaxp/src/javax/xml/stream/XMLReporter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLReporter.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/XMLReporter.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLReporter.java
diff --git a/jaxp/src/javax/xml/stream/XMLResolver.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLResolver.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/XMLResolver.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLResolver.java
diff --git a/jaxp/src/javax/xml/stream/XMLStreamConstants.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamConstants.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/XMLStreamConstants.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamConstants.java
diff --git a/jaxp/src/javax/xml/stream/XMLStreamException.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/XMLStreamException.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java
diff --git a/jaxp/src/javax/xml/stream/XMLStreamReader.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/XMLStreamReader.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java
diff --git a/jaxp/src/javax/xml/stream/XMLStreamWriter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/XMLStreamWriter.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java
diff --git a/jaxp/src/javax/xml/stream/events/Attribute.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Attribute.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/Attribute.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/Attribute.java
diff --git a/jaxp/src/javax/xml/stream/events/Characters.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Characters.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/Characters.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/Characters.java
diff --git a/jaxp/src/javax/xml/stream/events/Comment.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Comment.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/Comment.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/Comment.java
diff --git a/jaxp/src/javax/xml/stream/events/DTD.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/DTD.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/DTD.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/DTD.java
diff --git a/jaxp/src/javax/xml/stream/events/EndDocument.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndDocument.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/EndDocument.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndDocument.java
diff --git a/jaxp/src/javax/xml/stream/events/EndElement.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndElement.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/EndElement.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/EndElement.java
diff --git a/jaxp/src/javax/xml/stream/events/EntityDeclaration.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityDeclaration.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/EntityDeclaration.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityDeclaration.java
diff --git a/jaxp/src/javax/xml/stream/events/EntityReference.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityReference.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/EntityReference.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/EntityReference.java
diff --git a/jaxp/src/javax/xml/stream/events/Namespace.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/Namespace.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/Namespace.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/Namespace.java
diff --git a/jaxp/src/javax/xml/stream/events/NotationDeclaration.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/NotationDeclaration.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/NotationDeclaration.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/NotationDeclaration.java
diff --git a/jaxp/src/javax/xml/stream/events/ProcessingInstruction.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/ProcessingInstruction.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/ProcessingInstruction.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/ProcessingInstruction.java
diff --git a/jaxp/src/javax/xml/stream/events/StartDocument.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartDocument.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/StartDocument.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartDocument.java
diff --git a/jaxp/src/javax/xml/stream/events/StartElement.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartElement.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/StartElement.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/StartElement.java
diff --git a/jaxp/src/javax/xml/stream/events/XMLEvent.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/events/XMLEvent.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/events/XMLEvent.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/events/XMLEvent.java
diff --git a/jaxp/src/javax/xml/stream/util/EventReaderDelegate.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/EventReaderDelegate.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/util/EventReaderDelegate.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/util/EventReaderDelegate.java
diff --git a/jaxp/src/javax/xml/stream/util/StreamReaderDelegate.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/StreamReaderDelegate.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/util/StreamReaderDelegate.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/util/StreamReaderDelegate.java
diff --git a/jaxp/src/javax/xml/stream/util/XMLEventAllocator.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventAllocator.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/util/XMLEventAllocator.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventAllocator.java
diff --git a/jaxp/src/javax/xml/stream/util/XMLEventConsumer.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventConsumer.java
similarity index 100%
rename from jaxp/src/javax/xml/stream/util/XMLEventConsumer.java
rename to jaxp/src/java.xml/share/classes/javax/xml/stream/util/XMLEventConsumer.java
diff --git a/jaxp/src/javax/xml/transform/ErrorListener.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/ErrorListener.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/ErrorListener.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/ErrorListener.java
diff --git a/jaxp/src/javax/xml/transform/FactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/FactoryFinder.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java
diff --git a/jaxp/src/javax/xml/transform/OutputKeys.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/OutputKeys.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/OutputKeys.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/OutputKeys.java
diff --git a/jaxp/src/javax/xml/transform/Result.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/Result.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/Result.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/Result.java
diff --git a/jaxp/src/javax/xml/transform/SecuritySupport.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/SecuritySupport.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/SecuritySupport.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/SecuritySupport.java
diff --git a/jaxp/src/javax/xml/transform/Source.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/Source.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/Source.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/Source.java
diff --git a/jaxp/src/javax/xml/transform/SourceLocator.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/SourceLocator.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/SourceLocator.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/SourceLocator.java
diff --git a/jaxp/src/javax/xml/transform/Templates.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/Templates.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/Templates.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/Templates.java
diff --git a/jaxp/src/javax/xml/transform/Transformer.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/Transformer.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/Transformer.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/Transformer.java
diff --git a/jaxp/src/javax/xml/transform/TransformerConfigurationException.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerConfigurationException.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/TransformerConfigurationException.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerConfigurationException.java
diff --git a/jaxp/src/javax/xml/transform/TransformerException.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerException.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/TransformerException.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerException.java
diff --git a/jaxp/src/javax/xml/transform/TransformerFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/TransformerFactory.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java
diff --git a/jaxp/src/javax/xml/transform/TransformerFactoryConfigurationError.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactoryConfigurationError.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/TransformerFactoryConfigurationError.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactoryConfigurationError.java
diff --git a/jaxp/src/javax/xml/transform/URIResolver.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/URIResolver.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/URIResolver.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/URIResolver.java
diff --git a/jaxp/src/javax/xml/transform/dom/DOMLocator.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMLocator.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/dom/DOMLocator.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMLocator.java
diff --git a/jaxp/src/javax/xml/transform/dom/DOMResult.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/dom/DOMResult.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java
diff --git a/jaxp/src/javax/xml/transform/dom/DOMSource.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/dom/DOMSource.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java
diff --git a/jaxp/src/javax/xml/transform/dom/package.html b/jaxp/src/java.xml/share/classes/javax/xml/transform/dom/package.html
similarity index 100%
rename from jaxp/src/javax/xml/transform/dom/package.html
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/dom/package.html
diff --git a/jaxp/src/javax/xml/transform/overview.html b/jaxp/src/java.xml/share/classes/javax/xml/transform/overview.html
similarity index 100%
rename from jaxp/src/javax/xml/transform/overview.html
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/overview.html
diff --git a/jaxp/src/javax/xml/transform/package.html b/jaxp/src/java.xml/share/classes/javax/xml/transform/package.html
similarity index 100%
rename from jaxp/src/javax/xml/transform/package.html
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/package.html
diff --git a/jaxp/src/javax/xml/transform/sax/SAXResult.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/sax/SAXResult.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java
diff --git a/jaxp/src/javax/xml/transform/sax/SAXSource.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/sax/SAXSource.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java
diff --git a/jaxp/src/javax/xml/transform/sax/SAXTransformerFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXTransformerFactory.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/sax/SAXTransformerFactory.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/sax/SAXTransformerFactory.java
diff --git a/jaxp/src/javax/xml/transform/sax/TemplatesHandler.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/TemplatesHandler.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/sax/TemplatesHandler.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/sax/TemplatesHandler.java
diff --git a/jaxp/src/javax/xml/transform/sax/TransformerHandler.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/TransformerHandler.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/sax/TransformerHandler.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/sax/TransformerHandler.java
diff --git a/jaxp/src/javax/xml/transform/sax/package.html b/jaxp/src/java.xml/share/classes/javax/xml/transform/sax/package.html
similarity index 100%
rename from jaxp/src/javax/xml/transform/sax/package.html
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/sax/package.html
diff --git a/jaxp/src/javax/xml/transform/stax/StAXResult.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/stax/StAXResult.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java
diff --git a/jaxp/src/javax/xml/transform/stax/StAXSource.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/stax/StAXSource.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java
diff --git a/jaxp/src/javax/xml/transform/stax/package.html b/jaxp/src/java.xml/share/classes/javax/xml/transform/stax/package.html
similarity index 100%
rename from jaxp/src/javax/xml/transform/stax/package.html
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/stax/package.html
diff --git a/jaxp/src/javax/xml/transform/stream/StreamResult.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/stream/StreamResult.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java
diff --git a/jaxp/src/javax/xml/transform/stream/StreamSource.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java
similarity index 100%
rename from jaxp/src/javax/xml/transform/stream/StreamSource.java
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java
diff --git a/jaxp/src/javax/xml/transform/stream/package.html b/jaxp/src/java.xml/share/classes/javax/xml/transform/stream/package.html
similarity index 100%
rename from jaxp/src/javax/xml/transform/stream/package.html
rename to jaxp/src/java.xml/share/classes/javax/xml/transform/stream/package.html
diff --git a/jaxp/src/javax/xml/validation/Schema.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/Schema.java
similarity index 100%
rename from jaxp/src/javax/xml/validation/Schema.java
rename to jaxp/src/java.xml/share/classes/javax/xml/validation/Schema.java
diff --git a/jaxp/src/javax/xml/validation/SchemaFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java
similarity index 100%
rename from jaxp/src/javax/xml/validation/SchemaFactory.java
rename to jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java
diff --git a/jaxp/src/javax/xml/validation/SchemaFactoryConfigurationError.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryConfigurationError.java
similarity index 100%
rename from jaxp/src/javax/xml/validation/SchemaFactoryConfigurationError.java
rename to jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryConfigurationError.java
diff --git a/jaxp/src/javax/xml/validation/SchemaFactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java
similarity index 100%
rename from jaxp/src/javax/xml/validation/SchemaFactoryFinder.java
rename to jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java
diff --git a/jaxp/src/javax/xml/validation/SchemaFactoryLoader.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java
similarity index 100%
rename from jaxp/src/javax/xml/validation/SchemaFactoryLoader.java
rename to jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java
diff --git a/jaxp/src/javax/xml/validation/SecuritySupport.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SecuritySupport.java
similarity index 100%
rename from jaxp/src/javax/xml/validation/SecuritySupport.java
rename to jaxp/src/java.xml/share/classes/javax/xml/validation/SecuritySupport.java
diff --git a/jaxp/src/javax/xml/validation/TypeInfoProvider.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java
similarity index 100%
rename from jaxp/src/javax/xml/validation/TypeInfoProvider.java
rename to jaxp/src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java
diff --git a/jaxp/src/javax/xml/validation/Validator.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/Validator.java
similarity index 100%
rename from jaxp/src/javax/xml/validation/Validator.java
rename to jaxp/src/java.xml/share/classes/javax/xml/validation/Validator.java
diff --git a/jaxp/src/javax/xml/validation/ValidatorHandler.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java
similarity index 100%
rename from jaxp/src/javax/xml/validation/ValidatorHandler.java
rename to jaxp/src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java
diff --git a/jaxp/src/javax/xml/validation/package.html b/jaxp/src/java.xml/share/classes/javax/xml/validation/package.html
similarity index 100%
rename from jaxp/src/javax/xml/validation/package.html
rename to jaxp/src/java.xml/share/classes/javax/xml/validation/package.html
diff --git a/jaxp/src/javax/xml/xpath/SecuritySupport.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/SecuritySupport.java
similarity index 100%
rename from jaxp/src/javax/xml/xpath/SecuritySupport.java
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/SecuritySupport.java
diff --git a/jaxp/src/javax/xml/xpath/XPath.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPath.java
similarity index 100%
rename from jaxp/src/javax/xml/xpath/XPath.java
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPath.java
diff --git a/jaxp/src/javax/xml/xpath/XPathConstants.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java
similarity index 100%
rename from jaxp/src/javax/xml/xpath/XPathConstants.java
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java
diff --git a/jaxp/src/javax/xml/xpath/XPathException.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathException.java
similarity index 100%
rename from jaxp/src/javax/xml/xpath/XPathException.java
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathException.java
diff --git a/jaxp/src/javax/xml/xpath/XPathExpression.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java
similarity index 100%
rename from jaxp/src/javax/xml/xpath/XPathExpression.java
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java
diff --git a/jaxp/src/javax/xml/xpath/XPathExpressionException.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java
similarity index 100%
rename from jaxp/src/javax/xml/xpath/XPathExpressionException.java
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java
diff --git a/jaxp/src/javax/xml/xpath/XPathFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java
similarity index 100%
rename from jaxp/src/javax/xml/xpath/XPathFactory.java
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java
diff --git a/jaxp/src/javax/xml/xpath/XPathFactoryConfigurationException.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java
similarity index 100%
rename from jaxp/src/javax/xml/xpath/XPathFactoryConfigurationException.java
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java
diff --git a/jaxp/src/javax/xml/xpath/XPathFactoryFinder.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java
similarity index 100%
rename from jaxp/src/javax/xml/xpath/XPathFactoryFinder.java
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java
diff --git a/jaxp/src/javax/xml/xpath/XPathFunction.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java
similarity index 100%
rename from jaxp/src/javax/xml/xpath/XPathFunction.java
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java
diff --git a/jaxp/src/javax/xml/xpath/XPathFunctionException.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java
similarity index 100%
rename from jaxp/src/javax/xml/xpath/XPathFunctionException.java
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java
diff --git a/jaxp/src/javax/xml/xpath/XPathFunctionResolver.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java
similarity index 100%
rename from jaxp/src/javax/xml/xpath/XPathFunctionResolver.java
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java
diff --git a/jaxp/src/javax/xml/xpath/XPathVariableResolver.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java
similarity index 100%
rename from jaxp/src/javax/xml/xpath/XPathVariableResolver.java
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java
diff --git a/jaxp/src/javax/xml/xpath/package.html b/jaxp/src/java.xml/share/classes/javax/xml/xpath/package.html
similarity index 100%
rename from jaxp/src/javax/xml/xpath/package.html
rename to jaxp/src/java.xml/share/classes/javax/xml/xpath/package.html
diff --git a/jaxp/src/org/w3c/dom/Attr.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Attr.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/Attr.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Attr.java
diff --git a/jaxp/src/org/w3c/dom/CDATASection.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/CDATASection.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/CDATASection.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/CDATASection.java
diff --git a/jaxp/src/org/w3c/dom/CharacterData.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/CharacterData.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/CharacterData.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/CharacterData.java
diff --git a/jaxp/src/org/w3c/dom/Comment.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Comment.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/Comment.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Comment.java
diff --git a/jaxp/src/org/w3c/dom/DOMConfiguration.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMConfiguration.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/DOMConfiguration.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMConfiguration.java
diff --git a/jaxp/src/org/w3c/dom/DOMError.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMError.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/DOMError.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMError.java
diff --git a/jaxp/src/org/w3c/dom/DOMErrorHandler.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMErrorHandler.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/DOMErrorHandler.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMErrorHandler.java
diff --git a/jaxp/src/org/w3c/dom/DOMException.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMException.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/DOMException.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMException.java
diff --git a/jaxp/src/org/w3c/dom/DOMImplementation.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementation.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/DOMImplementation.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementation.java
diff --git a/jaxp/src/org/w3c/dom/DOMImplementationList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementationList.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/DOMImplementationList.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementationList.java
diff --git a/jaxp/src/org/w3c/dom/DOMImplementationSource.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementationSource.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/DOMImplementationSource.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMImplementationSource.java
diff --git a/jaxp/src/org/w3c/dom/DOMLocator.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMLocator.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/DOMLocator.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMLocator.java
diff --git a/jaxp/src/org/w3c/dom/DOMStringList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DOMStringList.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/DOMStringList.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DOMStringList.java
diff --git a/jaxp/src/org/w3c/dom/Document.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Document.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/Document.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Document.java
diff --git a/jaxp/src/org/w3c/dom/DocumentFragment.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DocumentFragment.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/DocumentFragment.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DocumentFragment.java
diff --git a/jaxp/src/org/w3c/dom/DocumentType.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/DocumentType.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/DocumentType.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/DocumentType.java
diff --git a/jaxp/src/org/w3c/dom/Element.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Element.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/Element.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Element.java
diff --git a/jaxp/src/org/w3c/dom/Entity.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Entity.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/Entity.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Entity.java
diff --git a/jaxp/src/org/w3c/dom/EntityReference.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/EntityReference.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/EntityReference.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/EntityReference.java
diff --git a/jaxp/src/org/w3c/dom/NameList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/NameList.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/NameList.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/NameList.java
diff --git a/jaxp/src/org/w3c/dom/NamedNodeMap.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/NamedNodeMap.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/NamedNodeMap.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/NamedNodeMap.java
diff --git a/jaxp/src/org/w3c/dom/Node.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Node.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/Node.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Node.java
diff --git a/jaxp/src/org/w3c/dom/NodeList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/NodeList.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/NodeList.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/NodeList.java
diff --git a/jaxp/src/org/w3c/dom/Notation.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Notation.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/Notation.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Notation.java
diff --git a/jaxp/src/org/w3c/dom/ProcessingInstruction.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ProcessingInstruction.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ProcessingInstruction.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ProcessingInstruction.java
diff --git a/jaxp/src/org/w3c/dom/Text.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Text.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/Text.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/Text.java
diff --git a/jaxp/src/org/w3c/dom/TypeInfo.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/TypeInfo.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/TypeInfo.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/TypeInfo.java
diff --git a/jaxp/src/org/w3c/dom/UserDataHandler.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/UserDataHandler.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/UserDataHandler.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/UserDataHandler.java
diff --git a/jaxp/src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/bootstrap/DOMImplementationRegistry.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/bootstrap/DOMImplementationRegistry.java
diff --git a/jaxp/src/org/w3c/dom/css/CSS2Properties.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSS2Properties.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSS2Properties.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSS2Properties.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSCharsetRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSCharsetRule.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSCharsetRule.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSCharsetRule.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSFontFaceRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSFontFaceRule.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSFontFaceRule.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSFontFaceRule.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSImportRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSImportRule.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSImportRule.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSImportRule.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSMediaRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSMediaRule.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSMediaRule.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSMediaRule.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSPageRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSPageRule.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSPageRule.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSPageRule.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSPrimitiveValue.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSPrimitiveValue.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSPrimitiveValue.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSPrimitiveValue.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSRule.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSRule.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSRule.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSRuleList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSRuleList.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSRuleList.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSRuleList.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSStyleDeclaration.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleDeclaration.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSStyleDeclaration.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleDeclaration.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSStyleRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleRule.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSStyleRule.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleRule.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSStyleSheet.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleSheet.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSStyleSheet.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleSheet.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSUnknownRule.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSUnknownRule.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSUnknownRule.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSUnknownRule.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSValue.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSValue.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSValue.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSValue.java
diff --git a/jaxp/src/org/w3c/dom/css/CSSValueList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSValueList.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/CSSValueList.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSValueList.java
diff --git a/jaxp/src/org/w3c/dom/css/Counter.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/Counter.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/Counter.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/Counter.java
diff --git a/jaxp/src/org/w3c/dom/css/DOMImplementationCSS.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/DOMImplementationCSS.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/DOMImplementationCSS.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/DOMImplementationCSS.java
diff --git a/jaxp/src/org/w3c/dom/css/DocumentCSS.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/DocumentCSS.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/DocumentCSS.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/DocumentCSS.java
diff --git a/jaxp/src/org/w3c/dom/css/ElementCSSInlineStyle.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/ElementCSSInlineStyle.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/ElementCSSInlineStyle.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/ElementCSSInlineStyle.java
diff --git a/jaxp/src/org/w3c/dom/css/RGBColor.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/RGBColor.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/RGBColor.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/RGBColor.java
diff --git a/jaxp/src/org/w3c/dom/css/Rect.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/Rect.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/Rect.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/Rect.java
diff --git a/jaxp/src/org/w3c/dom/css/ViewCSS.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/css/ViewCSS.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/css/ViewCSS.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/css/ViewCSS.java
diff --git a/jaxp/src/org/w3c/dom/events/DocumentEvent.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/DocumentEvent.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/events/DocumentEvent.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/DocumentEvent.java
diff --git a/jaxp/src/org/w3c/dom/events/Event.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/Event.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/events/Event.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/Event.java
diff --git a/jaxp/src/org/w3c/dom/events/EventException.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventException.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/events/EventException.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventException.java
diff --git a/jaxp/src/org/w3c/dom/events/EventListener.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventListener.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/events/EventListener.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventListener.java
diff --git a/jaxp/src/org/w3c/dom/events/EventTarget.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventTarget.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/events/EventTarget.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/EventTarget.java
diff --git a/jaxp/src/org/w3c/dom/events/MouseEvent.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/MouseEvent.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/events/MouseEvent.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/MouseEvent.java
diff --git a/jaxp/src/org/w3c/dom/events/MutationEvent.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/MutationEvent.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/events/MutationEvent.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/MutationEvent.java
diff --git a/jaxp/src/org/w3c/dom/events/UIEvent.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/events/UIEvent.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/events/UIEvent.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/events/UIEvent.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLAnchorElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAnchorElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLAnchorElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAnchorElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLAppletElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAppletElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLAppletElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAppletElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLAreaElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAreaElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLAreaElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAreaElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLBRElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBRElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLBRElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBRElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLBaseElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBaseElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLBaseElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBaseElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLBaseFontElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBaseFontElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLBaseFontElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBaseFontElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLBodyElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBodyElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLBodyElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBodyElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLButtonElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLButtonElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLButtonElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLButtonElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLCollection.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLCollection.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLCollection.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLCollection.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLDListElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDListElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLDListElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDListElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLDOMImplementation.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDOMImplementation.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLDOMImplementation.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDOMImplementation.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLDirectoryElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDirectoryElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLDirectoryElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDirectoryElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLDivElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDivElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLDivElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDivElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLDocument.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDocument.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLDocument.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDocument.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLFieldSetElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFieldSetElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLFieldSetElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFieldSetElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLFontElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFontElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLFontElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFontElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLFormElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFormElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLFormElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFormElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLFrameElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFrameElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLFrameElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFrameElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLFrameSetElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFrameSetElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLFrameSetElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFrameSetElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLHRElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHRElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLHRElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHRElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLHeadElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHeadElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLHeadElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHeadElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLHeadingElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHeadingElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLHeadingElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHeadingElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLHtmlElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHtmlElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLHtmlElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHtmlElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLIFrameElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLIFrameElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLIFrameElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLIFrameElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLImageElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLImageElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLImageElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLImageElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLInputElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLInputElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLInputElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLInputElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLIsIndexElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLIsIndexElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLIsIndexElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLIsIndexElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLLIElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLIElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLLIElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLIElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLLabelElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLabelElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLLabelElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLabelElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLLegendElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLegendElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLLegendElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLegendElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLLinkElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLinkElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLLinkElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLinkElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLMapElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMapElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLMapElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMapElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLMenuElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMenuElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLMenuElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMenuElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLMetaElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMetaElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLMetaElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMetaElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLModElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLModElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLModElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLModElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLOListElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOListElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLOListElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOListElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLObjectElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLObjectElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLObjectElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLObjectElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLOptGroupElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOptGroupElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLOptGroupElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOptGroupElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLOptionElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOptionElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLOptionElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOptionElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLParagraphElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLParagraphElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLParagraphElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLParagraphElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLParamElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLParamElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLParamElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLParamElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLPreElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLPreElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLPreElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLPreElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLQuoteElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLQuoteElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLQuoteElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLQuoteElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLScriptElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLScriptElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLScriptElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLScriptElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLSelectElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLSelectElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLSelectElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLSelectElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLStyleElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLStyleElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLStyleElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLStyleElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLTableCaptionElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableCaptionElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLTableCaptionElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableCaptionElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLTableCellElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableCellElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLTableCellElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableCellElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLTableColElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableColElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLTableColElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableColElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLTableElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLTableElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLTableRowElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableRowElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLTableRowElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableRowElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLTableSectionElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableSectionElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLTableSectionElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableSectionElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLTextAreaElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTextAreaElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLTextAreaElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTextAreaElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLTitleElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTitleElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLTitleElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTitleElement.java
diff --git a/jaxp/src/org/w3c/dom/html/HTMLUListElement.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLUListElement.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/html/HTMLUListElement.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLUListElement.java
diff --git a/jaxp/src/org/w3c/dom/ls/DOMImplementationLS.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/DOMImplementationLS.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ls/DOMImplementationLS.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/DOMImplementationLS.java
diff --git a/jaxp/src/org/w3c/dom/ls/LSException.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ls/LSException.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java
diff --git a/jaxp/src/org/w3c/dom/ls/LSInput.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSInput.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ls/LSInput.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSInput.java
diff --git a/jaxp/src/org/w3c/dom/ls/LSLoadEvent.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSLoadEvent.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ls/LSLoadEvent.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSLoadEvent.java
diff --git a/jaxp/src/org/w3c/dom/ls/LSOutput.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSOutput.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ls/LSOutput.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSOutput.java
diff --git a/jaxp/src/org/w3c/dom/ls/LSParser.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSParser.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ls/LSParser.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSParser.java
diff --git a/jaxp/src/org/w3c/dom/ls/LSParserFilter.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSParserFilter.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ls/LSParserFilter.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSParserFilter.java
diff --git a/jaxp/src/org/w3c/dom/ls/LSProgressEvent.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSProgressEvent.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ls/LSProgressEvent.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSProgressEvent.java
diff --git a/jaxp/src/org/w3c/dom/ls/LSResourceResolver.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSResourceResolver.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ls/LSResourceResolver.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSResourceResolver.java
diff --git a/jaxp/src/org/w3c/dom/ls/LSSerializer.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializer.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ls/LSSerializer.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializer.java
diff --git a/jaxp/src/org/w3c/dom/ls/LSSerializerFilter.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializerFilter.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ls/LSSerializerFilter.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializerFilter.java
diff --git a/jaxp/src/org/w3c/dom/package.html b/jaxp/src/java.xml/share/classes/org/w3c/dom/package.html
similarity index 100%
rename from jaxp/src/org/w3c/dom/package.html
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/package.html
diff --git a/jaxp/src/org/w3c/dom/ranges/DocumentRange.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/DocumentRange.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ranges/DocumentRange.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/DocumentRange.java
diff --git a/jaxp/src/org/w3c/dom/ranges/Range.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/Range.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ranges/Range.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/Range.java
diff --git a/jaxp/src/org/w3c/dom/ranges/RangeException.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/ranges/RangeException.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java
diff --git a/jaxp/src/org/w3c/dom/ranges/package.html b/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/package.html
similarity index 100%
rename from jaxp/src/org/w3c/dom/ranges/package.html
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/package.html
diff --git a/jaxp/src/org/w3c/dom/stylesheets/DocumentStyle.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/DocumentStyle.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/stylesheets/DocumentStyle.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/DocumentStyle.java
diff --git a/jaxp/src/org/w3c/dom/stylesheets/LinkStyle.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/LinkStyle.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/stylesheets/LinkStyle.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/LinkStyle.java
diff --git a/jaxp/src/org/w3c/dom/stylesheets/MediaList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/MediaList.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/stylesheets/MediaList.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/MediaList.java
diff --git a/jaxp/src/org/w3c/dom/stylesheets/StyleSheet.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/StyleSheet.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/stylesheets/StyleSheet.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/StyleSheet.java
diff --git a/jaxp/src/org/w3c/dom/stylesheets/StyleSheetList.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/StyleSheetList.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/stylesheets/StyleSheetList.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/StyleSheetList.java
diff --git a/jaxp/src/org/w3c/dom/traversal/DocumentTraversal.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/DocumentTraversal.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/traversal/DocumentTraversal.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/DocumentTraversal.java
diff --git a/jaxp/src/org/w3c/dom/traversal/NodeFilter.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/NodeFilter.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/traversal/NodeFilter.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/NodeFilter.java
diff --git a/jaxp/src/org/w3c/dom/traversal/NodeIterator.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/NodeIterator.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/traversal/NodeIterator.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/NodeIterator.java
diff --git a/jaxp/src/org/w3c/dom/traversal/TreeWalker.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/TreeWalker.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/traversal/TreeWalker.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/traversal/TreeWalker.java
diff --git a/jaxp/src/org/w3c/dom/views/AbstractView.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/views/AbstractView.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/views/AbstractView.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/views/AbstractView.java
diff --git a/jaxp/src/org/w3c/dom/views/DocumentView.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/views/DocumentView.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/views/DocumentView.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/views/DocumentView.java
diff --git a/jaxp/src/org/w3c/dom/xpath/COPYRIGHT.html b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/COPYRIGHT.html
similarity index 100%
rename from jaxp/src/org/w3c/dom/xpath/COPYRIGHT.html
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/COPYRIGHT.html
diff --git a/jaxp/src/org/w3c/dom/xpath/XPathEvaluator.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathEvaluator.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/xpath/XPathEvaluator.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathEvaluator.java
diff --git a/jaxp/src/org/w3c/dom/xpath/XPathException.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathException.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/xpath/XPathException.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathException.java
diff --git a/jaxp/src/org/w3c/dom/xpath/XPathExpression.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathExpression.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/xpath/XPathExpression.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathExpression.java
diff --git a/jaxp/src/org/w3c/dom/xpath/XPathNSResolver.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathNSResolver.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/xpath/XPathNSResolver.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathNSResolver.java
diff --git a/jaxp/src/org/w3c/dom/xpath/XPathNamespace.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathNamespace.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/xpath/XPathNamespace.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathNamespace.java
diff --git a/jaxp/src/org/w3c/dom/xpath/XPathResult.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathResult.java
similarity index 100%
rename from jaxp/src/org/w3c/dom/xpath/XPathResult.java
rename to jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathResult.java
diff --git a/jaxp/src/org/xml/sax/AttributeList.java b/jaxp/src/java.xml/share/classes/org/xml/sax/AttributeList.java
similarity index 100%
rename from jaxp/src/org/xml/sax/AttributeList.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/AttributeList.java
diff --git a/jaxp/src/org/xml/sax/Attributes.java b/jaxp/src/java.xml/share/classes/org/xml/sax/Attributes.java
similarity index 100%
rename from jaxp/src/org/xml/sax/Attributes.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/Attributes.java
diff --git a/jaxp/src/org/xml/sax/ContentHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ContentHandler.java
similarity index 100%
rename from jaxp/src/org/xml/sax/ContentHandler.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/ContentHandler.java
diff --git a/jaxp/src/org/xml/sax/DTDHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/DTDHandler.java
similarity index 100%
rename from jaxp/src/org/xml/sax/DTDHandler.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/DTDHandler.java
diff --git a/jaxp/src/org/xml/sax/DocumentHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/DocumentHandler.java
similarity index 100%
rename from jaxp/src/org/xml/sax/DocumentHandler.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/DocumentHandler.java
diff --git a/jaxp/src/org/xml/sax/EntityResolver.java b/jaxp/src/java.xml/share/classes/org/xml/sax/EntityResolver.java
similarity index 100%
rename from jaxp/src/org/xml/sax/EntityResolver.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/EntityResolver.java
diff --git a/jaxp/src/org/xml/sax/ErrorHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ErrorHandler.java
similarity index 100%
rename from jaxp/src/org/xml/sax/ErrorHandler.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/ErrorHandler.java
diff --git a/jaxp/src/org/xml/sax/HandlerBase.java b/jaxp/src/java.xml/share/classes/org/xml/sax/HandlerBase.java
similarity index 100%
rename from jaxp/src/org/xml/sax/HandlerBase.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/HandlerBase.java
diff --git a/jaxp/src/org/xml/sax/InputSource.java b/jaxp/src/java.xml/share/classes/org/xml/sax/InputSource.java
similarity index 100%
rename from jaxp/src/org/xml/sax/InputSource.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/InputSource.java
diff --git a/jaxp/src/org/xml/sax/Locator.java b/jaxp/src/java.xml/share/classes/org/xml/sax/Locator.java
similarity index 100%
rename from jaxp/src/org/xml/sax/Locator.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/Locator.java
diff --git a/jaxp/src/org/xml/sax/Parser.java b/jaxp/src/java.xml/share/classes/org/xml/sax/Parser.java
similarity index 100%
rename from jaxp/src/org/xml/sax/Parser.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/Parser.java
diff --git a/jaxp/src/org/xml/sax/SAXException.java b/jaxp/src/java.xml/share/classes/org/xml/sax/SAXException.java
similarity index 100%
rename from jaxp/src/org/xml/sax/SAXException.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/SAXException.java
diff --git a/jaxp/src/org/xml/sax/SAXNotRecognizedException.java b/jaxp/src/java.xml/share/classes/org/xml/sax/SAXNotRecognizedException.java
similarity index 100%
rename from jaxp/src/org/xml/sax/SAXNotRecognizedException.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/SAXNotRecognizedException.java
diff --git a/jaxp/src/org/xml/sax/SAXNotSupportedException.java b/jaxp/src/java.xml/share/classes/org/xml/sax/SAXNotSupportedException.java
similarity index 100%
rename from jaxp/src/org/xml/sax/SAXNotSupportedException.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/SAXNotSupportedException.java
diff --git a/jaxp/src/org/xml/sax/SAXParseException.java b/jaxp/src/java.xml/share/classes/org/xml/sax/SAXParseException.java
similarity index 100%
rename from jaxp/src/org/xml/sax/SAXParseException.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/SAXParseException.java
diff --git a/jaxp/src/org/xml/sax/XMLFilter.java b/jaxp/src/java.xml/share/classes/org/xml/sax/XMLFilter.java
similarity index 100%
rename from jaxp/src/org/xml/sax/XMLFilter.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/XMLFilter.java
diff --git a/jaxp/src/org/xml/sax/XMLReader.java b/jaxp/src/java.xml/share/classes/org/xml/sax/XMLReader.java
similarity index 100%
rename from jaxp/src/org/xml/sax/XMLReader.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/XMLReader.java
diff --git a/jaxp/src/org/xml/sax/ext/Attributes2.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/Attributes2.java
similarity index 100%
rename from jaxp/src/org/xml/sax/ext/Attributes2.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/Attributes2.java
diff --git a/jaxp/src/org/xml/sax/ext/Attributes2Impl.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/Attributes2Impl.java
similarity index 100%
rename from jaxp/src/org/xml/sax/ext/Attributes2Impl.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/Attributes2Impl.java
diff --git a/jaxp/src/org/xml/sax/ext/DeclHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/DeclHandler.java
similarity index 100%
rename from jaxp/src/org/xml/sax/ext/DeclHandler.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/DeclHandler.java
diff --git a/jaxp/src/org/xml/sax/ext/DefaultHandler2.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/DefaultHandler2.java
similarity index 100%
rename from jaxp/src/org/xml/sax/ext/DefaultHandler2.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/DefaultHandler2.java
diff --git a/jaxp/src/org/xml/sax/ext/EntityResolver2.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/EntityResolver2.java
similarity index 100%
rename from jaxp/src/org/xml/sax/ext/EntityResolver2.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/EntityResolver2.java
diff --git a/jaxp/src/org/xml/sax/ext/LexicalHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/LexicalHandler.java
similarity index 100%
rename from jaxp/src/org/xml/sax/ext/LexicalHandler.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/LexicalHandler.java
diff --git a/jaxp/src/org/xml/sax/ext/Locator2.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/Locator2.java
similarity index 100%
rename from jaxp/src/org/xml/sax/ext/Locator2.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/Locator2.java
diff --git a/jaxp/src/org/xml/sax/ext/Locator2Impl.java b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/Locator2Impl.java
similarity index 100%
rename from jaxp/src/org/xml/sax/ext/Locator2Impl.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/Locator2Impl.java
diff --git a/jaxp/src/org/xml/sax/ext/package.html b/jaxp/src/java.xml/share/classes/org/xml/sax/ext/package.html
similarity index 100%
rename from jaxp/src/org/xml/sax/ext/package.html
rename to jaxp/src/java.xml/share/classes/org/xml/sax/ext/package.html
diff --git a/jaxp/src/org/xml/sax/helpers/AttributeListImpl.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/AttributeListImpl.java
similarity index 100%
rename from jaxp/src/org/xml/sax/helpers/AttributeListImpl.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/AttributeListImpl.java
diff --git a/jaxp/src/org/xml/sax/helpers/AttributesImpl.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/AttributesImpl.java
similarity index 100%
rename from jaxp/src/org/xml/sax/helpers/AttributesImpl.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/AttributesImpl.java
diff --git a/jaxp/src/org/xml/sax/helpers/DefaultHandler.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/DefaultHandler.java
similarity index 100%
rename from jaxp/src/org/xml/sax/helpers/DefaultHandler.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/DefaultHandler.java
diff --git a/jaxp/src/org/xml/sax/helpers/LocatorImpl.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/LocatorImpl.java
similarity index 100%
rename from jaxp/src/org/xml/sax/helpers/LocatorImpl.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/LocatorImpl.java
diff --git a/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NamespaceSupport.java
similarity index 100%
rename from jaxp/src/org/xml/sax/helpers/NamespaceSupport.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NamespaceSupport.java
diff --git a/jaxp/src/org/xml/sax/helpers/NewInstance.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NewInstance.java
similarity index 100%
rename from jaxp/src/org/xml/sax/helpers/NewInstance.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NewInstance.java
diff --git a/jaxp/src/org/xml/sax/helpers/ParserAdapter.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserAdapter.java
similarity index 100%
rename from jaxp/src/org/xml/sax/helpers/ParserAdapter.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserAdapter.java
diff --git a/jaxp/src/org/xml/sax/helpers/ParserFactory.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserFactory.java
similarity index 100%
rename from jaxp/src/org/xml/sax/helpers/ParserFactory.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserFactory.java
diff --git a/jaxp/src/org/xml/sax/helpers/SecuritySupport.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/SecuritySupport.java
similarity index 100%
rename from jaxp/src/org/xml/sax/helpers/SecuritySupport.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/SecuritySupport.java
diff --git a/jaxp/src/org/xml/sax/helpers/XMLFilterImpl.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLFilterImpl.java
similarity index 100%
rename from jaxp/src/org/xml/sax/helpers/XMLFilterImpl.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLFilterImpl.java
diff --git a/jaxp/src/org/xml/sax/helpers/XMLReaderAdapter.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderAdapter.java
similarity index 100%
rename from jaxp/src/org/xml/sax/helpers/XMLReaderAdapter.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderAdapter.java
diff --git a/jaxp/src/org/xml/sax/helpers/XMLReaderFactory.java b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderFactory.java
similarity index 100%
rename from jaxp/src/org/xml/sax/helpers/XMLReaderFactory.java
rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderFactory.java
diff --git a/jaxp/src/org/xml/sax/helpers/package.html b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/package.html
similarity index 100%
rename from jaxp/src/org/xml/sax/helpers/package.html
rename to jaxp/src/java.xml/share/classes/org/xml/sax/helpers/package.html
diff --git a/jaxp/src/org/xml/sax/package.html b/jaxp/src/java.xml/share/classes/org/xml/sax/package.html
similarity index 100%
rename from jaxp/src/org/xml/sax/package.html
rename to jaxp/src/java.xml/share/classes/org/xml/sax/package.html