diff --git a/pom.xml b/pom.xml
index 48de4dbd9cf..dcfb6b3fc0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,10 +40,7 @@
 	<modules>
 		<module>spring-boot</module>
 		<module>spring-boot-autoconfigure</module>
-		<module>spring-boot-loader</module>
-		<module>spring-boot-loader-tools</module>
-		<module>spring-boot-maven-plugin</module>
-		<module>spring-boot-gradle-plugin</module>
+		<module>spring-boot-tools</module>
 		<module>spring-boot-actuator</module>
 		<module>spring-boot-starters</module>
 		<module>spring-boot-cli</module>
diff --git a/spring-boot-tools/pom.xml b/spring-boot-tools/pom.xml
new file mode 100644
index 00000000000..92e17909f7c
--- /dev/null
+++ b/spring-boot-tools/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-parent</artifactId>
+		<version>0.5.0.M1</version>
+	</parent>
+	<artifactId>spring-boot-tools</artifactId>
+	<packaging>pom</packaging>
+	<properties>
+		<main.basedir>${basedir}/..</main.basedir>
+	</properties>
+	<modules>
+		<module>spring-boot-loader</module>
+		<module>spring-boot-loader-tools</module>
+		<module>spring-boot-maven-plugin</module>
+		<module>spring-boot-gradle-plugin</module>
+	</modules>
+</project>
diff --git a/spring-boot-gradle-plugin/README.md b/spring-boot-tools/spring-boot-gradle-plugin/README.md
similarity index 100%
rename from spring-boot-gradle-plugin/README.md
rename to spring-boot-tools/spring-boot-gradle-plugin/README.md
diff --git a/spring-boot-gradle-plugin/pom.xml b/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
similarity index 97%
rename from spring-boot-gradle-plugin/pom.xml
rename to spring-boot-tools/spring-boot-gradle-plugin/pom.xml
index 86940bb05f7..3c60127dc9b 100644
--- a/spring-boot-gradle-plugin/pom.xml
+++ b/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<artifactId>spring-boot-gradle-plugin</artifactId>
 	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
+		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPlugin.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPlugin.java
similarity index 100%
rename from spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPlugin.java
rename to spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPlugin.java
diff --git a/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPluginExtension.groovy b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPluginExtension.groovy
similarity index 100%
rename from spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPluginExtension.groovy
rename to spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/SpringBootPluginExtension.groovy
diff --git a/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/ProjectLibraries.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/ProjectLibraries.java
similarity index 100%
rename from spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/ProjectLibraries.java
rename to spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/ProjectLibraries.java
diff --git a/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/Repackage.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/Repackage.java
similarity index 100%
rename from spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/Repackage.java
rename to spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/task/Repackage.java
diff --git a/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
similarity index 100%
rename from spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/spring-boot.properties
rename to spring-boot-tools/spring-boot-gradle-plugin/src/main/resources/META-INF/gradle-plugins/spring-boot.properties
diff --git a/spring-boot-loader-tools/README.md b/spring-boot-tools/spring-boot-loader-tools/README.md
similarity index 100%
rename from spring-boot-loader-tools/README.md
rename to spring-boot-tools/spring-boot-loader-tools/README.md
diff --git a/spring-boot-loader-tools/pom.xml b/spring-boot-tools/spring-boot-loader-tools/pom.xml
similarity index 98%
rename from spring-boot-loader-tools/pom.xml
rename to spring-boot-tools/spring-boot-loader-tools/pom.xml
index 3cf967d85be..3e667021d01 100644
--- a/spring-boot-loader-tools/pom.xml
+++ b/spring-boot-tools/spring-boot-loader-tools/pom.xml
@@ -10,7 +10,7 @@
 	<artifactId>spring-boot-loader-tools</artifactId>
 	<packaging>jar</packaging>
 	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
