--- a/common/bin/unshuffle_list.txt	Wed Jul 05 20:13:25 2017 +0200
+++ b/common/bin/unshuffle_list.txt	Tue Jan 06 13:26:58 2015 +0000
@@ -66,8 +66,8 @@
 jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org : jaxws/src/share/jaxws_classes/com/sun/xml/internal/org
 jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2 : jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2
 jaxws/src/java.xml.bind/share/classes/javax/xml/bind : jaxws/src/share/jaxws_classes/javax/xml/bind
-jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging : jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging
-jaxws/src/java.xml.soap/share/classes/javax/xml/soap : jaxws/src/share/jaxws_classes/javax/xml/soap
+jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging : jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging
+jaxws/src/java.xml.ws/share/classes/javax/xml/soap : jaxws/src/share/jaxws_classes/javax/xml/soap
 jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal : jaxws/src/share/jaxws_classes/com/oracle/webservices/internal
 jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal : jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal
 jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish : jaxws/src/share/jaxws_classes/com/sun/org/glassfish

--- a/modules.xml	Wed Jul 05 20:13:25 2017 +0200
+++ b/modules.xml	Tue Jan 06 13:26:58 2015 +0000
@@ -889,7 +889,6 @@
     <depend re-exports="true">java.corba</depend>
     <depend re-exports="true">java.desktop</depend>
     <depend re-exports="true">java.xml.bind</depend>
-    <depend re-exports="true">java.xml.soap</depend>
     <depend re-exports="true">java.xml.ws</depend>
   </module>
   <module>
@@ -1056,17 +1055,17 @@
     <export>
       <name>org.xml.sax.helpers</name>
     </export>
-    <export>
-      <name>com.sun.org.apache.xerces.internal.dom</name>
-      <to>java.xml.soap</to>
-    </export>
-    <export>
-      <name>com.sun.org.apache.xerces.internal.jaxp</name>
-      <to>java.xml.soap</to>
-    </export>
-    <export>
-      <name>com.sun.org.apache.xerces.internal.util</name>
-      <to>java.xml.soap</to>
+     <export>
+       <name>com.sun.org.apache.xerces.internal.dom</name>
+       <to>java.xml.ws</to>
+     </export>
+     <export>
+       <name>com.sun.org.apache.xerces.internal.jaxp</name>
+       <to>java.xml.ws</to>
+     </export>
+     <export>
+       <name>com.sun.org.apache.xerces.internal.util</name>
+       <to>java.xml.ws</to>
     </export>
     <export>
       <name>com.sun.org.apache.xml.internal.dtm</name>
@@ -1262,17 +1261,14 @@
     </export>
     <export>
       <name>com.sun.xml.internal.org.jvnet.mimepull</name>
-      <to>java.xml.soap</to>
       <to>java.xml.ws</to>
     </export>
     <export>
       <name>com.sun.xml.internal.org.jvnet.staxex</name>
-      <to>java.xml.soap</to>
       <to>java.xml.ws</to>
     </export>
     <export>
       <name>com.sun.xml.internal.org.jvnet.staxex.util</name>
-      <to>java.xml.soap</to>
       <to>java.xml.ws</to>
     </export>
     <export>
@@ -1319,29 +1315,16 @@
     </export>
   </module>
   <module>
-    <name>java.xml.soap</name>
-    <depend re-exports="true">java.activation</depend>
-    <depend>java.base</depend>
-    <depend>java.desktop</depend>
-    <depend>java.logging</depend>
-    <depend re-exports="true">java.xml</depend>
-    <depend>java.xml.bind</depend>
-    <export>
-      <name>javax.xml.soap</name>
-    </export>
-  </module>
-  <module>
     <name>java.xml.ws</name>
-    <depend>java.activation</depend>
     <depend>java.annotations.common</depend>
     <depend>java.base</depend>
     <depend>java.desktop</depend>
     <depend>java.logging</depend>
     <depend>java.management</depend>
     <depend>java.rmi</depend>
+    <depend re-exports="true">java.activation</depend>
     <depend re-exports="true">java.xml</depend>
     <depend re-exports="true">java.xml.bind</depend>
-    <depend re-exports="true">java.xml.soap</depend>
     <depend>jdk.httpserver</depend>
     <export>
       <name>javax.jws</name>
@@ -1350,6 +1333,9 @@
       <name>javax.jws.soap</name>
     </export>
     <export>
+      <name>javax.xml.soap</name>
+    </export>
+    <export>
       <name>javax.xml.ws</name>
     </export>
     <export>