Fix CLI package and class tangles

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cli;
+package org.springframework.boot.cli.command;
 
 import org.junit.Rule;
 import org.junit.Test;
+import org.springframework.boot.cli.command.CommandRunner;
 import org.springframework.boot.cli.command.run.RunCommand;
 import org.springframework.boot.cli.util.OutputCapture;
 

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cli;
+package org.springframework.boot.cli.command;
 
 import java.util.EnumSet;
 import java.util.Set;
@@ -26,7 +26,8 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.springframework.boot.cli.command.Command;
+import org.springframework.boot.cli.command.core.HelpCommand;
+import org.springframework.boot.cli.command.core.HintCommand;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertEquals;
@@ -95,8 +96,8 @@ public class CommandRunnerTests {
 		given(this.regularCommand.getName()).willReturn("command");
 		given(this.regularCommand.getDescription()).willReturn("A regular command");
 		this.commandRunner.addCommand(this.regularCommand);
-		this.commandRunner.addHelpCommand();
-		this.commandRunner.addHintCommand();
+		this.commandRunner.addCommand(new HelpCommand(this.commandRunner));
+		this.commandRunner.addCommand(new HintCommand(this.commandRunner));
 	}
 
 	@Test

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/OptionParsingCommandTests.java

@@ -17,6 +17,7 @@
 package org.springframework.boot.cli.command;
 
 import org.junit.Test;
+import org.springframework.boot.cli.command.options.OptionHandler;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;