+		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
similarity index 100%
rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
rename to spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java
similarity index 100%
rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java
rename to spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java
diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java
similarity index 100%
rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java
rename to spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java
diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Libraries.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Libraries.java
similarity index 100%
rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Libraries.java
rename to spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Libraries.java
diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryCallback.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryCallback.java
similarity index 100%
rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryCallback.java
rename to spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryCallback.java
diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryScope.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryScope.java
similarity index 100%
rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryScope.java
rename to spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryScope.java
diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java
similarity index 100%
rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java
rename to spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java
diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
similarity index 100%
rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
rename to spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
diff --git a/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java
similarity index 100%
rename from spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java
rename to spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java
diff --git a/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java
similarity index 100%
rename from spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java
rename to spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java
diff --git a/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java
similarity index 100%
rename from spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java
rename to spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java
diff --git a/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/TestJarFile.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/TestJarFile.java
similarity index 100%
rename from spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/TestJarFile.java
rename to spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/TestJarFile.java
diff --git a/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithMainMethod.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithMainMethod.java
similarity index 100%
rename from spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithMainMethod.java
rename to spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithMainMethod.java
diff --git a/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithoutMainMethod.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithoutMainMethod.java
similarity index 100%
rename from spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithoutMainMethod.java
rename to spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithoutMainMethod.java
diff --git a/spring-boot-loader-tools/src/test/resources/META-INF/MANIFEST.MF b/spring-boot-tools/spring-boot-loader-tools/src/test/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from spring-boot-loader-tools/src/test/resources/META-INF/MANIFEST.MF
rename to spring-boot-tools/spring-boot-loader-tools/src/test/resources/META-INF/MANIFEST.MF
diff --git a/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.properties b/spring-boot-tools/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.properties
similarity index 100%
rename from spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.properties
rename to spring-boot-tools/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.properties
diff --git a/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml b/spring-boot-tools/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml
similarity index 100%
rename from spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml
rename to spring-boot-tools/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml
diff --git a/spring-boot-loader-tools/src/test/resources/org/springframework/boot/sample/tomcat/SampleTomcatApplication.class b/spring-boot-tools/spring-boot-loader-tools/src/test/resources/org/springframework/boot/sample/tomcat/SampleTomcatApplication.class
similarity index 100%
rename from spring-boot-loader-tools/src/test/resources/org/springframework/boot/sample/tomcat/SampleTomcatApplication.class
rename to spring-boot-tools/spring-boot-loader-tools/src/test/resources/org/springframework/boot/sample/tomcat/SampleTomcatApplication.class
diff --git a/spring-boot-loader-tools/src/test/resources/org/springframework/boot/sample/tomcat/service/HelloWorldService.class b/spring-boot-tools/spring-boot-loader-tools/src/test/resources/org/springframework/boot/sample/tomcat/service/HelloWorldService.class
similarity index 100%
rename from spring-boot-loader-tools/src/test/resources/org/springframework/boot/sample/tomcat/service/HelloWorldService.class
rename to spring-boot-tools/spring-boot-loader-tools/src/test/resources/org/springframework/boot/sample/tomcat/service/HelloWorldService.class
diff --git a/spring-boot-loader-tools/src/test/resources/org/springframework/boot/sample/tomcat/web/SampleController.class b/spring-boot-tools/spring-boot-loader-tools/src/test/resources/org/springframework/boot/sample/tomcat/web/SampleController.class
similarity index 100%
rename from spring-boot-loader-tools/src/test/resources/org/springframework/boot/sample/tomcat/web/SampleController.class
rename to spring-boot-tools/spring-boot-loader-tools/src/test/resources/org/springframework/boot/sample/tomcat/web/SampleController.class
diff --git a/spring-boot-loader-tools/src/test/resources/original.jar b/spring-boot-tools/spring-boot-loader-tools/src/test/resources/original.jar
similarity index 100%
rename from spring-boot-loader-tools/src/test/resources/original.jar
rename to spring-boot-tools/spring-boot-loader-tools/src/test/resources/original.jar
diff --git a/spring-boot-loader-tools/src/test/resources/original2.jar b/spring-boot-tools/spring-boot-loader-tools/src/test/resources/original2.jar
similarity index 100%
rename from spring-boot-loader-tools/src/test/resources/original2.jar
rename to spring-boot-tools/spring-boot-loader-tools/src/test/resources/original2.jar
diff --git a/spring-boot-loader-tools/src/test/resources/public/test.css b/spring-boot-tools/spring-boot-loader-tools/src/test/resources/public/test.css
similarity index 100%
rename from spring-boot-loader-tools/src/test/resources/public/test.css
rename to spring-boot-tools/spring-boot-loader-tools/src/test/resources/public/test.css
diff --git a/spring-boot-loader/README.md b/spring-boot-tools/spring-boot-loader/README.md
similarity index 100%
rename from spring-boot-loader/README.md
rename to spring-boot-tools/spring-boot-loader/README.md
diff --git a/spring-boot-loader/pom.xml b/spring-boot-tools/spring-boot-loader/pom.xml
similarity index 96%
rename from spring-boot-loader/pom.xml
rename to spring-boot-tools/spring-boot-loader/pom.xml
index 9f67b2ebf72..4f506fa54f0 100644
--- a/spring-boot-loader/pom.xml
+++ b/spring-boot-tools/spring-boot-loader/pom.xml
@@ -10,7 +10,7 @@
 	<artifactId>spring-boot-loader</artifactId>
 	<packaging>jar</packaging>
 	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
+		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<build>
 		<plugins>
