19 files changed, 30 insertions, 31 deletions
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29b..00000000
--- a/.gitmodules
+++ /dev/null
diff --git a/build.sc b/build.sc
index d9b357f7..782a4b18 100755
--- a/build.sc
+++ b/build.sc
@@ -1,5 +1,5 @@
-import $file.shared
-import $file.upload
+import $file.ci.shared
+import $file.ci.upload
 import java.nio.file.attribute.PosixFilePermission
 
 import ammonite.ops._
@@ -28,14 +28,6 @@ trait MillPublishModule extends PublishModule{
   def javacOptions = Seq("-source", "1.8", "-target", "1.8")
 }
 
-object moduledefs extends MillPublishModule with ScalaModule{
-  def scalaVersion = T{ "2.12.6" }
-  def ivyDeps = Agg(
-    ivy"org.scala-lang:scala-compiler:${scalaVersion()}",
-    ivy"com.lihaoyi::sourcecode:0.1.4"
-  )
-}
-
 trait MillModule extends MillPublishModule with ScalaModule{ outer =>
   def scalaVersion = T{ "2.12.6" }
   def compileIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.1.7")
@@ -59,18 +51,10 @@ trait MillModule extends MillPublishModule with ScalaModule{ outer =>
       else Seq(outer, main.test)
     def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.6.4")
     def testFrameworks = Seq("mill.UTestFramework")
-    def scalacPluginClasspath = super.scalacPluginClasspath() ++ Seq(moduledefs.jar())
+    def scalacPluginClasspath = super.scalacPluginClasspath() ++ Seq(core.moduledefs.jar())
   }
 }
 
