diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/ContextUtil.scala
similarity index 99%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/ContextUtil.scala
index 1db77f24d..4bdf92dc7 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/ContextUtil.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import scala.reflect._
diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/Convert.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Convert.scala
similarity index 98%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/Convert.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Convert.scala
index 3a2e562a6..ecfa0ea4f 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/Convert.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Convert.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import scala.reflect._
diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/Instance.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Instance.scala
similarity index 99%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/Instance.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Instance.scala
index 7a63feca5..111fbc3ca 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/Instance.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Instance.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import Classes.Applicative
diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/KListBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/KListBuilder.scala
similarity index 99%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/KListBuilder.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/KListBuilder.scala
index 147f622bf..3f0a12e28 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/KListBuilder.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/KListBuilder.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import Types.Id
diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/MixedBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/MixedBuilder.scala
similarity index 95%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/MixedBuilder.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/MixedBuilder.scala
index 019dc8b20..c99610275 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/MixedBuilder.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/MixedBuilder.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import scala.reflect._
diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/TupleBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleBuilder.scala
similarity index 99%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/TupleBuilder.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleBuilder.scala
index a6ea2d84c..ab87ead81 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/TupleBuilder.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleBuilder.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import Types.Id
diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/TupleNBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleNBuilder.scala
similarity index 98%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/TupleNBuilder.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleNBuilder.scala
index ddef0bee3..7c582328e 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/TupleNBuilder.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleNBuilder.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import Types.Id