diff --git a/spring-boot-loader/src/it/executable-jar/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml
similarity index 100%
rename from spring-boot-loader/src/it/executable-jar/pom.xml
rename to spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml
diff --git a/spring-boot-loader/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml
similarity index 100%
rename from spring-boot-loader/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml
rename to spring-boot-tools/spring-boot-loader/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml
diff --git a/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java b/spring-boot-tools/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java
similarity index 100%
rename from spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java
rename to spring-boot-tools/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java
diff --git a/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java b/spring-boot-tools/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java
similarity index 100%
rename from spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java
rename to spring-boot-tools/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java
diff --git a/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java b/spring-boot-tools/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java
similarity index 100%
rename from spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java
rename to spring-boot-tools/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java
diff --git a/spring-boot-loader/src/it/executable-war/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml
similarity index 100%
rename from spring-boot-loader/src/it/executable-war/pom.xml
rename to spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml
diff --git a/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java b/spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java
similarity index 100%
rename from spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java
rename to spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java
diff --git a/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java b/spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java
similarity index 100%
rename from spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java
rename to spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java
diff --git a/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java b/spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java
similarity index 100%
rename from spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java
rename to spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java
diff --git a/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java b/spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java
similarity index 100%
rename from spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java
rename to spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java
diff --git a/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java b/spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java
similarity index 100%
rename from spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java
rename to spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java
diff --git a/spring-boot-loader/src/it/settings.xml b/spring-boot-tools/spring-boot-loader/src/it/settings.xml
similarity index 100%
rename from spring-boot-loader/src/it/settings.xml
rename to spring-boot-tools/spring-boot-loader/src/it/settings.xml
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/Archive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Archive.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/Archive.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Archive.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExplodedArchive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExplodedArchive.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/ExplodedArchive.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExplodedArchive.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarFileArchive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarFileArchive.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/JarFileArchive.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarFileArchive.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarLauncher.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/JarLauncher.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarLauncher.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/MainMethodRunner.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/MainMethodRunner.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/MainMethodRunner.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/MainMethodRunner.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/WarLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/WarLauncher.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/WarLauncher.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/WarLauncher.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessData.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessData.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessData.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessData.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/package-info.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/package-info.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/data/package-info.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/package-info.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipEntry.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipEntry.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipEntry.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipEntry.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStream.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStream.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStream.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStream.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessJarFile.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessJarFile.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessJarFile.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessJarFile.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/package-info.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/package-info.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/package-info.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/package-info.java
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/loader/package-info.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/package-info.java
similarity index 100%
rename from spring-boot-loader/src/main/java/org/springframework/boot/loader/package-info.java
rename to spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/package-info.java
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/loader/ByteArrayStartsWith.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/ByteArrayStartsWith.java
similarity index 100%
rename from spring-boot-loader/src/test/java/org/springframework/boot/loader/ByteArrayStartsWith.java
rename to spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/ByteArrayStartsWith.java
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/loader/ExplodedArchiveTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/ExplodedArchiveTests.java
similarity index 100%
rename from spring-boot-loader/src/test/java/org/springframework/boot/loader/ExplodedArchiveTests.java
rename to spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/ExplodedArchiveTests.java
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/loader/JarFileArchiveTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/JarFileArchiveTests.java
similarity index 100%
rename from spring-boot-loader/src/test/java/org/springframework/boot/loader/JarFileArchiveTests.java
rename to spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/JarFileArchiveTests.java
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/loader/TestJarCreator.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/TestJarCreator.java
similarity index 100%
rename from spring-boot-loader/src/test/java/org/springframework/boot/loader/TestJarCreator.java
rename to spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/TestJarCreator.java
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java
similarity index 100%
rename from spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java
rename to spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStreamTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStreamTests.java
similarity index 100%
rename from spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStreamTests.java
rename to spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStreamTests.java
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessJarFileTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessJarFileTests.java
similarity index 100%
rename from spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessJarFileTests.java
rename to spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessJarFileTests.java
diff --git a/spring-boot-maven-plugin/README.md b/spring-boot-tools/spring-boot-maven-plugin/README.md
similarity index 100%
rename from spring-boot-maven-plugin/README.md
rename to spring-boot-tools/spring-boot-maven-plugin/README.md
diff --git a/spring-boot-maven-plugin/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/pom.xml
similarity index 98%
rename from spring-boot-maven-plugin/pom.xml
rename to spring-boot-tools/spring-boot-maven-plugin/pom.xml
index ee4af432506..7689ba5c2c7 100644
--- a/spring-boot-maven-plugin/pom.xml
+++ b/spring-boot-tools/spring-boot-maven-plugin/pom.xml
@@ -10,7 +10,7 @@
 	<artifactId>spring-boot-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
 	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
