diff --git a/build.sbt b/build.sbt
index 1020608f0..81a9abcad 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,14 +1,7 @@
 import com.typesafe.tools.mima.plugin.{MimaPlugin, MimaKeys}
 
-scalaModuleSettings
-
-name                       := "scala-xml"
-
-version                    := "1.0.6-SNAPSHOT"
-
-scalaVersion               := crossScalaVersions.value.head
-
-crossScalaVersions         := {
+scalaVersion       in ThisBuild := crossScalaVersions.value.head
+crossScalaVersions in ThisBuild := {
   val java = System.getProperty("java.version")
   if (java.startsWith("1.6.") || java.startsWith("1.7."))
     Seq("2.11.8")
@@ -18,27 +11,30 @@ crossScalaVersions         := {
     sys.error(s"don't know what Scala versions to build on $java")
 }
 
-//reenable -Xfatal-warnings?
-scalacOptions             ++= "-deprecation:false -feature -Xlint:-stars-align,-nullary-unit,_".split("\\s+").to[Seq]
-
-scalacOptions in Test      += "-Xxml:coalescing"
-
-// important!! must come here (why?)
-scalaModuleOsgiSettings
-
-OsgiKeys.exportPackage := Seq(s"scala.xml.*;version=${version.value}")
-
-libraryDependencies += "junit" % "junit" % "4.11" % "test"
-
-libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test"
-
-//// testing:
-// used in CompilerErrors test
-libraryDependencies += ("org.scala-lang" % "scala-compiler" % scalaVersion.value % "test").exclude("org.scala-lang.modules", s"scala-xml*")
-
-mimaPreviousVersion := Some("1.0.5")
-
-// You cannot disable JVM test forking when working on scala modules
-// that are distributed with the compiler because of an SBT
-// classloader leaking issue (scala/scala-xml#20 and #112).
-fork in Test := true
+lazy val root = project.in(file("."))
+  .aggregate(xmlJS, xmlJVM)
+  .settings(publish := {}, publishLocal := {})
+
+lazy val xml = crossProject.in(file("."))
+  .settings(
+    name    := "scala-xml",
+    version := "1.0.6-SNAPSHOT",
+    scalacOptions         ++= "-deprecation:false -feature -Xlint:-stars-align,-nullary-unit,_".split("\\s+").to[Seq],
+    scalacOptions in Test  += "-Xxml:coalescing")
+  .jvmSettings(
+    scalaModuleSettings ++
+    scalaModuleOsgiSettings ++
+    List(
+      OsgiKeys.exportPackage := Seq(s"scala.xml.*;version=${version.value}"),
+      libraryDependencies += "junit" % "junit" % "4.11" % "test",
+      libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test",
+      libraryDependencies += ("org.scala-lang" % "scala-compiler" % scalaVersion.value % "test").exclude("org.scala-lang.modules", s"scala-xml*"),
+      mimaPreviousVersion := Some("1.0.5"),
+      // You cannot disable JVM test forking when working on scala modules
+      // that are distributed with the compiler because of an SBT
+      // classloader leaking issue (scala/scala-xml#20 and #112).
+      fork in Test := true): _*)
+  .jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
+
+lazy val xmlJVM = xml.jvm
+lazy val xmlJS = xml.js
diff --git a/js/src/test/scala/scala/xml/ReuseNodesTest.scala b/js/src/test/scala/scala/xml/ReuseNodesTest.scala
new file mode 100644
index 000000000..75f67efaf
--- /dev/null
+++ b/js/src/test/scala/scala/xml/ReuseNodesTest.scala
@@ -0,0 +1,58 @@
+package scala.xml
+
+import scala.xml.transform._
+import org.junit.Test
+import org.junit.Assert.assertTrue
+import org.junit.Assert.assertEquals
+import org.junit.runner.RunWith
+/**
+ * This test verify that after the tranform, the resultant xml node
+ * uses as many old nodes as possible.
+ *
+ * Three transformers class for case -
+ * One for orginal, one for modified, and one proposed which shows
+ * all are equivalent when it comes to reusing as many nodes as possible
+ */
+object ReuseNodesTest {
+
+  class OriginalTranformr(rules: RewriteRule*) extends RuleTransformer(rules:_*) {
+    override def transform(ns: Seq[Node]): Seq[Node] = {
+      val xs = ns.toStream map transform
+      val (xs1, xs2) = xs zip ns span { case (x, n) => unchanged(n, x) }
+
+      if (xs2.isEmpty) ns
+      else (xs1 map (_._2)) ++ xs2.head._1 ++ transform(ns drop (xs1.length + 1))
+    }
+    override def transform(n:Node): Seq[Node] = super.transform(n)
+  }
+
+  class ModifiedTranformr(rules: RewriteRule*) extends RuleTransformer(rules:_*) {
+    override def transform(ns: Seq[Node]): Seq[Node] = {
+      val changed = ns flatMap transform
+
+      if (changed.length != ns.length || (changed, ns).zipped.exists(_ != _)) changed
+      else ns
+    }
+    override def transform(n:Node): Seq[Node] = super.transform(n)
+  }
+
+  class AlternateTranformr(rules: RewriteRule*) extends RuleTransformer(rules:_*) {
+    override def transform(ns: Seq[Node]): Seq[Node] = {
+      val xs = ns.toStream map transform
+      val (xs1, xs2) = xs zip ns span { case (x, n) => unchanged(n, x) }
+
+      if (xs2.isEmpty) ns
+      else (xs1 map (_._2)) ++ xs2.head._1 ++ transform(ns drop (xs1.length + 1))
+    }
+    override def transform(n:Node): Seq[Node] = super.transform(n)
+  }
+
+  def rewriteRule = new RewriteRule {
+    override def transform(n: Node): NodeSeq = n match {
+      case n if n.label == "change" => Elem(
+           n.prefix, "changed", n.attributes, n.scope, n.child.isEmpty, n.child : _*)
+      case _ => n
+    }
+  }
+
+}
diff --git a/js/src/test/scala/scala/xml/XMLSyntaxTest.scala b/js/src/test/scala/scala/xml/XMLSyntaxTest.scala
new file mode 100644
index 000000000..da3c34c8e
--- /dev/null
+++ b/js/src/test/scala/scala/xml/XMLSyntaxTest.scala
@@ -0,0 +1,68 @@
+package scala.xml
+
+import org.junit.Test
+import org.junit.Ignore
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.Assert.assertTrue
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertEquals
+
+class XMLSyntaxTest {
+
+  private def handle[A](x: Node): A = {
+    x.child(0).asInstanceOf[Atom[A]].data
+  }
+
+  @Test
+  def test1(): Unit = {
+    val xNull = <hello>{null}</hello> // these used to be Atom(unit), changed to empty children
+    assertTrue(xNull.child sameElements Nil)
+
+    val x0 = <hello>{}</hello> // these used to be Atom(unit), changed to empty children
+    val x00 = <hello>{ }</hello> //  dto.
+    val xa = <hello>{ "world" }</hello>
+
+    assertTrue(x0.child sameElements Nil)
+    assertTrue(x00.child sameElements Nil)
+    assertEquals("world", handle[String](xa))
+
+    val xb = <hello>{ 1.5 }</hello>
+    assertEquals(1.5, handle[Double](xb), 0.0)
+
+    val xc = <hello>{ 5 }</hello>
+    assertEquals(5, handle[Int](xc))
+
+    val xd = <hello>{ true }</hello>
+    assertEquals(true, handle[Boolean](xd))
+
+    val xe = <hello>{ 5:Short }</hello>
+    assertEquals((5:Short), handle[Short](xe))
+
+    val xf = <hello>{ val x = 27; x }</hello>
+    assertEquals(27, handle[Int](xf))
+
+    val xg = <hello>{ List(1,2,3,4) }</hello>
+    assertEquals("<hello>1 2 3 4</hello>", xg.toString)
+    assertFalse(xg.child.map(_.isInstanceOf[Text]).exists(identity))
+
+    val xh = <hello>{ for(x <- List(1,2,3,4) if x % 2 == 0) yield x }</hello>
+    assertEquals("<hello>2 4</hello>", xh.toString)
+    assertFalse(xh.child.map(_.isInstanceOf[Text]).exists(identity))
+  }
+
+  /** see SVN r13821 (emir): support for <elem key={x:Option[Seq[Node]]} />,
+   *  so that Options can be used for optional attributes.
+   */
+  @Test
+  def test2(): Unit = {
+    val x1: Option[Seq[Node]] = Some(<b>hello</b>)
+    val n1 = <elem key={x1} />;
+    assertEquals(x1, n1.attribute("key"))
+
+    val x2: Option[Seq[Node]] = None
+    val n2 = <elem key={x2} />;
+    assertEquals(x2, n2.attribute("key"))
+  }
+
+}
diff --git a/js/src/test/scala/scala/xml/XMLTest.scala b/js/src/test/scala/scala/xml/XMLTest.scala
new file mode 100644
index 000000000..316517dfd
--- /dev/null
+++ b/js/src/test/scala/scala/xml/XMLTest.scala
@@ -0,0 +1,548 @@
+package scala.xml
+
+import language.postfixOps
+
+import org.junit.{Test => UnitTest}
+import org.junit.Ignore
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.Assert.assertTrue
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertEquals
+// import scala.xml.parsing.ConstructingParser
+import java.io.StringWriter
+import java.io.BufferedOutputStream
+import java.io.ByteArrayOutputStream
+import java.io.StringReader
+import scala.collection.Iterable
+import scala.xml.Utility.sort
+
+object XMLTest {
+  val e: scala.xml.MetaData = Null //Node.NoAttributes
+  val sc: scala.xml.NamespaceBinding = TopScope
+}
+
+class XMLTest {
+  import XMLTest.{ e, sc }
+
+  @UnitTest
+  def nodeSeq: Unit = {
+    val p = <foo>
+              <bar gt='ga' value="3"/>
+              <baz bazValue="8"/>
+              <bar value="5" gi='go'/>
+            </foo>
+
+    val pelems_1 = for (x <- p \ "bar"; y <- p \ "baz") yield {
+      Text(x.attributes("value").toString + y.attributes("bazValue").toString + "!")
+    };
+
+    val pelems_2 = NodeSeq.fromSeq(List(Text("38!"), Text("58!")));
+    assertTrue(pelems_1 sameElements pelems_2)
+    assertTrue(Text("8") sameElements (p \\ "@bazValue"))
+  }
+
+  @UnitTest
+  def queryBooks: Unit = {
+    val books =
+      <bks>
+        <book><title>Blabla</title></book>
+        <book><title>Blubabla</title></book>
+        <book><title>Baaaaaaalabla</title></book>
+      </bks>;
+
+    val reviews =
+      <reviews>
+        <entry>
+          <title>Blabla</title>
+          <remarks>
+            Hallo Welt.
+          </remarks>
+        </entry>
+        <entry>
+          <title>Blubabla</title>
+          <remarks>
+            Hello Blu
+          </remarks>
+        </entry>
+        <entry>
+          <title>Blubabla</title>
+          <remarks>
+            rem 2
+          </remarks>
+        </entry>
+      </reviews>;
+
+    val results1 = new scala.xml.PrettyPrinter(80, 5).formatNodes(
+      for (
+        t <- books \\ "title";
+        r <- reviews \\ "entry" if (r \ "title") xml_== t
+      ) yield <result>
+                { t }
+                { r \ "remarks" }
+              </result>);
+    val results1Expected = """<result>
+    |     <title>Blabla</title>
+    |     <remarks> Hallo Welt. </remarks>
+    |</result><result>
+    |     <title>Blubabla</title>
+    |     <remarks> Hello Blu </remarks>
+    |</result><result>
+    |     <title>Blubabla</title>
+    |     <remarks> rem 2 </remarks>
+    |</result>""".stripMargin
+    assertEquals(results1Expected, results1)
+
+    {
+      val actual = for (t @ <book><title>Blabla</title></book> <- NodeSeq.fromSeq(books.child).toList)
+        yield t
+      val expected = List(<book><title>Blabla</title></book>)
+      assertEquals(expected, actual)
+    }
+
+  }
+
+  @UnitTest
+  def queryPhoneBook: Unit = {
+    val phoneBook =
+      <phonebook>
+        <descr>
+          This is the<b>phonebook</b>
+          of the
+          <a href="http://acme.org">ACME</a>
+          corporation.
+        </descr>
+        <entry>
+          <name>John</name>
+          <phone where="work">  +41 21 693 68 67</phone>
+          <phone where="mobile">+41 79 602 23 23</phone>
+        </entry>
+      </phonebook>;
+
+    val addrBook =
+      <addrbook>
+        <descr>
+          This is the<b>addressbook</b>
+          of the
+          <a href="http://acme.org">ACME</a>
+          corporation.
+        </descr>
+        <entry>
+          <name>John</name>
+          <street> Elm Street</street>
+          <city>Dolphin City</city>
+        </entry>
+      </addrbook>;
+
+    val actual: String = new scala.xml.PrettyPrinter(80, 5).formatNodes(
+      for (
+        t <- addrBook \\ "entry";
+        r <- phoneBook \\ "entry" if (t \ "name") xml_== (r \ "name")
+      ) yield <result>
+                { t.child }
+                { r \ "phone" }
+              </result>)
+    val expected = """|<result>
+      |     <name>John</name>
+      |     <street> Elm Street</street>
+      |     <city>Dolphin City</city>
+      |     <phone where="work"> +41 21 693 68 67</phone>
+      |     <phone where="mobile">+41 79 602 23 23</phone>
+      |</result>""".stripMargin
+    assertEquals(expected, actual)
+  }
+
+  @UnitTest
+  def namespaces: Unit = {
+    val cuckoo = <cuckoo xmlns="http://cuckoo.com">
+                   <foo/>
+                   <bar/>
+                 </cuckoo>;
+    assertEquals("http://cuckoo.com", cuckoo.namespace)
+    for (n <- cuckoo \ "_") {
+      assertEquals("http://cuckoo.com", n.namespace)
+    }
+  }
+
+  @UnitTest
+  def namespacesWithNestedXmls: Unit = {
+    val foo = <f:foo xmlns:f="fooUrl"></f:foo>
+    val bar = <b:bar xmlns:b="barUrl">{foo}</b:bar>
+    val expected = """<b:bar xmlns:b="barUrl"><f:foo xmlns:f="fooUrl"></f:foo></b:bar>"""
+    val actual = bar.toString
+    assertEquals(expected, actual)
+  }
+
+  @UnitTest
+  def validationOfElements: Unit = {
+    val vtor = new scala.xml.dtd.ElementValidator();
+    {
+      import scala.xml.dtd.ELEMENTS
+      import scala.xml.dtd.ContentModel._
+      vtor.setContentModel(
+        ELEMENTS(
+          Sequ(
+            Letter(ElemName("bar")),
+            Star(Letter(ElemName("baz"))))));
+    }
+    assertTrue(vtor(<foo><bar/><baz/><baz/></foo>))
+
+    {
+      import scala.xml.dtd.MIXED
+      import scala.xml.dtd.ContentModel._
+
+      vtor.setContentModel(
+        MIXED(
+          Alt(Letter(ElemName("bar")),
+            Letter(ElemName("baz")),
+            Letter(ElemName("bal")))));
+    }
+
+    assertTrue(vtor(<foo><bar/><baz/><baz/></foo>))
+    assertTrue(vtor(<foo>ab<bar/>cd<baz/>ed<baz/>gh</foo>))
+    assertFalse(vtor(<foo> <ugha/> <bugha/> </foo>))
+  }
+
+  def validationfOfAttributes: Unit = {
+    val vtor = new scala.xml.dtd.ElementValidator();
+    vtor.setContentModel(null)
+    vtor.setMetaData(List())
+    assertFalse(vtor(<foo bar="hello"/>))
+
+    {
+      import scala.xml.dtd._
+      vtor setMetaData List(AttrDecl("bar", "CDATA", IMPLIED))
+    }
+    assertFalse(vtor(<foo href="http://foo.com" bar="hello"/>))
+    assertTrue(vtor(<foo bar="hello"/>))
+
+    {
+      import scala.xml.dtd._
+      vtor.setMetaData(List(AttrDecl("bar", "CDATA", REQUIRED)))
+    }
+    assertFalse(vtor(<foo href="http://foo.com"/>))
+    assertTrue(vtor(<foo bar="http://foo.com"/>))
+  }
+
+  def Elem(prefix: String, label: String, attributes: MetaData, scope: NamespaceBinding, child: Node*): Elem =
+    scala.xml.Elem.apply(prefix, label, attributes, scope, minimizeEmpty = true, child: _*)
+
+  @UnitTest
+  def groupNode = {
+    val zx1: Node = Group { <a/><b/><c/> }
+    val zy1: Node = <f>{ zx1 }</f>
+    assertEquals("<f><a/><b/><c/></f>", zy1.toString)
+
+    assertEquals("<a/><f><a/><b/><c/></f><a/><b/><c/>",
+      Group { List(<a/>, zy1, zx1) }.toString)
+
+    val zz1 = <xml:group><a/><b/><c/></xml:group>
+
+    assertTrue(zx1 xml_== zz1)
+    assertTrue(zz1.length == 3)
+  }
+
+  @UnitTest
+  def dodgyNamespace = {
+    val x = <flog xmlns:ee="http://ee.com"><foo xmlns:dog="http://dog.com"><dog:cat/></foo></flog>
+    assertTrue(x.toString.matches(".*xmlns:dog=\"http://dog.com\".*"));
+  }
+
+  import NodeSeq.seqToNodeSeq
+
+  val ax = <hello foo="bar" x:foo="baz" xmlns:x="the namespace from outer space">
+             <world/>
+           </hello>
+
+  val cx = <z:hello foo="bar" xmlns:z="z" x:foo="baz" xmlns:x="the namespace from outer space">
+             crazy text world
+           </z:hello>
+
+  val bx = <hello foo="bar&amp;x"></hello>
+
+  @UnitTest
+  def XmlEx = {
+    assertTrue((ax \ "@foo") xml_== "bar") // uses NodeSeq.view!
+    assertTrue((ax \ "@foo") xml_== xml.Text("bar")) // dto.
+    assertTrue((bx \ "@foo") xml_== "bar&x") // dto.
+    assertTrue((bx \ "@foo") xml_sameElements List(xml.Text("bar&x")))
+    assertTrue("<hello foo=\"bar&amp;x\"></hello>" == bx.toString)
+  }
+
+  @UnitTest
+  def XmlEy {
+    val z = ax \ "@{the namespace from outer space}foo"
+    assertTrue((ax \ "@{the namespace from outer space}foo") xml_== "baz")
+    assertTrue((cx \ "@{the namespace from outer space}foo") xml_== "baz")
+
+    try {
+      ax \ "@"
+      assertTrue(false)
+    } catch {
+      case _: IllegalArgumentException =>
+    }
+    try {
+      ax \ "@{"
+      assertTrue(false)
+    } catch {
+      case _: IllegalArgumentException =>
+    }
+    try {
+      ax \ "@{}"
+      assertTrue(false)
+    } catch {
+      case _: IllegalArgumentException =>
+    }
+
+  }
+
+  @UnitTest
+  def comment =
+    assertEquals("<!-- thissa comment -->", <!-- thissa comment --> toString)
+
+  @UnitTest
+  def weirdElem =
+    assertEquals("<?this is a pi foo bar = && {{ ?>", <?this is a pi foo bar = && {{ ?> toString)
+
+  @UnitTest
+  def escape =
+    assertEquals("""
+ &quot;Come, come again, whoever you are, come!
+Heathen, fire worshipper or idolatrous, come!
+Come even if you broke your penitence a hundred times,
+Ours is the portal of hope, come as you are.&quot;
+                              Mevlana Celaleddin Rumi""", <![CDATA[
+ "Come, come again, whoever you are, come!
+Heathen, fire worshipper or idolatrous, come!
+Come even if you broke your penitence a hundred times,
+Ours is the portal of hope, come as you are."
+                              Mevlana Celaleddin Rumi]]> toString) // this guy will escaped, and rightly so
+
+  @UnitTest
+  def unparsed2 = {
+    object myBreak extends scala.xml.Unparsed("<br />")
+    assertEquals("<foo><br /></foo>", <foo>{ myBreak }</foo> toString) // shows use of unparsed
+  }
+
+  @UnitTest
+  def justDontFail = {
+    <x:foo xmlns:x="gaga"/> match {
+      case scala.xml.QNode("gaga", "foo", md, child @ _*) =>
+    }
+
+    <x:foo xmlns:x="gaga"/> match {
+      case scala.xml.Node("foo", md, child @ _*) =>
+    }
+  }
+
+  def f(s: String) = {
+    <entry>
+      {
+        for (item <- s split ',') yield <elem>{ item }</elem>
+      }
+    </entry>
+  }
+
+  @UnitTest
+  def nodeBuffer =
+    assertEquals(
+      """<entry>
+      <elem>a</elem><elem>b</elem><elem>c</elem>
+    </entry>""", f("a,b,c") toString)
+
+  // t-486
+  def wsdlTemplate1(serviceName: String): Node =
+    <wsdl:definitions name={ serviceName } xmlns:tns={ "target1" }>
+    </wsdl:definitions>;
+
+  def wsdlTemplate2(serviceName: String, targetNamespace: String): Node =
+    <wsdl:definitions name={ serviceName } xmlns:tns={ targetNamespace }>
+    </wsdl:definitions>;
+
+  def wsdlTemplate3(serviceName: String): Node =
+    <wsdl:definitions name={ serviceName } xmlns:tns={ new _root_.scala.xml.Text("target3") }>
+    </wsdl:definitions>;
+
+  def wsdlTemplate4(serviceName: String, targetNamespace: () => String): Node =
+    <wsdl:definitions name={ serviceName } xmlns:tns={ targetNamespace() }>
+    </wsdl:definitions>;
+
+  @UnitTest
+  def wsdl = {
+    assertEquals("""<wsdl:definitions name="service1" xmlns:tns="target1">
+    </wsdl:definitions>""", wsdlTemplate1("service1") toString)
+    assertEquals("""<wsdl:definitions name="service2" xmlns:tns="target2">
+    </wsdl:definitions>""", wsdlTemplate2("service2", "target2") toString)
+    assertEquals("""<wsdl:definitions name="service3" xmlns:tns="target3">
+    </wsdl:definitions>""", wsdlTemplate3("service3") toString)
+    assertEquals("""<wsdl:definitions name="service4" xmlns:tns="target4">
+    </wsdl:definitions>""", wsdlTemplate4("service4", () => "target4") toString)
+  }
+
+  @UnitTest
+  def t1079 = assertFalse(<t user:tag=""/> == <t user:tag="X"/>)
+
+  import dtd.{ DocType, PublicID }
+
+  @UnitTest
+  def t1620 = {
+    val dt = DocType("foo", PublicID("-//Foo Corp//DTD 1.0//EN", "foo.dtd"), Seq())
+    var pw = new StringWriter()
+    XML.write(pw, <foo/>, "utf-8", true, dt)
+    pw.flush()
+    assertEquals("""<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE foo PUBLIC "-//Foo Corp//DTD 1.0//EN" "foo.dtd">
+<foo/>""", pw.toString)
+
+    pw = new StringWriter()
+    val dt2 = DocType("foo", PublicID("-//Foo Corp//DTD 1.0//EN", null), Seq())
+    XML.write(pw, <foo/>, "utf-8", true, dt2)
+    pw.flush()
+    assertEquals("""<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE foo PUBLIC "-//Foo Corp//DTD 1.0//EN">
+<foo/>""", pw.toString)
+  }
+
+  @UnitTest
+  def t1773 = {
+    val xs = List(
+      <a></a>,
+      <a/>,
+      <a>{ xml.NodeSeq.Empty }</a>,
+      <a>{ "" }</a>,
+      <a>{ if (true) "" else "I like turtles" }</a>)
+
+    for (x1 <- xs; x2 <- xs) assertTrue(x1 xml_== x2)
+  }
+
+  @UnitTest
+  def t3886 = {
+    assertTrue(<k a="1" b="2"/> == <k a="1" b="2"/>)
+    assertTrue(<k a="1" b="2"/> != <k a="1" b="3"/>)
+    assertTrue(<k a="1" b="2"/> != <k a="2" b="2"/>)
+
+    assertTrue(<k a="1" b="2"/> != <k/>)
+    assertTrue(<k a="1" b="2"/> != <k a="1"/>)
+    assertTrue(<k a="1" b="2"/> != <k b="2"/>)
+  }
+
+  @UnitTest
+  def t5052 {
+    assertTrue(<elem attr={ null: String }/> xml_== <elem/>)
+    assertTrue(<elem attr={ None }/> xml_== <elem/>)
+    assertTrue(<elem/> xml_== <elem attr={ null: String }/>)
+    assertTrue(<elem/> xml_== <elem attr={ None }/>)
+  }
+
+  @UnitTest
+  def t5115 = {
+    def assertHonorsIterableContract(i: Iterable[_]) = assertEquals(i.size, i.iterator.size)
+
+    assertHonorsIterableContract(<a/>.attributes)
+    assertHonorsIterableContract(<a x=""/>.attributes)
+    assertHonorsIterableContract(<a y={ None }/>.attributes)
+    assertHonorsIterableContract(<a y={ None } x=""/>.attributes)
+    assertHonorsIterableContract(<a a="" y={ None }/>.attributes)
+    assertHonorsIterableContract(<a y={ null: String }/>.attributes)
+    assertHonorsIterableContract(<a y={ null: String } x=""/>.attributes)
+    assertHonorsIterableContract(<a a="" y={ null: String }/>.attributes)
+  }
+
+  @UnitTest
+  def t5843 {
+    val foo = scala.xml.Attribute(null, "foo", "1", scala.xml.Null)
+    val bar = scala.xml.Attribute(null, "bar", "2", foo)
+    val ns = scala.xml.NamespaceBinding(null, "uri", scala.xml.TopScope)
+
+    assertEquals(""" foo="1"""", foo toString)
+    assertEquals(null, scala.xml.TopScope.getURI(foo.pre))
+    assertEquals(""" bar="2"""", bar remove "foo" toString)
+    assertEquals(""" foo="1"""", bar remove "bar" toString)
+    assertEquals(""" bar="2"""", bar remove (null, scala.xml.TopScope, "foo") toString)
+    assertEquals(""" foo="1"""", bar remove (null, scala.xml.TopScope, "bar") toString)
+    assertEquals(""" bar="2" foo="1"""", bar toString)
+    assertEquals(""" bar="2" foo="1"""", bar remove (null, ns, "foo") toString)
+    assertEquals(""" bar="2" foo="1"""", bar remove (null, ns, "bar") toString)
+  }
+
+  @UnitTest
+  def t7074 {
+    assertEquals("""<a/>""", sort(<a/>) toString)
+    assertEquals("""<a b="2" c="3" d="1"/>""", sort(<a d="1" b="2" c="3"/>) toString)
+    assertEquals("""<a b="2" c="4" d="1" e="3" f="5"/>""", sort(<a d="1" b="2" e="3" c="4" f="5"/>) toString)
+    assertEquals("""<a b="5" c="4" d="3" e="2" f="1"/>""", sort(<a f="1" e="2" d="3" c="4" b="5"/>) toString)
+    assertEquals("""<a b="1" c="2" d="3" e="4" f="5"/>""", sort(<a b="1" c="2" d="3" e="4" f="5"/>) toString)
+    assertEquals("""<a a:b="2" a:c="3" a:d="1"/>""", sort(<a a:d="1" a:b="2" a:c="3"/>) toString)
+    assertEquals("""<a a:b="2" a:c="4" a:d="1" a:e="3" a:f="5"/>""", sort(<a a:d="1" a:b="2" a:e="3" a:c="4" a:f="5"/>) toString)
+    assertEquals("""<a a:b="5" a:c="4" a:d="3" a:e="2" a:f="1"/>""", sort(<a a:f="1" a:e="2" a:d="3" a:c="4" a:b="5"/>) toString)
+    assertEquals("""<a a:b="1" a:c="2" a:d="3" a:e="4" a:f="5"/>""", sort(<a a:b="1" a:c="2" a:d="3" a:e="4" a:f="5"/>) toString)
+  }
+
+  @UnitTest
+  def attributes = {
+    val noAttr = <t/>
+    val attrNull = <t a={ null: String }/>
+    val attrNone = <t a={ None: Option[Seq[Node]] }/>
+    val preAttrNull = <t p:a={ null: String }/>
+    val preAttrNone = <t p:a={ None: Option[Seq[Node]] }/>
+    assertEquals(noAttr, attrNull)
+    assertEquals(noAttr, attrNone)
+    assertEquals(noAttr, preAttrNull)
+    assertEquals(noAttr, preAttrNone)
+
+    val xml1 = <t b="1" d="2"/>
+    val xml2 = <t a={ null: String } p:a={ null: String } b="1" c={ null: String } d="2"/>
+    val xml3 = <t b="1" c={ null: String } d="2" a={ null: String } p:a={ null: String }/>
+    assertEquals(xml1, xml2)
+    assertEquals(xml1, xml3)
+
+    assertEquals("""<t/>""", noAttr toString)
+    assertEquals("""<t/>""", attrNull toString)
+    assertEquals("""<t/>""", attrNone toString)
+    assertEquals("""<t/>""", preAttrNull toString)
+    assertEquals("""<t/>""", preAttrNone toString)
+    assertEquals("""<t b="1" d="2"/>""", xml1 toString)
+    assertEquals("""<t b="1" d="2"/>""", xml2 toString)
+    assertEquals("""<t b="1" d="2"/>""", xml3 toString)
+
+    // Check if attribute order is retained
+    assertEquals("""<t a="1" d="2"/>""", <t a="1" d="2"/> toString)
+    assertEquals("""<t b="1" d="2"/>""", <t b="1" d="2"/> toString)
+    assertEquals("""<t a="1" b="2" c="3"/>""", <t a="1" b="2" c="3"/> toString)
+    assertEquals("""<t g="1" e="2" p:a="3" f:e="4" mgruhu:ji="5"/>""", <t g="1" e="2" p:a="3" f:e="4" mgruhu:ji="5"/> toString)
+  }
+
+  @UnitTest
+  def issue28: Unit = {
+    val x = <x:foo xmlns:x="gaga"/>
+    // val ns = new NamespaceBinding("x", "gaga", sc)
+    // val x = Elem("x", "foo", e, ns)
+    val pp = new xml.PrettyPrinter(80, 2)
+    // This assertion passed
+    assertEquals("""<x:foo xmlns:x="gaga"/>""", x.toString)
+    // This was the bug, producing an errant xmlns attribute
+    assertEquals("""<x:foo xmlns:x="gaga"/>""", pp.format(x))
+  }
+
+  @UnitTest
+  def nodeSeqNs: Unit = {
+    val x = {
+      <x:foo xmlns:x="abc"/><y:bar xmlns:y="def"/>
+    }
+    val pp = new PrettyPrinter(80, 2)
+    val expected = """<x:foo xmlns:x="abc"/><y:bar xmlns:y="def"/>"""
+    assertEquals(expected, pp.formatNodes(x))
+  }
+
+  @UnitTest
+  def nodeStringBuilder: Unit = {
+    val x = {
+        <x:foo xmlns:x="abc"/>
+    }
+    val pp = new PrettyPrinter(80, 2)
+    val expected = """<x:foo xmlns:x="abc"/>"""
+    val sb = new StringBuilder
+    pp.format(x, sb)
+    assertEquals(expected, sb.toString)
+  }
+}
diff --git a/js/src/test/scala/scala/xml/parsing/PiParsingTest.scala b/js/src/test/scala/scala/xml/parsing/PiParsingTest.scala
new file mode 100644
index 000000000..fedf38dc5
--- /dev/null
+++ b/js/src/test/scala/scala/xml/parsing/PiParsingTest.scala
@@ -0,0 +1,28 @@
+package scala.xml.parsing
+
+import org.junit.Test
+import org.junit.Ignore
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import scala.xml.JUnitAssertsForXML.assertEquals
+
+class PiParsingTest {
+
+
+  import scala.io.Source.fromString
+  import scala.xml.TopScope
+
+  @Test
+  def piNoWSLiteral: Unit = {
+    val expected = "<foo>a<?pi?>b</foo>"
+    assertEquals(expected, <foo>a<?pi?>b</foo>)
+  }
+
+
+  @Test
+  def piLiteral: Unit = {
+    val expected = "<foo> a <?pi?> b </foo>"
+    assertEquals(expected, <foo> a <?pi?> b </foo>)
+  }
+
+}
diff --git a/js/src/test/scala/scala/xml/parsing/Ticket0632Test.scala b/js/src/test/scala/scala/xml/parsing/Ticket0632Test.scala
new file mode 100644
index 000000000..8b939118a
--- /dev/null
+++ b/js/src/test/scala/scala/xml/parsing/Ticket0632Test.scala
@@ -0,0 +1,35 @@
+package scala.xml.parsing
+
+import org.junit.Test
+import org.junit.Ignore
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import scala.xml.JUnitAssertsForXML.assertEquals
+
+class Ticket0632Test {
+
+  import scala.io.Source.fromString
+  import scala.xml.{NodeSeq, TopScope}
+
+  @Test
+  def singleAmp: Unit = {
+    val expected = "<foo x=\"&amp;\"/>"
+    assertEquals(expected, <foo x="&amp;"/>)
+    assertEquals(expected, <foo x={ "&" }/>)
+  }
+
+  @Test
+  def oneAndHalfAmp: Unit = {
+    val expected = "<foo x=\"&amp;amp;\"/>"
+    assertEquals(expected, <foo x="&amp;amp;"/>)
+    assertEquals(expected, <foo x={ "&amp;" }/>)
+  }
+
+  @Test
+  def doubleAmp: Unit = {
+    val expected = "<foo x=\"&amp;&amp;\"/>"
+    assertEquals(expected, <foo x="&amp;&amp;"/>)
+    assertEquals(expected, <foo x={ "&&" }/>)
+  }
+
+}
diff --git a/js/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala b/js/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala
new file mode 100644
index 000000000..6cfd4e872
--- /dev/null
+++ b/js/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala
@@ -0,0 +1,19 @@
+package scala.xml
+package pull
+
+import org.junit.Test
+import org.junit.Assert.{assertFalse, assertTrue}
+
+import scala.io.Source
+import scala.xml.parsing.FatalError
+
+class XMLEventReaderTest {
+
+  val src = Source.fromString("<hello><world/>!</hello>")
+
+  private def toSource(s: String) = new Source {
+    val iter = s.iterator
+    override def reportError(pos: Int, msg: String, out: java.io.PrintStream = Console.err) {}
+  }
+
+}
diff --git a/src/test/scala/scala/xml/CompilerErrors.scala b/jvm/src/test/scala/scala/xml/CompilerErrors.scala
similarity index 100%
rename from src/test/scala/scala/xml/CompilerErrors.scala
rename to jvm/src/test/scala/scala/xml/CompilerErrors.scala
diff --git a/src/test/scala/scala/xml/ReuseNodesTest.scala b/jvm/src/test/scala/scala/xml/ReuseNodesTest.scala
similarity index 100%
rename from src/test/scala/scala/xml/ReuseNodesTest.scala
rename to jvm/src/test/scala/scala/xml/ReuseNodesTest.scala
diff --git a/src/test/scala/scala/xml/XMLSyntaxTest.scala b/jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala
similarity index 100%
rename from src/test/scala/scala/xml/XMLSyntaxTest.scala
rename to jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala
diff --git a/src/test/scala/scala/xml/XMLTest.scala b/jvm/src/test/scala/scala/xml/XMLTest.scala
similarity index 100%
rename from src/test/scala/scala/xml/XMLTest.scala
rename to jvm/src/test/scala/scala/xml/XMLTest.scala
diff --git a/src/test/scala/scala/xml/parsing/PiParsingTest.scala b/jvm/src/test/scala/scala/xml/parsing/PiParsingTest.scala
similarity index 100%
rename from src/test/scala/scala/xml/parsing/PiParsingTest.scala
rename to jvm/src/test/scala/scala/xml/parsing/PiParsingTest.scala
diff --git a/src/test/scala/scala/xml/parsing/Ticket0632Test.scala b/jvm/src/test/scala/scala/xml/parsing/Ticket0632Test.scala
similarity index 100%
rename from src/test/scala/scala/xml/parsing/Ticket0632Test.scala
rename to jvm/src/test/scala/scala/xml/parsing/Ticket0632Test.scala
diff --git a/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala b/jvm/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala
similarity index 100%
rename from src/test/scala/scala/xml/pull/XMLEventReaderTest.scala
rename to jvm/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 65dea32cf..02f25173e 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1 +1,4 @@
 addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.4")
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")
+
diff --git a/src/main/scala/scala/xml/Atom.scala b/shared/src/main/scala/scala/xml/Atom.scala
similarity index 100%
rename from src/main/scala/scala/xml/Atom.scala
rename to shared/src/main/scala/scala/xml/Atom.scala
diff --git a/src/main/scala/scala/xml/Attribute.scala b/shared/src/main/scala/scala/xml/Attribute.scala
similarity index 100%
rename from src/main/scala/scala/xml/Attribute.scala
rename to shared/src/main/scala/scala/xml/Attribute.scala
diff --git a/src/main/scala/scala/xml/Comment.scala b/shared/src/main/scala/scala/xml/Comment.scala
similarity index 100%
rename from src/main/scala/scala/xml/Comment.scala
rename to shared/src/main/scala/scala/xml/Comment.scala
diff --git a/src/main/scala/scala/xml/Document.scala b/shared/src/main/scala/scala/xml/Document.scala
similarity index 100%
rename from src/main/scala/scala/xml/Document.scala
rename to shared/src/main/scala/scala/xml/Document.scala
diff --git a/src/main/scala/scala/xml/Elem.scala b/shared/src/main/scala/scala/xml/Elem.scala
similarity index 100%
rename from src/main/scala/scala/xml/Elem.scala
rename to shared/src/main/scala/scala/xml/Elem.scala
diff --git a/src/main/scala/scala/xml/EntityRef.scala b/shared/src/main/scala/scala/xml/EntityRef.scala
similarity index 100%
rename from src/main/scala/scala/xml/EntityRef.scala
rename to shared/src/main/scala/scala/xml/EntityRef.scala
diff --git a/src/main/scala/scala/xml/Equality.scala b/shared/src/main/scala/scala/xml/Equality.scala
similarity index 100%
rename from src/main/scala/scala/xml/Equality.scala
rename to shared/src/main/scala/scala/xml/Equality.scala
diff --git a/src/main/scala/scala/xml/Group.scala b/shared/src/main/scala/scala/xml/Group.scala
similarity index 100%
rename from src/main/scala/scala/xml/Group.scala
rename to shared/src/main/scala/scala/xml/Group.scala
diff --git a/src/main/scala/scala/xml/MalformedAttributeException.scala b/shared/src/main/scala/scala/xml/MalformedAttributeException.scala
similarity index 100%
rename from src/main/scala/scala/xml/MalformedAttributeException.scala
rename to shared/src/main/scala/scala/xml/MalformedAttributeException.scala
diff --git a/src/main/scala/scala/xml/MetaData.scala b/shared/src/main/scala/scala/xml/MetaData.scala
similarity index 100%
rename from src/main/scala/scala/xml/MetaData.scala
rename to shared/src/main/scala/scala/xml/MetaData.scala
diff --git a/src/main/scala/scala/xml/NamespaceBinding.scala b/shared/src/main/scala/scala/xml/NamespaceBinding.scala
similarity index 100%
rename from src/main/scala/scala/xml/NamespaceBinding.scala
rename to shared/src/main/scala/scala/xml/NamespaceBinding.scala
diff --git a/src/main/scala/scala/xml/Node.scala b/shared/src/main/scala/scala/xml/Node.scala
similarity index 100%
rename from src/main/scala/scala/xml/Node.scala
rename to shared/src/main/scala/scala/xml/Node.scala
diff --git a/src/main/scala/scala/xml/NodeBuffer.scala b/shared/src/main/scala/scala/xml/NodeBuffer.scala
similarity index 100%
rename from src/main/scala/scala/xml/NodeBuffer.scala
rename to shared/src/main/scala/scala/xml/NodeBuffer.scala
diff --git a/src/main/scala/scala/xml/NodeSeq.scala b/shared/src/main/scala/scala/xml/NodeSeq.scala
similarity index 100%
rename from src/main/scala/scala/xml/NodeSeq.scala
rename to shared/src/main/scala/scala/xml/NodeSeq.scala
diff --git a/src/main/scala/scala/xml/Null.scala b/shared/src/main/scala/scala/xml/Null.scala
similarity index 100%
rename from src/main/scala/scala/xml/Null.scala
rename to shared/src/main/scala/scala/xml/Null.scala
diff --git a/src/main/scala/scala/xml/PCData.scala b/shared/src/main/scala/scala/xml/PCData.scala
similarity index 100%
rename from src/main/scala/scala/xml/PCData.scala
rename to shared/src/main/scala/scala/xml/PCData.scala
diff --git a/src/main/scala/scala/xml/PrefixedAttribute.scala b/shared/src/main/scala/scala/xml/PrefixedAttribute.scala
similarity index 100%
rename from src/main/scala/scala/xml/PrefixedAttribute.scala
rename to shared/src/main/scala/scala/xml/PrefixedAttribute.scala
diff --git a/src/main/scala/scala/xml/PrettyPrinter.scala b/shared/src/main/scala/scala/xml/PrettyPrinter.scala
similarity index 100%
rename from src/main/scala/scala/xml/PrettyPrinter.scala
rename to shared/src/main/scala/scala/xml/PrettyPrinter.scala
diff --git a/src/main/scala/scala/xml/ProcInstr.scala b/shared/src/main/scala/scala/xml/ProcInstr.scala
similarity index 100%
rename from src/main/scala/scala/xml/ProcInstr.scala
rename to shared/src/main/scala/scala/xml/ProcInstr.scala
diff --git a/src/main/scala/scala/xml/QNode.scala b/shared/src/main/scala/scala/xml/QNode.scala
similarity index 100%
rename from src/main/scala/scala/xml/QNode.scala
rename to shared/src/main/scala/scala/xml/QNode.scala
diff --git a/src/main/scala/scala/xml/SpecialNode.scala b/shared/src/main/scala/scala/xml/SpecialNode.scala
similarity index 100%
rename from src/main/scala/scala/xml/SpecialNode.scala
rename to shared/src/main/scala/scala/xml/SpecialNode.scala
diff --git a/src/main/scala/scala/xml/Text.scala b/shared/src/main/scala/scala/xml/Text.scala
similarity index 100%
rename from src/main/scala/scala/xml/Text.scala
rename to shared/src/main/scala/scala/xml/Text.scala
diff --git a/src/main/scala/scala/xml/TextBuffer.scala b/shared/src/main/scala/scala/xml/TextBuffer.scala
similarity index 100%
rename from src/main/scala/scala/xml/TextBuffer.scala
rename to shared/src/main/scala/scala/xml/TextBuffer.scala
diff --git a/src/main/scala/scala/xml/TopScope.scala b/shared/src/main/scala/scala/xml/TopScope.scala
similarity index 100%
rename from src/main/scala/scala/xml/TopScope.scala
rename to shared/src/main/scala/scala/xml/TopScope.scala
diff --git a/src/main/scala/scala/xml/TypeSymbol.scala b/shared/src/main/scala/scala/xml/TypeSymbol.scala
similarity index 100%
rename from src/main/scala/scala/xml/TypeSymbol.scala
rename to shared/src/main/scala/scala/xml/TypeSymbol.scala
diff --git a/src/main/scala/scala/xml/Unparsed.scala b/shared/src/main/scala/scala/xml/Unparsed.scala
similarity index 100%
rename from src/main/scala/scala/xml/Unparsed.scala
rename to shared/src/main/scala/scala/xml/Unparsed.scala
diff --git a/src/main/scala/scala/xml/UnprefixedAttribute.scala b/shared/src/main/scala/scala/xml/UnprefixedAttribute.scala
similarity index 100%
rename from src/main/scala/scala/xml/UnprefixedAttribute.scala
rename to shared/src/main/scala/scala/xml/UnprefixedAttribute.scala
diff --git a/src/main/scala/scala/xml/Utility.scala b/shared/src/main/scala/scala/xml/Utility.scala
similarity index 100%
rename from src/main/scala/scala/xml/Utility.scala
rename to shared/src/main/scala/scala/xml/Utility.scala
diff --git a/src/main/scala/scala/xml/XML.scala b/shared/src/main/scala/scala/xml/XML.scala
similarity index 100%
rename from src/main/scala/scala/xml/XML.scala
rename to shared/src/main/scala/scala/xml/XML.scala
diff --git a/src/main/scala/scala/xml/Xhtml.scala b/shared/src/main/scala/scala/xml/Xhtml.scala
similarity index 100%
rename from src/main/scala/scala/xml/Xhtml.scala
rename to shared/src/main/scala/scala/xml/Xhtml.scala
diff --git a/src/main/scala/scala/xml/dtd/ContentModel.scala b/shared/src/main/scala/scala/xml/dtd/ContentModel.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/ContentModel.scala
rename to shared/src/main/scala/scala/xml/dtd/ContentModel.scala
diff --git a/src/main/scala/scala/xml/dtd/ContentModelParser.scala b/shared/src/main/scala/scala/xml/dtd/ContentModelParser.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/ContentModelParser.scala
rename to shared/src/main/scala/scala/xml/dtd/ContentModelParser.scala
diff --git a/src/main/scala/scala/xml/dtd/DTD.scala b/shared/src/main/scala/scala/xml/dtd/DTD.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/DTD.scala
rename to shared/src/main/scala/scala/xml/dtd/DTD.scala
diff --git a/src/main/scala/scala/xml/dtd/Decl.scala b/shared/src/main/scala/scala/xml/dtd/Decl.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/Decl.scala
rename to shared/src/main/scala/scala/xml/dtd/Decl.scala
diff --git a/src/main/scala/scala/xml/dtd/DocType.scala b/shared/src/main/scala/scala/xml/dtd/DocType.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/DocType.scala
rename to shared/src/main/scala/scala/xml/dtd/DocType.scala
diff --git a/src/main/scala/scala/xml/dtd/ElementValidator.scala b/shared/src/main/scala/scala/xml/dtd/ElementValidator.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/ElementValidator.scala
rename to shared/src/main/scala/scala/xml/dtd/ElementValidator.scala
diff --git a/src/main/scala/scala/xml/dtd/ExternalID.scala b/shared/src/main/scala/scala/xml/dtd/ExternalID.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/ExternalID.scala
rename to shared/src/main/scala/scala/xml/dtd/ExternalID.scala
diff --git a/src/main/scala/scala/xml/dtd/Scanner.scala b/shared/src/main/scala/scala/xml/dtd/Scanner.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/Scanner.scala
rename to shared/src/main/scala/scala/xml/dtd/Scanner.scala
diff --git a/src/main/scala/scala/xml/dtd/Tokens.scala b/shared/src/main/scala/scala/xml/dtd/Tokens.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/Tokens.scala
rename to shared/src/main/scala/scala/xml/dtd/Tokens.scala
diff --git a/src/main/scala/scala/xml/dtd/ValidationException.scala b/shared/src/main/scala/scala/xml/dtd/ValidationException.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/ValidationException.scala
rename to shared/src/main/scala/scala/xml/dtd/ValidationException.scala
diff --git a/src/main/scala/scala/xml/dtd/impl/Base.scala b/shared/src/main/scala/scala/xml/dtd/impl/Base.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/impl/Base.scala
rename to shared/src/main/scala/scala/xml/dtd/impl/Base.scala
diff --git a/src/main/scala/scala/xml/dtd/impl/BaseBerrySethi.scala b/shared/src/main/scala/scala/xml/dtd/impl/BaseBerrySethi.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/impl/BaseBerrySethi.scala
rename to shared/src/main/scala/scala/xml/dtd/impl/BaseBerrySethi.scala
diff --git a/src/main/scala/scala/xml/dtd/impl/DetWordAutom.scala b/shared/src/main/scala/scala/xml/dtd/impl/DetWordAutom.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/impl/DetWordAutom.scala
rename to shared/src/main/scala/scala/xml/dtd/impl/DetWordAutom.scala
diff --git a/src/main/scala/scala/xml/dtd/impl/Inclusion.scala b/shared/src/main/scala/scala/xml/dtd/impl/Inclusion.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/impl/Inclusion.scala
rename to shared/src/main/scala/scala/xml/dtd/impl/Inclusion.scala
diff --git a/src/main/scala/scala/xml/dtd/impl/NondetWordAutom.scala b/shared/src/main/scala/scala/xml/dtd/impl/NondetWordAutom.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/impl/NondetWordAutom.scala
rename to shared/src/main/scala/scala/xml/dtd/impl/NondetWordAutom.scala
diff --git a/src/main/scala/scala/xml/dtd/impl/PointedHedgeExp.scala b/shared/src/main/scala/scala/xml/dtd/impl/PointedHedgeExp.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/impl/PointedHedgeExp.scala
rename to shared/src/main/scala/scala/xml/dtd/impl/PointedHedgeExp.scala
diff --git a/src/main/scala/scala/xml/dtd/impl/SubsetConstruction.scala b/shared/src/main/scala/scala/xml/dtd/impl/SubsetConstruction.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/impl/SubsetConstruction.scala
rename to shared/src/main/scala/scala/xml/dtd/impl/SubsetConstruction.scala
diff --git a/src/main/scala/scala/xml/dtd/impl/SyntaxError.scala b/shared/src/main/scala/scala/xml/dtd/impl/SyntaxError.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/impl/SyntaxError.scala
rename to shared/src/main/scala/scala/xml/dtd/impl/SyntaxError.scala
diff --git a/src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala b/shared/src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala
rename to shared/src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala
diff --git a/src/main/scala/scala/xml/dtd/impl/WordExp.scala b/shared/src/main/scala/scala/xml/dtd/impl/WordExp.scala
similarity index 100%
rename from src/main/scala/scala/xml/dtd/impl/WordExp.scala
rename to shared/src/main/scala/scala/xml/dtd/impl/WordExp.scala
diff --git a/src/main/scala/scala/xml/factory/Binder.scala b/shared/src/main/scala/scala/xml/factory/Binder.scala
similarity index 100%
rename from src/main/scala/scala/xml/factory/Binder.scala
rename to shared/src/main/scala/scala/xml/factory/Binder.scala
diff --git a/src/main/scala/scala/xml/factory/LoggedNodeFactory.scala b/shared/src/main/scala/scala/xml/factory/LoggedNodeFactory.scala
similarity index 100%
rename from src/main/scala/scala/xml/factory/LoggedNodeFactory.scala
rename to shared/src/main/scala/scala/xml/factory/LoggedNodeFactory.scala
diff --git a/src/main/scala/scala/xml/factory/NodeFactory.scala b/shared/src/main/scala/scala/xml/factory/NodeFactory.scala
similarity index 100%
rename from src/main/scala/scala/xml/factory/NodeFactory.scala
rename to shared/src/main/scala/scala/xml/factory/NodeFactory.scala
diff --git a/src/main/scala/scala/xml/factory/XMLLoader.scala b/shared/src/main/scala/scala/xml/factory/XMLLoader.scala
similarity index 100%
rename from src/main/scala/scala/xml/factory/XMLLoader.scala
rename to shared/src/main/scala/scala/xml/factory/XMLLoader.scala
diff --git a/src/main/scala/scala/xml/include/CircularIncludeException.scala b/shared/src/main/scala/scala/xml/include/CircularIncludeException.scala
similarity index 100%
rename from src/main/scala/scala/xml/include/CircularIncludeException.scala
rename to shared/src/main/scala/scala/xml/include/CircularIncludeException.scala
diff --git a/src/main/scala/scala/xml/include/UnavailableResourceException.scala b/shared/src/main/scala/scala/xml/include/UnavailableResourceException.scala
similarity index 100%
rename from src/main/scala/scala/xml/include/UnavailableResourceException.scala
rename to shared/src/main/scala/scala/xml/include/UnavailableResourceException.scala
diff --git a/src/main/scala/scala/xml/include/XIncludeException.scala b/shared/src/main/scala/scala/xml/include/XIncludeException.scala
similarity index 100%
rename from src/main/scala/scala/xml/include/XIncludeException.scala
rename to shared/src/main/scala/scala/xml/include/XIncludeException.scala
diff --git a/src/main/scala/scala/xml/include/sax/EncodingHeuristics.scala b/shared/src/main/scala/scala/xml/include/sax/EncodingHeuristics.scala
similarity index 100%
rename from src/main/scala/scala/xml/include/sax/EncodingHeuristics.scala
rename to shared/src/main/scala/scala/xml/include/sax/EncodingHeuristics.scala
diff --git a/src/main/scala/scala/xml/include/sax/XIncludeFilter.scala b/shared/src/main/scala/scala/xml/include/sax/XIncludeFilter.scala
similarity index 100%
rename from src/main/scala/scala/xml/include/sax/XIncludeFilter.scala
rename to shared/src/main/scala/scala/xml/include/sax/XIncludeFilter.scala
diff --git a/src/main/scala/scala/xml/include/sax/XIncluder.scala b/shared/src/main/scala/scala/xml/include/sax/XIncluder.scala
similarity index 100%
rename from src/main/scala/scala/xml/include/sax/XIncluder.scala
rename to shared/src/main/scala/scala/xml/include/sax/XIncluder.scala
diff --git a/src/main/scala/scala/xml/package.scala b/shared/src/main/scala/scala/xml/package.scala
similarity index 100%
rename from src/main/scala/scala/xml/package.scala
rename to shared/src/main/scala/scala/xml/package.scala
diff --git a/src/main/scala/scala/xml/parsing/ConstructingHandler.scala b/shared/src/main/scala/scala/xml/parsing/ConstructingHandler.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/ConstructingHandler.scala
rename to shared/src/main/scala/scala/xml/parsing/ConstructingHandler.scala
diff --git a/src/main/scala/scala/xml/parsing/ConstructingParser.scala b/shared/src/main/scala/scala/xml/parsing/ConstructingParser.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/ConstructingParser.scala
rename to shared/src/main/scala/scala/xml/parsing/ConstructingParser.scala
diff --git a/src/main/scala/scala/xml/parsing/DefaultMarkupHandler.scala b/shared/src/main/scala/scala/xml/parsing/DefaultMarkupHandler.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/DefaultMarkupHandler.scala
rename to shared/src/main/scala/scala/xml/parsing/DefaultMarkupHandler.scala
diff --git a/src/main/scala/scala/xml/parsing/ExternalSources.scala b/shared/src/main/scala/scala/xml/parsing/ExternalSources.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/ExternalSources.scala
rename to shared/src/main/scala/scala/xml/parsing/ExternalSources.scala
diff --git a/src/main/scala/scala/xml/parsing/FactoryAdapter.scala b/shared/src/main/scala/scala/xml/parsing/FactoryAdapter.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/FactoryAdapter.scala
rename to shared/src/main/scala/scala/xml/parsing/FactoryAdapter.scala
diff --git a/src/main/scala/scala/xml/parsing/FatalError.scala b/shared/src/main/scala/scala/xml/parsing/FatalError.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/FatalError.scala
rename to shared/src/main/scala/scala/xml/parsing/FatalError.scala
diff --git a/src/main/scala/scala/xml/parsing/MarkupHandler.scala b/shared/src/main/scala/scala/xml/parsing/MarkupHandler.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/MarkupHandler.scala
rename to shared/src/main/scala/scala/xml/parsing/MarkupHandler.scala
diff --git a/src/main/scala/scala/xml/parsing/MarkupParser.scala b/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/MarkupParser.scala
rename to shared/src/main/scala/scala/xml/parsing/MarkupParser.scala
diff --git a/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala b/shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/MarkupParserCommon.scala
rename to shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala
diff --git a/src/main/scala/scala/xml/parsing/NoBindingFactoryAdapter.scala b/shared/src/main/scala/scala/xml/parsing/NoBindingFactoryAdapter.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/NoBindingFactoryAdapter.scala
rename to shared/src/main/scala/scala/xml/parsing/NoBindingFactoryAdapter.scala
diff --git a/src/main/scala/scala/xml/parsing/TokenTests.scala b/shared/src/main/scala/scala/xml/parsing/TokenTests.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/TokenTests.scala
rename to shared/src/main/scala/scala/xml/parsing/TokenTests.scala
diff --git a/src/main/scala/scala/xml/parsing/ValidatingMarkupHandler.scala b/shared/src/main/scala/scala/xml/parsing/ValidatingMarkupHandler.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/ValidatingMarkupHandler.scala
rename to shared/src/main/scala/scala/xml/parsing/ValidatingMarkupHandler.scala
diff --git a/src/main/scala/scala/xml/parsing/XhtmlEntities.scala b/shared/src/main/scala/scala/xml/parsing/XhtmlEntities.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/XhtmlEntities.scala
rename to shared/src/main/scala/scala/xml/parsing/XhtmlEntities.scala
diff --git a/src/main/scala/scala/xml/parsing/XhtmlParser.scala b/shared/src/main/scala/scala/xml/parsing/XhtmlParser.scala
similarity index 100%
rename from src/main/scala/scala/xml/parsing/XhtmlParser.scala
rename to shared/src/main/scala/scala/xml/parsing/XhtmlParser.scala
diff --git a/src/main/scala/scala/xml/persistent/CachedFileStorage.scala b/shared/src/main/scala/scala/xml/persistent/CachedFileStorage.scala
similarity index 100%
rename from src/main/scala/scala/xml/persistent/CachedFileStorage.scala
rename to shared/src/main/scala/scala/xml/persistent/CachedFileStorage.scala
diff --git a/src/main/scala/scala/xml/persistent/Index.scala b/shared/src/main/scala/scala/xml/persistent/Index.scala
similarity index 100%
rename from src/main/scala/scala/xml/persistent/Index.scala
rename to shared/src/main/scala/scala/xml/persistent/Index.scala
diff --git a/src/main/scala/scala/xml/persistent/SetStorage.scala b/shared/src/main/scala/scala/xml/persistent/SetStorage.scala
similarity index 100%
rename from src/main/scala/scala/xml/persistent/SetStorage.scala
rename to shared/src/main/scala/scala/xml/persistent/SetStorage.scala
diff --git a/src/main/scala/scala/xml/pull/XMLEvent.scala b/shared/src/main/scala/scala/xml/pull/XMLEvent.scala
similarity index 100%
rename from src/main/scala/scala/xml/pull/XMLEvent.scala
rename to shared/src/main/scala/scala/xml/pull/XMLEvent.scala
diff --git a/src/main/scala/scala/xml/pull/XMLEventReader.scala b/shared/src/main/scala/scala/xml/pull/XMLEventReader.scala
similarity index 100%
rename from src/main/scala/scala/xml/pull/XMLEventReader.scala
rename to shared/src/main/scala/scala/xml/pull/XMLEventReader.scala
diff --git a/src/main/scala/scala/xml/pull/package.scala b/shared/src/main/scala/scala/xml/pull/package.scala
similarity index 100%
rename from src/main/scala/scala/xml/pull/package.scala
rename to shared/src/main/scala/scala/xml/pull/package.scala
diff --git a/src/main/scala/scala/xml/transform/BasicTransformer.scala b/shared/src/main/scala/scala/xml/transform/BasicTransformer.scala
similarity index 100%
rename from src/main/scala/scala/xml/transform/BasicTransformer.scala
rename to shared/src/main/scala/scala/xml/transform/BasicTransformer.scala
diff --git a/src/main/scala/scala/xml/transform/RewriteRule.scala b/shared/src/main/scala/scala/xml/transform/RewriteRule.scala
similarity index 100%
rename from src/main/scala/scala/xml/transform/RewriteRule.scala
rename to shared/src/main/scala/scala/xml/transform/RewriteRule.scala
diff --git a/src/main/scala/scala/xml/transform/RuleTransformer.scala b/shared/src/main/scala/scala/xml/transform/RuleTransformer.scala
similarity index 100%
rename from src/main/scala/scala/xml/transform/RuleTransformer.scala
rename to shared/src/main/scala/scala/xml/transform/RuleTransformer.scala
diff --git a/src/test/scala/scala/xml/AttributeTest.scala b/shared/src/test/scala/scala/xml/AttributeTest.scala
similarity index 100%
rename from src/test/scala/scala/xml/AttributeTest.scala
rename to shared/src/test/scala/scala/xml/AttributeTest.scala
diff --git a/src/test/scala/scala/xml/JUnitAssertsForXML.scala b/shared/src/test/scala/scala/xml/JUnitAssertsForXML.scala
similarity index 100%
rename from src/test/scala/scala/xml/JUnitAssertsForXML.scala
rename to shared/src/test/scala/scala/xml/JUnitAssertsForXML.scala
diff --git a/src/test/scala/scala/xml/MetaDataTest.scala b/shared/src/test/scala/scala/xml/MetaDataTest.scala
similarity index 100%
rename from src/test/scala/scala/xml/MetaDataTest.scala
rename to shared/src/test/scala/scala/xml/MetaDataTest.scala
diff --git a/src/test/scala/scala/xml/PatternMatching.scala b/shared/src/test/scala/scala/xml/PatternMatching.scala
similarity index 100%
rename from src/test/scala/scala/xml/PatternMatching.scala
rename to shared/src/test/scala/scala/xml/PatternMatching.scala
diff --git a/src/test/scala/scala/xml/PrintEmptyElementsTest.scala b/shared/src/test/scala/scala/xml/PrintEmptyElementsTest.scala
similarity index 100%
rename from src/test/scala/scala/xml/PrintEmptyElementsTest.scala
rename to shared/src/test/scala/scala/xml/PrintEmptyElementsTest.scala
diff --git a/src/test/scala/scala/xml/ShouldCompile.scala b/shared/src/test/scala/scala/xml/ShouldCompile.scala
similarity index 100%
rename from src/test/scala/scala/xml/ShouldCompile.scala
rename to shared/src/test/scala/scala/xml/ShouldCompile.scala
diff --git a/src/test/scala/scala/xml/Transformers.scala b/shared/src/test/scala/scala/xml/Transformers.scala
similarity index 100%
rename from src/test/scala/scala/xml/Transformers.scala
rename to shared/src/test/scala/scala/xml/Transformers.scala
diff --git a/src/test/scala/scala/xml/UtilityTest.scala b/shared/src/test/scala/scala/xml/UtilityTest.scala
similarity index 100%
rename from src/test/scala/scala/xml/UtilityTest.scala
rename to shared/src/test/scala/scala/xml/UtilityTest.scala
diff --git a/src/test/scala/scala/xml/XMLEmbeddingTest.scala b/shared/src/test/scala/scala/xml/XMLEmbeddingTest.scala
similarity index 100%
rename from src/test/scala/scala/xml/XMLEmbeddingTest.scala
rename to shared/src/test/scala/scala/xml/XMLEmbeddingTest.scala