-
-object testng extends MillPublishModule{
-  def ivyDeps = Agg(
-    ivy"org.scala-sbt:test-interface:1.0",
-    ivy"org.testng:testng:6.11"
-  )
-}
-
 object core extends MillModule {
   def moduleDeps = Seq(moduledefs)
 
@@ -88,6 +72,15 @@ object core extends MillModule {
   def generatedSources = T {
     Seq(PathRef(shared.generateCoreSources(T.ctx().dest)))
   }
+
+  object moduledefs extends MillPublishModule with ScalaModule{
+    def scalaVersion = T{ "2.12.6" }
+    def ivyDeps = Agg(
+      ivy"org.scala-lang:scala-compiler:${scalaVersion()}",
+      ivy"com.lihaoyi::sourcecode:0.1.4"
+    )
+  }
+
 }
 
 object main extends MillModule {
@@ -152,7 +145,7 @@ object scalalib extends MillModule {
 
   def testArgs = T{
     val genIdeaArgs =
-      genTask(moduledefs)() ++
+      genTask(core.moduledefs)() ++
       genTask(core)() ++
       genTask(main)() ++
       genTask(scalalib)() ++
@@ -226,13 +219,19 @@ object scalajslib extends MillModule {
   }
 }
 
-object twirllib extends MillModule {
 
-  def moduleDeps = Seq(scalalib)
+object contrib extends MillModule {
+  object testng extends MillPublishModule{
+    def ivyDeps = Agg(
+      ivy"org.scala-sbt:test-interface:1.0",
+      ivy"org.testng:testng:6.11"
+    )
+  }
 
-}
+  object twirllib extends MillModule {
+    def moduleDeps = Seq(scalalib)
 
-object contrib extends MillModule {
+  }
 
   object scalapblib extends MillModule {
     def moduleDeps = Seq(scalalib)
@@ -306,14 +305,14 @@ def testRepos = T{
 }
 
 object integration extends MillModule{
-  def moduleDeps = Seq(moduledefs, scalalib, scalajslib, scalanativelib)
+  def moduleDeps = Seq(core.moduledefs, scalalib, scalajslib, scalanativelib)
   def testArgs = T{
     scalajslib.testArgs() ++
     scalalib.worker.testArgs() ++
     scalalib.backgroundwrapper.testArgs() ++
     scalanativelib.testArgs() ++
     Seq(
-      "-DMILL_TESTNG=" + testng.runClasspath().map(_.path).mkString(","),
+      "-DMILL_TESTNG=" + contrib.testng.runClasspath().map(_.path).mkString(","),
       "-DMILL_VERSION=" + build.publishVersion()._2,
       "-DMILL_SCALA_LIB=" + scalalib.runClasspath().map(_.path).mkString(","),
       "-Djna.nosys=true"
diff --git a/shared.sc b/ci/shared.sc
index c7656961..c7656961 100644
--- a/shared.sc
+++ b/ci/shared.sc
diff --git a/ci/test-mill-0.sh b/ci/test-mill-0.sh
index 8e44b912..92dc34c5 100755
--- a/ci/test-mill-0.sh
+++ b/ci/test-mill-0.sh
@@ -6,4 +6,4 @@ set -eux
 git clean -xdf
 
 # Run tests
-mill -i all {main,scalalib,scalajslib,twirllib,main.client,contrib.scalapblib}.test
+mill -i all {main,scalalib,scalajslib,contrib.twirllib,main.client,contrib.scalapblib}.test
diff --git a/ci/test-mill-2.sh b/ci/test-mill-2.sh
index 00480a31..ceec17ef 100755
--- a/ci/test-mill-2.sh
+++ b/ci/test-mill-2.sh
@@ -5,6 +5,6 @@ set -eux
 # Starting from scratch...
 git clean -xdf
 
-mill testng.publishLocal # Needed for CaffeineTests
+mill contrib.testng.publishLocal # Needed for CaffeineTests
 # Run tests
 mill integration.test "mill.integration.local.{AcyclicTests,AmmoniteTests}"
diff --git a/ci/test-mill-bootstrap.sh b/ci/test-mill-bootstrap.sh
index cd959f9e..df8d086d 100755
--- a/ci/test-mill-bootstrap.sh
+++ b/ci/test-mill-bootstrap.sh
@@ -27,4 +27,4 @@ git clean -xdf
 rm -rf ~/.mill
 
 # Use second build to run tests using Mill
-~/mill-2 -i all {main,scalalib,scalajslib,twirllib,contrib.scalapblib}.test
+~/mill-2 -i all {main,scalalib,scalajslib,contrib.twirllib,contrib.scalapblib}.test
diff --git a/ci/test-mill-dev.sh b/ci/test-mill-dev.sh
index deb48dca..ab4a4d19 100755
--- a/ci/test-mill-dev.sh
+++ b/ci/test-mill-dev.sh
@@ -11,5 +11,5 @@ mill -i dev.assembly
 rm -rf ~/.mill
 
 # Second build & run tests
-out/dev/assembly/dest/mill -i all {main,scalalib,scalajslib,twirllib,contrib.scalapblib}.test
+out/dev/assembly/dest/mill -i all {main,scalalib,scalajslib,contrib.twirllib,contrib.scalapblib}.test
 
diff --git a/upload.sc b/ci/upload.sc
index d6aa96e2..d6aa96e2 100644
--- a/upload.sc
+++ b/ci/upload.sc
diff --git a/testng/src/mill/testng/ResultEvent.java b/contrib/testng/src/mill/testng/ResultEvent.java
index 6e2a50d6..6e2a50d6 100644
--- a/testng/src/mill/testng/ResultEvent.java
+++ b/contrib/testng/src/mill/testng/ResultEvent.java
diff --git a/testng/src/mill/testng/TestNGFramework.java b/contrib/testng/src/mill/testng/TestNGFramework.java
index 6e993fcc..6e993fcc 100644
--- a/testng/src/mill/testng/TestNGFramework.java
+++ b/contrib/testng/src/mill/testng/TestNGFramework.java
diff --git a/testng/src/mill/testng/TestNGInstance.java b/contrib/testng/src/mill/testng/TestNGInstance.java
index 4cf274d3..4cf274d3 100644
--- a/testng/src/mill/testng/TestNGInstance.java
+++ b/contrib/testng/src/mill/testng/TestNGInstance.java
diff --git a/testng/src/mill/testng/TestNGRunner.java b/contrib/testng/src/mill/testng/TestNGRunner.java
index 0ad05f76..0ad05f76 100644
--- a/testng/src/mill/testng/TestNGRunner.java
+++ b/contrib/testng/src/mill/testng/TestNGRunner.java
diff --git a/twirllib/src/mill/twirllib/TwirlModule.scala b/contrib/twirllib/src/mill/twirllib/TwirlModule.scala
index 2df70a1f..2df70a1f 100644
--- a/twirllib/src/mill/twirllib/TwirlModule.scala
+++ b/contrib/twirllib/src/mill/twirllib/TwirlModule.scala
diff --git a/twirllib/src/mill/twirllib/TwirlWorker.scala b/contrib/twirllib/src/mill/twirllib/TwirlWorker.scala
index f351ff2f..f351ff2f 100644
--- a/twirllib/src/mill/twirllib/TwirlWorker.scala
+++ b/contrib/twirllib/src/mill/twirllib/TwirlWorker.scala
diff --git a/twirllib/test/resources/hello-world/core/views/hello.scala.html b/contrib/twirllib/test/resources/hello-world/core/views/hello.scala.html
index acadf615..acadf615 100644
--- a/twirllib/test/resources/hello-world/core/views/hello.scala.html
+++ b/contrib/twirllib/test/resources/hello-world/core/views/hello.scala.html
diff --git a/twirllib/test/src/mill/twirllib/HelloWorldTests.scala b/contrib/twirllib/test/src/mill/twirllib/HelloWorldTests.scala
index 31928335..01576975 100644
--- a/twirllib/test/src/mill/twirllib/HelloWorldTests.scala
+++ b/contrib/twirllib/test/src/mill/twirllib/HelloWorldTests.scala
@@ -22,7 +22,7 @@ object HelloWorldTests extends TestSuite {
     }
   }
 
-  val resourcePath: Path = pwd / 'twirllib / 'test / 'resources / "hello-world"
+  val resourcePath: Path = pwd / 'contrib / 'twirllib / 'test / 'resources / "hello-world"
 
   def workspaceTest[T, M <: TestUtil.BaseModule](m: M, resourcePath: Path = resourcePath)
                                                 (t: TestEvaluator[M] => T)
diff --git a/moduledefs/resources/scalac-plugin.xml b/core/moduledefs/resources/scalac-plugin.xml
index 48753a22..48753a22 100644
--- a/moduledefs/resources/scalac-plugin.xml
+++ b/core/moduledefs/resources/scalac-plugin.xml
diff --git a/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala b/core/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala
index 5b33abbe..5b33abbe 100644
--- a/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala
+++ b/core/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala
diff --git a/moduledefs/src/mill/moduledefs/Cacher.scala b/core/moduledefs/src/mill/moduledefs/Cacher.scala
index 023f03be..023f03be 100644
--- a/moduledefs/src/mill/moduledefs/Cacher.scala
+++ b/core/moduledefs/src/mill/moduledefs/Cacher.scala