+		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
diff --git a/spring-boot-maven-plugin/src/it/jar/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml
similarity index 100%
rename from spring-boot-maven-plugin/src/it/jar/pom.xml
rename to spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml
diff --git a/spring-boot-maven-plugin/src/it/jar/src/main/java/org/test/SampleApplication.java b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/src/main/java/org/test/SampleApplication.java
similarity index 100%
rename from spring-boot-maven-plugin/src/it/jar/src/main/java/org/test/SampleApplication.java
rename to spring-boot-tools/spring-boot-maven-plugin/src/it/jar/src/main/java/org/test/SampleApplication.java
diff --git a/spring-boot-maven-plugin/src/it/jar/verify.groovy b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/verify.groovy
similarity index 100%
rename from spring-boot-maven-plugin/src/it/jar/verify.groovy
rename to spring-boot-tools/spring-boot-maven-plugin/src/it/jar/verify.groovy
diff --git a/spring-boot-maven-plugin/src/it/run/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/run/pom.xml
similarity index 100%
rename from spring-boot-maven-plugin/src/it/run/pom.xml
rename to spring-boot-tools/spring-boot-maven-plugin/src/it/run/pom.xml
diff --git a/spring-boot-maven-plugin/src/it/run/src/main/java/org/test/SampleApplication.java b/spring-boot-tools/spring-boot-maven-plugin/src/it/run/src/main/java/org/test/SampleApplication.java
similarity index 100%
rename from spring-boot-maven-plugin/src/it/run/src/main/java/org/test/SampleApplication.java
rename to spring-boot-tools/spring-boot-maven-plugin/src/it/run/src/main/java/org/test/SampleApplication.java
diff --git a/spring-boot-maven-plugin/src/it/run/verify.groovy b/spring-boot-tools/spring-boot-maven-plugin/src/it/run/verify.groovy
similarity index 100%
rename from spring-boot-maven-plugin/src/it/run/verify.groovy
rename to spring-boot-tools/spring-boot-maven-plugin/src/it/run/verify.groovy
diff --git a/spring-boot-maven-plugin/src/it/settings.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/settings.xml
similarity index 100%
rename from spring-boot-maven-plugin/src/it/settings.xml
rename to spring-boot-tools/spring-boot-maven-plugin/src/it/settings.xml
diff --git a/spring-boot-maven-plugin/src/it/war/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml
similarity index 100%
rename from spring-boot-maven-plugin/src/it/war/pom.xml
rename to spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml
diff --git a/spring-boot-maven-plugin/src/it/war/src/main/java/org/test/SampleApplication.java b/spring-boot-tools/spring-boot-maven-plugin/src/it/war/src/main/java/org/test/SampleApplication.java
similarity index 100%
rename from spring-boot-maven-plugin/src/it/war/src/main/java/org/test/SampleApplication.java
rename to spring-boot-tools/spring-boot-maven-plugin/src/it/war/src/main/java/org/test/SampleApplication.java
diff --git a/spring-boot-maven-plugin/src/it/war/src/main/webapp/index.html b/spring-boot-tools/spring-boot-maven-plugin/src/it/war/src/main/webapp/index.html
similarity index 100%
rename from spring-boot-maven-plugin/src/it/war/src/main/webapp/index.html
rename to spring-boot-tools/spring-boot-maven-plugin/src/it/war/src/main/webapp/index.html
diff --git a/spring-boot-maven-plugin/src/it/war/verify.groovy b/spring-boot-tools/spring-boot-maven-plugin/src/it/war/verify.groovy
similarity index 100%
rename from spring-boot-maven-plugin/src/it/war/verify.groovy
rename to spring-boot-tools/spring-boot-maven-plugin/src/it/war/verify.groovy
diff --git a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java
similarity index 100%
rename from spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java
rename to spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java
diff --git a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PropertiesMergingResourceTransformer.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PropertiesMergingResourceTransformer.java
similarity index 100%
rename from spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PropertiesMergingResourceTransformer.java
rename to spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PropertiesMergingResourceTransformer.java
diff --git a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
similarity index 100%
rename from spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
rename to spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
diff --git a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java
similarity index 100%
rename from spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java
rename to spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java
diff --git a/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/PropertiesMergingResourceTransformerTests.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/PropertiesMergingResourceTransformerTests.java
similarity index 100%
rename from spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/PropertiesMergingResourceTransformerTests.java
rename to spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/PropertiesMergingResourceTransformerTests.java
diff --git a/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java
similarity index 100%
rename from spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java
rename to spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java
diff --git a/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithMainMethod.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithMainMethod.java
similarity index 100%
rename from spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithMainMethod.java
rename to spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithMainMethod.java
diff --git a/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithoutMainMethod.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithoutMainMethod.java
similarity index 100%
rename from spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithoutMainMethod.java
rename to spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithoutMainMethod.java