diff --git a/main-command/src/main/contraband-scala/CommandSourceFormats.scala b/main-command/src/main/contraband-scala/sbt/internal/CommandSourceFormats.scala
similarity index 97%
rename from main-command/src/main/contraband-scala/CommandSourceFormats.scala
rename to main-command/src/main/contraband-scala/sbt/internal/CommandSourceFormats.scala
index 1f69b70e0..0cb59cb2c 100644
--- a/main-command/src/main/contraband-scala/CommandSourceFormats.scala
+++ b/main-command/src/main/contraband-scala/sbt/internal/CommandSourceFormats.scala
@@ -3,6 +3,7 @@
  */
 
 // DO NOT EDIT MANUALLY
+package sbt.internal
 import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError }
 trait CommandSourceFormats { self: sjsonnew.BasicJsonProtocol =>
 implicit lazy val CommandSourceFormat: JsonFormat[sbt.CommandSource] = new JsonFormat[sbt.CommandSource] {
diff --git a/main-command/src/main/contraband-scala/ConnectionTypeFormats.scala b/main-command/src/main/contraband-scala/sbt/internal/ConnectionTypeFormats.scala
similarity index 97%
rename from main-command/src/main/contraband-scala/ConnectionTypeFormats.scala
rename to main-command/src/main/contraband-scala/sbt/internal/ConnectionTypeFormats.scala
index 4a7ee1ac7..76c8cb898 100644
--- a/main-command/src/main/contraband-scala/ConnectionTypeFormats.scala
+++ b/main-command/src/main/contraband-scala/sbt/internal/ConnectionTypeFormats.scala
@@ -3,6 +3,7 @@
  */
 
 // DO NOT EDIT MANUALLY
+package sbt.internal
 import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError }
 trait ConnectionTypeFormats { self: sjsonnew.BasicJsonProtocol =>
 implicit lazy val ConnectionTypeFormat: JsonFormat[sbt.ConnectionType] = new JsonFormat[sbt.ConnectionType] {
diff --git a/main-command/src/main/contraband-scala/ExecFormats.scala b/main-command/src/main/contraband-scala/sbt/internal/ExecFormats.scala
similarity index 90%
rename from main-command/src/main/contraband-scala/ExecFormats.scala
rename to main-command/src/main/contraband-scala/sbt/internal/ExecFormats.scala
index ea8a42d77..38ebfb67e 100644
--- a/main-command/src/main/contraband-scala/ExecFormats.scala
+++ b/main-command/src/main/contraband-scala/sbt/internal/ExecFormats.scala
@@ -3,8 +3,9 @@
  */
 
 // DO NOT EDIT MANUALLY
+package sbt.internal
 import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError }
-trait ExecFormats { self: CommandSourceFormats with sjsonnew.BasicJsonProtocol =>
+trait ExecFormats { self: sbt.internal.CommandSourceFormats with sjsonnew.BasicJsonProtocol =>
 implicit lazy val ExecFormat: JsonFormat[sbt.Exec] = new JsonFormat[sbt.Exec] {
   override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.Exec = {
     __jsOpt match {
diff --git a/main-command/src/main/contraband-scala/ServerAuthenticationFormats.scala b/main-command/src/main/contraband-scala/sbt/internal/ServerAuthenticationFormats.scala
similarity index 97%
rename from main-command/src/main/contraband-scala/ServerAuthenticationFormats.scala
rename to main-command/src/main/contraband-scala/sbt/internal/ServerAuthenticationFormats.scala
index f9447a113..b31a5a30e 100644
--- a/main-command/src/main/contraband-scala/ServerAuthenticationFormats.scala
+++ b/main-command/src/main/contraband-scala/sbt/internal/ServerAuthenticationFormats.scala
@@ -3,6 +3,7 @@
  */
 
 // DO NOT EDIT MANUALLY
+package sbt.internal
 import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError }
 trait ServerAuthenticationFormats { self: sjsonnew.BasicJsonProtocol =>
 implicit lazy val ServerAuthenticationFormat: JsonFormat[sbt.ServerAuthentication] = new JsonFormat[sbt.ServerAuthentication] {
diff --git a/main-command/src/main/contraband/state.contra b/main-command/src/main/contraband/state.contra
index 2737ce8ab..4fb1ca21a 100644
--- a/main-command/src/main/contraband/state.contra
+++ b/main-command/src/main/contraband/state.contra
@@ -1,5 +1,6 @@
 package sbt
 @target(Scala)
+@codecPackage("sbt.internal")
 
 type Exec {
   commandLine: String!