From f67db3d9ad5bc333e6599bbf268fc96656d3e1c3 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Fri, 23 Sep 2022 16:30:46 +0100
Subject: [PATCH] Move spring-boot-cli into spring-boot-tools

Closes gh-32492
---
 settings.gradle                                     |   2 +-
 spring-boot-project/spring-boot-docs/build.gradle   |   2 +-
 .../spring-boot-cli/build.gradle                    |   0
 .../org/springframework/boot/cli/CommandLineIT.java |   0
 .../boot/cli/infrastructure/CommandLineInvoker.java |   0
 .../boot/cli/infrastructure/Versions.java           |   2 +-
 .../src/intTest/resources/settings.xml              |   0
 .../spring-boot-cli/src/main/content/INSTALL.txt    |   0
 .../spring-boot-cli/src/main/content/LICENCE.txt    |   0
 .../spring-boot-cli/src/main/content/bin/spring.bat |   0
 .../src/main/content/legal/open_source_licenses.txt |   0
 .../src/main/content/shell-completion/bash/spring   |   0
 .../src/main/content/shell-completion/zsh/_spring   |   0
 .../src/main/executablecontent/bin/spring           |   0
 .../src/main/homebrew/spring-boot.rb                |   0
 .../boot/cli/DefaultCommandFactory.java             |   0
 .../org/springframework/boot/cli/SpringCli.java     |   0
 .../boot/cli/command/AbstractCommand.java           |   0
 .../springframework/boot/cli/command/Command.java   |   0
 .../boot/cli/command/CommandException.java          |   0
 .../boot/cli/command/CommandFactory.java            |   0
 .../boot/cli/command/CommandRunner.java             |   0
 .../boot/cli/command/HelpExample.java               |   0
 .../boot/cli/command/NoArgumentsException.java      |   0
 .../command/NoHelpCommandArgumentsException.java    |   0
 .../boot/cli/command/NoSuchCommandException.java    |   0
 .../boot/cli/command/OptionParsingCommand.java      |   0
 .../boot/cli/command/core/HelpCommand.java          |   0
 .../boot/cli/command/core/HintCommand.java          |   0
 .../boot/cli/command/core/VersionCommand.java       |   0
 .../boot/cli/command/core/package-info.java         |   0
 .../encodepassword/EncodePasswordCommand.java       |   0
 .../cli/command/encodepassword/package-info.java    |   0
 .../boot/cli/command/init/Dependency.java           |   0
 .../boot/cli/command/init/InitCommand.java          |   0
 .../boot/cli/command/init/InitializrService.java    |   0
 .../cli/command/init/InitializrServiceMetadata.java |   0
 .../cli/command/init/ProjectGenerationRequest.java  |   0
 .../cli/command/init/ProjectGenerationResponse.java |   0
 .../boot/cli/command/init/ProjectGenerator.java     |   0
 .../boot/cli/command/init/ProjectType.java          |   0
 .../boot/cli/command/init/ReportableException.java  |   0
 .../init/ServiceCapabilitiesReportGenerator.java    |   0
 .../boot/cli/command/init/package-info.java         |   0
 .../boot/cli/command/options/OptionHandler.java     |   0
 .../boot/cli/command/options/OptionHelp.java        |   0
 .../boot/cli/command/options/package-info.java      |   0
 .../boot/cli/command/package-info.java              |   0
 .../boot/cli/command/shell/AnsiString.java          |   0
 .../boot/cli/command/shell/ClearCommand.java        |   0
 .../boot/cli/command/shell/CommandCompleter.java    |   0
 .../EscapeAwareWhiteSpaceArgumentDelimiter.java     |   0
 .../boot/cli/command/shell/ExitCommand.java         |   0
 .../boot/cli/command/shell/ForkProcessCommand.java  |   0
 .../boot/cli/command/shell/PromptCommand.java       |   0
 .../boot/cli/command/shell/RunProcessCommand.java   |   0
 .../boot/cli/command/shell/Shell.java               |   0
 .../boot/cli/command/shell/ShellCommand.java        |   0
 .../boot/cli/command/shell/ShellExitException.java  |   0
 .../boot/cli/command/shell/ShellPrompts.java        |   0
 .../boot/cli/command/shell/package-info.java        |   0
 .../boot/cli/command/status/ExitStatus.java         |   0
 .../boot/cli/command/status/package-info.java       |   0
 .../org/springframework/boot/cli/package-info.java  |   0
 .../java/org/springframework/boot/cli/util/Log.java |   0
 .../springframework/boot/cli/util/LogListener.java  |   0
 .../springframework/boot/cli/util/package-info.java |   0
 ....springframework.boot.cli.command.CommandFactory |   0
 .../spring-boot-cli/src/main/scoop/springboot.json  |   0
 .../src/test/java/cli/command/CustomCommand.java    |   0
 .../test/java/cli/command/CustomCommandFactory.java |   0
 .../cli/command/CommandRunnerIntegrationTests.java  |   0
 .../boot/cli/command/CommandRunnerTests.java        |   0
 .../boot/cli/command/OptionParsingCommandTests.java |   0
 .../encodepassword/EncodePasswordCommandTests.java  |   0
 .../command/init/AbstractHttpClientMockTests.java   |   0
 .../boot/cli/command/init/InitCommandTests.java     |   0
 .../init/InitializrServiceMetadataTests.java        |   0
 .../cli/command/init/InitializrServiceTests.java    |   0
 .../command/init/ProjectGenerationRequestTests.java |   0
 .../ServiceCapabilitiesReportGeneratorTests.java    |   0
 ...EscapeAwareWhiteSpaceArgumentDelimiterTests.java |   0
 .../org/springframework/boot/cli/util/MockLog.java  |   0
 .../org.springframework.boot.cli.CommandFactory     |   0
 .../plugins/custom/custom/0.0.1/custom-0.0.1.jar    | Bin
 .../plugins/custom/custom/0.0.1/custom-0.0.1.pom    |   0
 .../src/test/resources/.m2/settings.xml             |   0
 .../src/test/resources/classloader-test-app.groovy  |   0
 .../src/test/resources/cli-tester/.m2/settings.xml  |   0
 .../src/test/resources/commands/closure.groovy      |   0
 .../src/test/resources/commands/command.groovy      |   0
 .../src/test/resources/commands/handler.groovy      |   0
 .../src/test/resources/commands/options.groovy      |   0
 .../dependency-customizer-tests/resource1.txt       |   0
 .../dependency-customizer-tests/resource2.txt       |   0
 .../src/test/resources/dir-sample/code/app.groovy   |   0
 .../spring-boot-cli/src/test/resources/foo.jar      | Bin
 .../spring-boot-cli/src/test/resources/foo.pom      |   0
 .../grab-samples/customDependencyManagement.groovy  |   0
 .../duplicateDependencyManagementBom.groovy         |   0
 .../src/test/resources/grab-samples/grab.groovy     |   0
 .../repository/test/child/1.0.0/child-1.0.0.pom     |   0
 .../repository/test/parent/1.0.0/parent-1.0.0.pom   |   0
 .../spring-boot-cli/src/test/resources/grab.groovy  |   0
 .../spring-boot-cli/src/test/resources/init.groovy  |   0
 .../active-profile-repositories/.m2/settings.xml    |   0
 .../resources/maven-settings/basic/.m2/settings.xml |   0
 .../encrypted/.m2/settings-security.xml             |   0
 .../maven-settings/encrypted/.m2/settings.xml       |   0
 .../property-interpolation/.m2/settings.xml         |   0
 .../resources/metadata/service-metadata-2.0.0.json  |   0
 .../resources/metadata/service-metadata-2.1.0.json  |   0
 .../resources/metadata/service-metadata-2.1.0.txt   |   0
 .../metadata/service-metadata-types-conflict.json   |   0
 .../test/resources/repro-samples/data-jpa.groovy    |   0
 .../resources/repro-samples/grab-ant-builder.groovy |   0
 .../src/test/resources/repro-samples/secure.groovy  |   0
 .../resource-matcher/one/alpha/nested/excluded      |   0
 .../resource-matcher/one/alpha/nested/fileA         |   0
 .../test/resources/resource-matcher/one/bravo/fileC |   0
 .../resource-matcher/one/bravo/nested/fileB         |   0
 .../src/test/resources/resource-matcher/one/fileD   |   0
 .../src/test/resources/resource-matcher/three       |   0
 .../src/test/resources/resource-matcher/two/.file   |   0
 .../test/resources/resource-matcher/two/bravo/fileE |   0
 .../src/test/resources/resource-matcher/two/fileF   |   0
 .../src/test/resources/run-command/quiet.groovy     |   0
 .../src/test/resources/schema-all.sql               |   0
 .../src/test/resources/scripts/closure.groovy       |   0
 .../src/test/resources/scripts/command.groovy       |   0
 .../src/test/resources/scripts/commands.groovy      |   0
 .../src/test/resources/scripts/handler.groovy       |   0
 .../src/test/resources/scripts/options.groovy       |   0
 .../src/test/resources/static/css/bootstrap.min.css |   0
 .../src/test/resources/templates/home.html          |   0
 .../src/test/resources/templates/test.txt           |   0
 136 files changed, 3 insertions(+), 3 deletions(-)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/build.gradle (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/CommandLineIT.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/Versions.java (93%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/intTest/resources/settings.xml (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/content/INSTALL.txt (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/content/LICENCE.txt (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/content/bin/spring.bat (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/content/legal/open_source_licenses.txt (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/content/shell-completion/bash/spring (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/content/shell-completion/zsh/_spring (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/executablecontent/bin/spring (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/homebrew/spring-boot.rb (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/AbstractCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/Command.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandException.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandFactory.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/HelpExample.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoArgumentsException.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoHelpCommandArgumentsException.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoSuchCommandException.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionParsingCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HelpCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/VersionCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/package-info.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/encodepassword/package-info.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/Dependency.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrServiceMetadata.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationResponse.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerator.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectType.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ReportableException.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/package-info.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHelp.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/package-info.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/package-info.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ClearCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/EscapeAwareWhiteSpaceArgumentDelimiter.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ExitCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ForkProcessCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/PromptCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/RunProcessCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellExitException.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/package-info.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/status/ExitStatus.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/status/package-info.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/package-info.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/Log.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/LogListener.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/package-info.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/main/scoop/springboot.json (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/cli/command/CustomCommand.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/cli/command/CustomCommandFactory.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/OptionParsingCommandTests.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommandTests.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/AbstractHttpClientMockTests.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceMetadataTests.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceTests.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGeneratorTests.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/shell/EscapeAwareWhiteSpaceArgumentDelimiterTests.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/java/org/springframework/boot/cli/util/MockLog.java (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/plugins/custom/META-INF/services/org.springframework.boot.cli.CommandFactory (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/plugins/custom/custom/0.0.1/custom-0.0.1.jar (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/plugins/custom/custom/0.0.1/custom-0.0.1.pom (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/.m2/settings.xml (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/classloader-test-app.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/cli-tester/.m2/settings.xml (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/commands/closure.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/commands/command.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/commands/handler.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/commands/options.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/dependency-customizer-tests/resource1.txt (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/dependency-customizer-tests/resource2.txt (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/dir-sample/code/app.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/foo.jar (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/foo.pom (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/grab-samples/customDependencyManagement.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/grab-samples/duplicateDependencyManagementBom.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/grab-samples/grab.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/grab-samples/repository/test/child/1.0.0/child-1.0.0.pom (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/grab-samples/repository/test/parent/1.0.0/parent-1.0.0.pom (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/grab.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/init.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/maven-settings/active-profile-repositories/.m2/settings.xml (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/maven-settings/basic/.m2/settings.xml (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/maven-settings/property-interpolation/.m2/settings.xml (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/metadata/service-metadata-2.0.0.json (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/metadata/service-metadata-2.1.0.json (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/metadata/service-metadata-2.1.0.txt (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/metadata/service-metadata-types-conflict.json (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/repro-samples/data-jpa.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/repro-samples/grab-ant-builder.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/repro-samples/secure.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/resource-matcher/one/fileD (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/resource-matcher/three (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/resource-matcher/two/.file (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/resource-matcher/two/fileF (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/run-command/quiet.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/schema-all.sql (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/scripts/closure.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/scripts/command.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/scripts/commands.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/scripts/handler.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/scripts/options.groovy (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/static/css/bootstrap.min.css (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/templates/home.html (100%)
 rename spring-boot-project/{ => spring-boot-tools}/spring-boot-cli/src/test/resources/templates/test.txt (100%)

diff --git a/settings.gradle b/settings.gradle
index 3a879909723..759a39d7d3a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -54,6 +54,7 @@ include "spring-boot-project:spring-boot-parent"
 include "spring-boot-project:spring-boot-tools:spring-boot-antlib"
 include "spring-boot-project:spring-boot-tools:spring-boot-autoconfigure-processor"
 include "spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"
+include "spring-boot-project:spring-boot-tools:spring-boot-cli"
 include "spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata"
 include "spring-boot-project:spring-boot-tools:spring-boot-configuration-processor"
 include "spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin"
@@ -68,7 +69,6 @@ include "spring-boot-project:spring-boot"
 include "spring-boot-project:spring-boot-autoconfigure"
 include "spring-boot-project:spring-boot-actuator"
 include "spring-boot-project:spring-boot-actuator-autoconfigure"
-include "spring-boot-project:spring-boot-cli"
 include "spring-boot-project:spring-boot-devtools"
 include "spring-boot-project:spring-boot-docs"
 include "spring-boot-project:spring-boot-test"
diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle
index ca2c4503b7c..b7d01a9f44f 100644
--- a/spring-boot-project/spring-boot-docs/build.gradle
+++ b/spring-boot-project/spring-boot-docs/build.gradle
@@ -66,7 +66,7 @@ dependencies {
 	implementation(project(path: ":spring-boot-project:spring-boot-actuator"))
 	implementation(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	implementation(project(path: ":spring-boot-project:spring-boot-autoconfigure"))
-	implementation(project(path: ":spring-boot-project:spring-boot-cli"))
+	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-cli"))
 	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
 	implementation(project(path: ":spring-boot-project:spring-boot-test"))
 	implementation(project(path: ":spring-boot-project:spring-boot-test-autoconfigure"))
diff --git a/spring-boot-project/spring-boot-cli/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle
similarity index 100%
rename from spring-boot-project/spring-boot-cli/build.gradle
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle
diff --git a/spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/CommandLineIT.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/CommandLineIT.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/CommandLineIT.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/CommandLineIT.java
diff --git a/spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java
diff --git a/spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/Versions.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/Versions.java
similarity index 93%
rename from spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/Versions.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/Versions.java
index 55669d72c30..c39cc1667ac 100644
--- a/spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/Versions.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/Versions.java
@@ -32,7 +32,7 @@ final class Versions {
 
 	static String getBootVersion() {
 		Properties gradleProperties = new Properties();
-		try (FileInputStream input = new FileInputStream("../../gradle.properties")) {
+		try (FileInputStream input = new FileInputStream("../../../gradle.properties")) {
 			gradleProperties.load(input);
 			return gradleProperties.getProperty("version");
 		}
diff --git a/spring-boot-project/spring-boot-cli/src/intTest/resources/settings.xml b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/intTest/resources/settings.xml
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/intTest/resources/settings.xml
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/intTest/resources/settings.xml
diff --git a/spring-boot-project/spring-boot-cli/src/main/content/INSTALL.txt b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/content/INSTALL.txt
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/content/INSTALL.txt
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/content/INSTALL.txt
diff --git a/spring-boot-project/spring-boot-cli/src/main/content/LICENCE.txt b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/content/LICENCE.txt
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/content/LICENCE.txt
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/content/LICENCE.txt
diff --git a/spring-boot-project/spring-boot-cli/src/main/content/bin/spring.bat b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/content/bin/spring.bat
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/content/bin/spring.bat
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/content/bin/spring.bat
diff --git a/spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/content/legal/open_source_licenses.txt
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/content/legal/open_source_licenses.txt
diff --git a/spring-boot-project/spring-boot-cli/src/main/content/shell-completion/bash/spring b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/content/shell-completion/bash/spring
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/content/shell-completion/bash/spring
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/content/shell-completion/bash/spring
diff --git a/spring-boot-project/spring-boot-cli/src/main/content/shell-completion/zsh/_spring b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/content/shell-completion/zsh/_spring
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/content/shell-completion/zsh/_spring
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/content/shell-completion/zsh/_spring
diff --git a/spring-boot-project/spring-boot-cli/src/main/executablecontent/bin/spring b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/executablecontent/bin/spring
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/executablecontent/bin/spring
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/executablecontent/bin/spring
diff --git a/spring-boot-project/spring-boot-cli/src/main/homebrew/spring-boot.rb b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/homebrew/spring-boot.rb
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/homebrew/spring-boot.rb
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/homebrew/spring-boot.rb
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/AbstractCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/AbstractCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/AbstractCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/AbstractCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/Command.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/Command.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/Command.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/Command.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandException.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandException.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandException.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandException.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandFactory.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandFactory.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandFactory.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/HelpExample.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/HelpExample.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/HelpExample.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/HelpExample.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoArgumentsException.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoArgumentsException.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoArgumentsException.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoArgumentsException.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoHelpCommandArgumentsException.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoHelpCommandArgumentsException.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoHelpCommandArgumentsException.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoHelpCommandArgumentsException.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoSuchCommandException.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoSuchCommandException.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoSuchCommandException.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoSuchCommandException.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionParsingCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionParsingCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionParsingCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionParsingCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HelpCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HelpCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HelpCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HelpCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/VersionCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/VersionCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/VersionCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/VersionCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/package-info.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/package-info.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/encodepassword/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/encodepassword/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/encodepassword/package-info.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/encodepassword/package-info.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/Dependency.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/Dependency.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/Dependency.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/Dependency.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrServiceMetadata.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrServiceMetadata.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrServiceMetadata.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrServiceMetadata.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationResponse.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationResponse.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationResponse.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationResponse.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerator.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerator.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerator.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerator.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectType.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectType.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectType.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectType.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ReportableException.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ReportableException.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ReportableException.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ReportableException.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/package-info.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/package-info.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHelp.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHelp.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHelp.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHelp.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/package-info.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/package-info.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/package-info.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/package-info.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ClearCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ClearCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ClearCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ClearCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/EscapeAwareWhiteSpaceArgumentDelimiter.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/EscapeAwareWhiteSpaceArgumentDelimiter.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/EscapeAwareWhiteSpaceArgumentDelimiter.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/EscapeAwareWhiteSpaceArgumentDelimiter.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ExitCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ExitCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ExitCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ExitCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ForkProcessCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ForkProcessCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ForkProcessCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ForkProcessCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/PromptCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/PromptCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/PromptCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/PromptCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/RunProcessCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/RunProcessCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/RunProcessCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/RunProcessCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellExitException.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellExitException.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellExitException.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellExitException.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/package-info.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/package-info.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/status/ExitStatus.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/status/ExitStatus.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/status/ExitStatus.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/status/ExitStatus.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/status/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/status/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/status/package-info.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/status/package-info.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/package-info.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/package-info.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/Log.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/Log.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/Log.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/Log.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/LogListener.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/LogListener.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/LogListener.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/LogListener.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/package-info.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/package-info.java
diff --git a/spring-boot-project/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory
diff --git a/spring-boot-project/spring-boot-cli/src/main/scoop/springboot.json b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/scoop/springboot.json
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/main/scoop/springboot.json
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/scoop/springboot.json
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/cli/command/CustomCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/cli/command/CustomCommand.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/cli/command/CustomCommand.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/cli/command/CustomCommand.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/cli/command/CustomCommandFactory.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/cli/command/CustomCommandFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/cli/command/CustomCommandFactory.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/cli/command/CustomCommandFactory.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/OptionParsingCommandTests.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/OptionParsingCommandTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/OptionParsingCommandTests.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/OptionParsingCommandTests.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommandTests.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommandTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommandTests.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommandTests.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/AbstractHttpClientMockTests.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/AbstractHttpClientMockTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/AbstractHttpClientMockTests.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/AbstractHttpClientMockTests.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceMetadataTests.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceMetadataTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceMetadataTests.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceMetadataTests.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceTests.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceTests.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceTests.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGeneratorTests.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGeneratorTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGeneratorTests.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGeneratorTests.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/shell/EscapeAwareWhiteSpaceArgumentDelimiterTests.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/shell/EscapeAwareWhiteSpaceArgumentDelimiterTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/shell/EscapeAwareWhiteSpaceArgumentDelimiterTests.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/shell/EscapeAwareWhiteSpaceArgumentDelimiterTests.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/util/MockLog.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/util/MockLog.java
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/util/MockLog.java
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/util/MockLog.java
diff --git a/spring-boot-project/spring-boot-cli/src/test/plugins/custom/META-INF/services/org.springframework.boot.cli.CommandFactory b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/plugins/custom/META-INF/services/org.springframework.boot.cli.CommandFactory
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/plugins/custom/META-INF/services/org.springframework.boot.cli.CommandFactory
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/plugins/custom/META-INF/services/org.springframework.boot.cli.CommandFactory
diff --git a/spring-boot-project/spring-boot-cli/src/test/plugins/custom/custom/0.0.1/custom-0.0.1.jar b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/plugins/custom/custom/0.0.1/custom-0.0.1.jar
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/plugins/custom/custom/0.0.1/custom-0.0.1.jar
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/plugins/custom/custom/0.0.1/custom-0.0.1.jar
diff --git a/spring-boot-project/spring-boot-cli/src/test/plugins/custom/custom/0.0.1/custom-0.0.1.pom b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/plugins/custom/custom/0.0.1/custom-0.0.1.pom
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/plugins/custom/custom/0.0.1/custom-0.0.1.pom
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/plugins/custom/custom/0.0.1/custom-0.0.1.pom
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/.m2/settings.xml b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/.m2/settings.xml
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/.m2/settings.xml
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/.m2/settings.xml
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/classloader-test-app.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/classloader-test-app.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/classloader-test-app.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/classloader-test-app.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/cli-tester/.m2/settings.xml b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/cli-tester/.m2/settings.xml
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/cli-tester/.m2/settings.xml
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/cli-tester/.m2/settings.xml
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/commands/closure.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/commands/closure.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/commands/closure.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/commands/closure.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/commands/command.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/commands/command.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/commands/command.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/commands/command.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/commands/handler.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/commands/handler.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/commands/handler.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/commands/handler.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/commands/options.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/commands/options.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/commands/options.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/commands/options.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/dependency-customizer-tests/resource1.txt b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/dependency-customizer-tests/resource1.txt
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/dependency-customizer-tests/resource1.txt
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/dependency-customizer-tests/resource1.txt
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/dependency-customizer-tests/resource2.txt b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/dependency-customizer-tests/resource2.txt
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/dependency-customizer-tests/resource2.txt
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/dependency-customizer-tests/resource2.txt
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/dir-sample/code/app.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/dir-sample/code/app.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/dir-sample/code/app.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/dir-sample/code/app.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/foo.jar b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/foo.jar
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/foo.jar
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/foo.jar
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/foo.pom b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/foo.pom
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/foo.pom
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/foo.pom
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/customDependencyManagement.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/grab-samples/customDependencyManagement.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/customDependencyManagement.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/grab-samples/customDependencyManagement.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/duplicateDependencyManagementBom.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/grab-samples/duplicateDependencyManagementBom.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/duplicateDependencyManagementBom.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/grab-samples/duplicateDependencyManagementBom.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/grab.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/grab-samples/grab.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/grab.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/grab-samples/grab.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/repository/test/child/1.0.0/child-1.0.0.pom b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/grab-samples/repository/test/child/1.0.0/child-1.0.0.pom
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/repository/test/child/1.0.0/child-1.0.0.pom
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/grab-samples/repository/test/child/1.0.0/child-1.0.0.pom
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/repository/test/parent/1.0.0/parent-1.0.0.pom b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/grab-samples/repository/test/parent/1.0.0/parent-1.0.0.pom
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/repository/test/parent/1.0.0/parent-1.0.0.pom
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/grab-samples/repository/test/parent/1.0.0/parent-1.0.0.pom
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/grab.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/grab.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/grab.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/grab.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/init.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/init.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/init.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/init.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/active-profile-repositories/.m2/settings.xml b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/maven-settings/active-profile-repositories/.m2/settings.xml
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/active-profile-repositories/.m2/settings.xml
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/maven-settings/active-profile-repositories/.m2/settings.xml
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/basic/.m2/settings.xml b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/maven-settings/basic/.m2/settings.xml
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/basic/.m2/settings.xml
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/maven-settings/basic/.m2/settings.xml
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/property-interpolation/.m2/settings.xml b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/maven-settings/property-interpolation/.m2/settings.xml
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/property-interpolation/.m2/settings.xml
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/maven-settings/property-interpolation/.m2/settings.xml
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/metadata/service-metadata-2.0.0.json b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/metadata/service-metadata-2.0.0.json
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/metadata/service-metadata-2.0.0.json
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/metadata/service-metadata-2.0.0.json
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/metadata/service-metadata-2.1.0.json b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/metadata/service-metadata-2.1.0.json
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/metadata/service-metadata-2.1.0.json
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/metadata/service-metadata-2.1.0.json
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/metadata/service-metadata-2.1.0.txt b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/metadata/service-metadata-2.1.0.txt
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/metadata/service-metadata-2.1.0.txt
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/metadata/service-metadata-2.1.0.txt
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/metadata/service-metadata-types-conflict.json b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/metadata/service-metadata-types-conflict.json
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/metadata/service-metadata-types-conflict.json
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/metadata/service-metadata-types-conflict.json
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/repro-samples/data-jpa.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/repro-samples/data-jpa.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/repro-samples/data-jpa.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/repro-samples/data-jpa.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/repro-samples/grab-ant-builder.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/repro-samples/grab-ant-builder.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/repro-samples/grab-ant-builder.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/repro-samples/grab-ant-builder.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/repro-samples/secure.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/repro-samples/secure.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/repro-samples/secure.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/repro-samples/secure.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/fileD b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/one/fileD
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/fileD
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/one/fileD
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/three b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/three
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/three
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/three
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/two/.file
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/two/.file
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/fileF b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/two/fileF
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/fileF
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/resource-matcher/two/fileF
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/run-command/quiet.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/run-command/quiet.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/run-command/quiet.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/run-command/quiet.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/schema-all.sql b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/schema-all.sql
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/schema-all.sql
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/schema-all.sql
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/scripts/closure.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/scripts/closure.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/scripts/closure.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/scripts/closure.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/scripts/command.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/scripts/command.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/scripts/command.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/scripts/command.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/scripts/commands.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/scripts/commands.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/scripts/commands.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/scripts/commands.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/scripts/handler.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/scripts/handler.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/scripts/handler.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/scripts/handler.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/scripts/options.groovy b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/scripts/options.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/scripts/options.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/scripts/options.groovy
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/static/css/bootstrap.min.css b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/static/css/bootstrap.min.css
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/static/css/bootstrap.min.css
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/static/css/bootstrap.min.css
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/templates/home.html
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/templates/home.html
diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/templates/test.txt b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/templates/test.txt
similarity index 100%
rename from spring-boot-project/spring-boot-cli/src/test/resources/templates/test.txt
rename to spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/templates/test.txt