Move files around

main-command/src/main/scala/sbt/BasicCommands.scala

@@ -6,6 +6,7 @@ import sbt.internal.util.complete.{ Completion, Completions, DefaultParsers, His
 import sbt.internal.util.Types.{ const, idFun }
 import sbt.internal.inc.classpath.ClasspathUtilities.toLoader
 import sbt.internal.inc.ModuleUtilities
+import sbt.internal.{ NetworkListener, ConsoleListener }
 import DefaultParsers._
 import Function.tupled
 import Command.applyEffect

main/command/src/main/scala/sbt/internal/CommandListener.scala

@@ -1,4 +1,5 @@
 package sbt
+package internal
 
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.atomic.AtomicBoolean

main/command/src/main/scala/sbt/internal/ConsoleListener.scala

@@ -1,4 +1,5 @@
 package sbt
+package internal
 
 import sbt.internal.util._
 import java.util.concurrent.ConcurrentLinkedQueue

main/command/src/main/scala/sbt/internal/NetworkListener.scala

@@ -1,8 +1,9 @@
 package sbt
+package internal
 
 import java.util.concurrent.ConcurrentLinkedQueue
 
-import sbt.server._
+import sbt.internal.server._
 
 private[sbt] final class NetworkListener(queue: ConcurrentLinkedQueue[(String, Option[String])]) extends CommandListener(queue) {
 
@@ -10,7 +11,7 @@ private[sbt] final class NetworkListener(queue: ConcurrentLinkedQueue[(String, O
 
   def run(status: CommandStatus): Unit =
     {
-      def onCommand(command: sbt.server.Command): Unit = {
+      def onCommand(command: internal.server.Command): Unit = {
         command match {
           case Execution(cmd) => queue.add(("network", Some(cmd)))
         }

main/command/src/main/scala/sbt/internal/server/ClientConnection.scala

@@ -2,6 +2,7 @@
  * Copyright (C) 2016 Lightbend Inc. <http://www.typesafe.com>
  */
 package sbt
+package internal
 package server
 
 import java.net.{ SocketTimeoutException, Socket }

main/command/src/main/scala/sbt/internal/server/Serialization.scala

@@ -2,6 +2,7 @@
  * Copyright (C) 2016 Lightbend Inc. <http://www.typesafe.com>
  */
 package sbt
+package internal
 package server
 
 import org.json4s.JsonAST.{ JArray, JString }

main/command/src/main/scala/sbt/internal/server/Server.scala

@@ -2,6 +2,7 @@
  * Copyright (C) 2016 Lightbend Inc. <http://www.typesafe.com>
  */
 package sbt
+package internal
 package server
 
 import java.net.{ SocketTimeoutException, InetAddress, ServerSocket }

main/command/src/main/scala/sbt/internal/server/protocol.scala

@@ -2,6 +2,7 @@
  * Copyright (C) 2016 Lightbend Inc. <http://www.typesafe.com>
  */
 package sbt
+package internal
 package server
 
 /*