diff --git a/settings.gradle b/settings.gradle
index 8fad5ad77a..3a87990972 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -62,6 +62,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-jarmode-layertools"
 include "spring-boot-project:spring-boot-tools:spring-boot-loader"
 include "spring-boot-project:spring-boot-tools:spring-boot-loader-tools"
 include "spring-boot-project:spring-boot-tools:spring-boot-maven-plugin"
+include "spring-boot-project:spring-boot-tools:spring-boot-properties-migrator"
 include "spring-boot-project:spring-boot-tools:spring-boot-test-support"
 include "spring-boot-project:spring-boot"
 include "spring-boot-project:spring-boot-autoconfigure"
@@ -70,7 +71,6 @@ 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-properties-migrator"
 include "spring-boot-project:spring-boot-test"
 include "spring-boot-project:spring-boot-test-autoconfigure"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-configuration-processor-tests"
diff --git a/spring-boot-project/spring-boot-properties-migrator/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/build.gradle
similarity index 59%
rename from spring-boot-project/spring-boot-properties-migrator/build.gradle
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/build.gradle
index cd9da1f879..c722881e9a 100644
--- a/spring-boot-project/spring-boot-properties-migrator/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id "java-library"
+	id "java"
 	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 }
@@ -7,11 +7,16 @@ plugins {
 description = "Spring Boot Properties Migrator"
 
 dependencies {
-	api(project(":spring-boot-project:spring-boot"))
-	api(project(":spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata"))
+	implementation(project(":spring-boot-project:spring-boot"))
+	implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("org.springframework:spring-test")
+}
+
+tasks.named("javadoc").configure {
+	// No public or protected classes
+	enabled = false
 }
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListener.java b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListener.java
similarity index 94%
rename from spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListener.java
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListener.java
index aeccd3104d..a3f0883b46 100644
--- a/spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListener.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListener.java
@@ -36,12 +36,11 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 /**
  * An {@link ApplicationListener} that inspects the {@link ConfigurableEnvironment
  * environment} for configuration keys that need to be migrated. Automatically renames the
- * keys that have a matching replacement and log a report of what was discovered.
+ * keys that have a matching replacement and logs a report of what was discovered.
  *
  * @author Stephane Nicoll
- * @since 2.0.0
  */
-public class PropertiesMigrationListener implements ApplicationListener<SpringApplicationEvent> {
+class PropertiesMigrationListener implements ApplicationListener<SpringApplicationEvent> {
 
 	private static final Log logger = LogFactory.getLog(PropertiesMigrationListener.class);
 
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReport.java b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReport.java
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReport.java
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReport.java
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporter.java b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporter.java
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporter.java
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporter.java
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertyMigration.java b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertyMigration.java
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertyMigration.java
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertyMigration.java
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/package-info.java
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/package-info.java
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/main/resources/META-INF/spring.factories
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/resources/META-INF/spring.factories
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/test/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListenerTests.java b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListenerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/test/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListenerTests.java
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListenerTests.java
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/test/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporterTests.java b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporterTests.java
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/test/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporterTests.java
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporterTests.java
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/test/resources/config/config-error-invalid-replacement.properties b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/config/config-error-invalid-replacement.properties
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/test/resources/config/config-error-invalid-replacement.properties
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/config/config-error-invalid-replacement.properties
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/test/resources/config/config-error-no-compatible-type.properties b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/config/config-error-no-compatible-type.properties
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/test/resources/config/config-error-no-compatible-type.properties
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/config/config-error-no-compatible-type.properties
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/test/resources/config/config-error-no-replacement.properties b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/config/config-error-no-replacement.properties
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/test/resources/config/config-error-no-replacement.properties
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/config/config-error-no-replacement.properties
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/test/resources/config/config-error.properties b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/config/config-error.properties
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/test/resources/config/config-error.properties
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/config/config-error.properties
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/test/resources/config/config-warnings.properties b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/config/config-warnings.properties
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/test/resources/config/config-warnings.properties
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/config/config-warnings.properties
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/test/resources/metadata/sample-metadata-invalid-replacement.json b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/metadata/sample-metadata-invalid-replacement.json
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/test/resources/metadata/sample-metadata-invalid-replacement.json
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/metadata/sample-metadata-invalid-replacement.json
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/test/resources/metadata/sample-metadata.json b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/metadata/sample-metadata.json
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/test/resources/metadata/sample-metadata.json
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/metadata/sample-metadata.json
diff --git a/spring-boot-project/spring-boot-properties-migrator/src/test/resources/metadata/type-conversion-metadata.json b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/metadata/type-conversion-metadata.json
similarity index 100%
rename from spring-boot-project/spring-boot-properties-migrator/src/test/resources/metadata/type-conversion-metadata.json
rename to spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/metadata/type-conversion-metadata.json