diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPlugin.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java
similarity index 95%
rename from spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPlugin.java
rename to spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java
index c1d5911ee63..775ae08a1df 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPlugin.java
+++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.gradle;
+package org.springframework.boot.gradle.plugin;
 
 import org.gradle.api.Action;
 import org.gradle.api.Plugin;
@@ -23,6 +23,7 @@ import org.gradle.api.Task;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.tasks.compile.JavaCompile;
 
+import org.springframework.boot.gradle.SpringBootPluginExtension;
 import org.springframework.boot.gradle.agent.AgentPluginFeatures;
 import org.springframework.boot.gradle.dependencymanagement.DependencyManagementPluginFeatures;
 import org.springframework.boot.gradle.repackage.RepackagePluginFeatures;
diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/spring-boot.properties b/spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/spring-boot.properties
index 68069d5e992..730938f5c3b 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/spring-boot.properties
+++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/spring-boot.properties
@@ -1 +1 @@
-implementation-class=org.springframework.boot.gradle.SpringBootPlugin
+implementation-class=org.springframework.boot.gradle.plugin.SpringBootPlugin