diff --git a/main/command/src/main/scala/sbt/internal/CommandChannel.scala b/main-command/src/main/scala/sbt/internal/CommandChannel.scala
similarity index 100%
rename from main/command/src/main/scala/sbt/internal/CommandChannel.scala
rename to main-command/src/main/scala/sbt/internal/CommandChannel.scala
diff --git a/main/command/src/main/scala/sbt/internal/CommandExchange.scala b/main-command/src/main/scala/sbt/internal/CommandExchange.scala
similarity index 100%
rename from main/command/src/main/scala/sbt/internal/CommandExchange.scala
rename to main-command/src/main/scala/sbt/internal/CommandExchange.scala
diff --git a/main/command/src/main/scala/sbt/internal/ConsoleChannel.scala b/main-command/src/main/scala/sbt/internal/ConsoleChannel.scala
similarity index 100%
rename from main/command/src/main/scala/sbt/internal/ConsoleChannel.scala
rename to main-command/src/main/scala/sbt/internal/ConsoleChannel.scala
diff --git a/main/command/src/main/scala/sbt/internal/NetworkChannel.scala b/main-command/src/main/scala/sbt/internal/NetworkChannel.scala
similarity index 100%
rename from main/command/src/main/scala/sbt/internal/NetworkChannel.scala
rename to main-command/src/main/scala/sbt/internal/NetworkChannel.scala
diff --git a/main/command/src/main/scala/sbt/internal/server/ClientConnection.scala b/main-command/src/main/scala/sbt/internal/server/ClientConnection.scala
similarity index 100%
rename from main/command/src/main/scala/sbt/internal/server/ClientConnection.scala
rename to main-command/src/main/scala/sbt/internal/server/ClientConnection.scala
diff --git a/main/command/src/main/scala/sbt/internal/server/Serialization.scala b/main-command/src/main/scala/sbt/internal/server/Serialization.scala
similarity index 100%
rename from main/command/src/main/scala/sbt/internal/server/Serialization.scala
rename to main-command/src/main/scala/sbt/internal/server/Serialization.scala
diff --git a/main/command/src/main/scala/sbt/internal/server/Server.scala b/main-command/src/main/scala/sbt/internal/server/Server.scala
similarity index 100%
rename from main/command/src/main/scala/sbt/internal/server/Server.scala
rename to main-command/src/main/scala/sbt/internal/server/Server.scala
diff --git a/main/command/src/main/scala/sbt/internal/server/protocol.scala b/main-command/src/main/scala/sbt/internal/server/protocol.scala
similarity index 100%
rename from main/command/src/main/scala/sbt/internal/server/protocol.scala
rename to main-command/src/main/scala/sbt/internal/server/protocol.scala
diff --git a/main/src/main/scala/sbt/Project.scala b/main/src/main/scala/sbt/Project.scala
index 7ddcc6c82..497d5cf70 100755
--- a/main/src/main/scala/sbt/Project.scala
+++ b/main/src/main/scala/sbt/Project.scala
@@ -6,7 +6,7 @@ package sbt
 import java.io.File
 import java.net.URI
 import java.util.Locale
-import Project.{ Initialize => _, Setting => _, _ }
+import Project._
 import Keys.{ appConfiguration, stateBuildStructure, commands, configuration, historyPath, projectCommand, sessionSettings, shellPrompt, serverPort, thisProject, thisProjectRef, watch }
 import Scope.{ GlobalScope, ThisScope }
 import Def.{ Flattened, Initialize, ScopedKey, Setting }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 94a89910d..16ec839e9 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -38,6 +38,9 @@ object Dependencies {
   lazy val compilerApiInfo = "org.scala-sbt" %% "zinc-apiinfo" % zincVersion
   lazy val compilerIvyIntegration = "org.scala-sbt" %% "zinc-ivy-integration" % zincVersion
 
+  lazy val json4s = "org.json4s" %% "json4s" % "3.2.10"
+  lazy val json4sNative = "org.json4s" %% "json4s-native" % "3.2.10"
+
   lazy val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.11.4"
   lazy val specs2 = "org.specs2" %% "specs2" % "2.3.11"
   lazy val junit = "junit" % "junit" % "4.11"