diff --git a/pom.xml b/pom.xml
index e9fae3b8a20..fd23926d071 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	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>
 	<groupId>org.springframework.boot</groupId>
-	<artifactId>spring-boot</artifactId>
+	<artifactId>spring-boot-parent</artifactId>
 	<version>0.5.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<prerequisites>
@@ -18,11 +18,11 @@
 		<spring.security.version>3.2.0.M2</spring.security.version>
 		<spring.integration.version>2.2.4.RELEASE</spring.integration.version>
 		<spring.batch.version>2.2.0.RELEASE</spring.batch.version>
-        <groovy.version>2.1.6</groovy.version>
+		<groovy.version>2.1.6</groovy.version>
 		<tomcat.version>7.0.42</tomcat.version>
 		<jetty.version>8.1.9.v20130131</jetty.version>
 		<aspectj.version>1.7.3</aspectj.version>
-        <reactor.version>1.0.0.M1</reactor.version>
+		<reactor.version>1.0.0.M1</reactor.version>
 	</properties>
 	<scm>
 		<url>http://github.com/SpringSource/spring-boot</url>
@@ -37,14 +37,14 @@
 		</developer>
 	</developers>
 	<modules>
-		<module>spring-boot-strap</module>
-		<module>spring-boot-config</module>
-		<module>spring-boot-ops</module>
-		<module>spring-boot-load</module>
-		<module>spring-boot-maven-plugin</module>
-		<module>spring-boot-ups</module>
+		<module>spring-boot</module>
+		<module>spring-boot-autoconfigure</module>
 		<module>spring-boot-cli</module>
 		<module>spring-boot-integration-tests</module>
+		<module>spring-boot-loader</module>
+		<module>spring-boot-maven-plugin</module>
+		<module>spring-boot-ops</module>
+		<module>spring-boot-ups</module>
 	</modules>
 	<build>
 		<pluginManagement>
@@ -203,9 +203,9 @@
 					<excludes>
 						<exclude>**/Abstract*.java</exclude>
 					</excludes>
-                    <systemPropertyVariables>
-                      <java.security.egd>file:/dev/./urandom</java.security.egd>
-                    </systemPropertyVariables>
+					<systemPropertyVariables>
+						<java.security.egd>file:/dev/./urandom</java.security.egd>
+					</systemPropertyVariables>
 					<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
 				</configuration>
 			</plugin>
@@ -273,8 +273,8 @@
 				<version>4.5</version>
 			</dependency>
 			<dependency>
-                <groupId>nz.net.ultraq.thymeleaf</groupId>
-                <artifactId>thymeleaf-layout-dialect</artifactId>
+				<groupId>nz.net.ultraq.thymeleaf</groupId>
+				<artifactId>thymeleaf-layout-dialect</artifactId>
 				<version>1.1.1</version>
 			</dependency>
 			<dependency>
@@ -433,11 +433,11 @@
 				<artifactId>hsqldb</artifactId>
 				<version>2.2.9</version>
 			</dependency>
-            <dependency>
-              <groupId>org.projectreactor</groupId>
-              <artifactId>reactor-spring</artifactId>
-              <version>${reactor.version}</version>
-            </dependency>
+			<dependency>
+				<groupId>org.projectreactor</groupId>
+				<artifactId>reactor-spring</artifactId>
+				<version>${reactor.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>
@@ -679,7 +679,7 @@
 	<profiles>
 		<profile>
 			<!-- FIXME deactivate before release -->
-			<id>bootstrap</id>
+			<id>development</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
diff --git a/spring-boot-config/README.md b/spring-boot-autoconfigure/README.md
similarity index 100%
rename from spring-boot-config/README.md
rename to spring-boot-autoconfigure/README.md
diff --git a/spring-boot-config/pom.xml b/spring-boot-autoconfigure/pom.xml
similarity index 96%
rename from spring-boot-config/pom.xml
rename to spring-boot-autoconfigure/pom.xml
index f7358267088..0356cd48f9c 100644
--- a/spring-boot-config/pom.xml
+++ b/spring-boot-autoconfigure/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot</artifactId>
+		<artifactId>spring-boot-parent</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-config</artifactId>
+	<artifactId>spring-boot-autoconfigure</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
@@ -16,7 +16,7 @@
 		<!-- Compile -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-strap</artifactId>
+			<artifactId>spring-boot</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<!-- Optional -->
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigurationSorter.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigurationSorter.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigurationSorter.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigurationSorter.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigurationUtils.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigurationUtils.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigurationUtils.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigurationUtils.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigureAfter.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigureAfter.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigureAfter.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigureAfter.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/ComponentScanDetector.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/ComponentScanDetector.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/ComponentScanDetector.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/ComponentScanDetector.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/EnableAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/EnableAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/EnableAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/EnableAutoConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/EnableAutoConfigurationImportSelector.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/EnableAutoConfigurationImportSelector.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/EnableAutoConfigurationImportSelector.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/EnableAutoConfigurationImportSelector.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/MessageSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/MessageSourceAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/MessageSourceAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/MessageSourceAutoConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/PropertyPlaceholderAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/PropertyPlaceholderAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/PropertyPlaceholderAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/PropertyPlaceholderAutoConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/batch/BatchAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/BatchAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/batch/BatchAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/BatchAutoConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/batch/BatchDatabaseInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/BatchDatabaseInitializer.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/batch/BatchDatabaseInitializer.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/BatchDatabaseInitializer.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobExecutionEvent.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobExecutionEvent.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobExecutionEvent.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobExecutionEvent.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobExecutionExitCodeGenerator.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobExecutionExitCodeGenerator.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobExecutionExitCodeGenerator.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobExecutionExitCodeGenerator.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobLauncherCommandLineRunner.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobLauncherCommandLineRunner.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobLauncherCommandLineRunner.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobLauncherCommandLineRunner.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigureRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigureRegistrar.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigureRegistrar.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigureRegistrar.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/AbstractDataSourceConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/AbstractDataSourceConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/AbstractDataSourceConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/AbstractDataSourceConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/BasicDataSourceConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/BasicDataSourceConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/BasicDataSourceConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/BasicDataSourceConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/DataSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/DataSourceAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/DataSourceAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/DataSourceAutoConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/orm/jpa/JpaBaseConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/orm/jpa/JpaBaseConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/orm/jpa/JpaBaseConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/orm/jpa/JpaBaseConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/reactor/ReactorAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/reactor/ReactorAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/reactor/ReactorAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/reactor/ReactorAutoConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/web/MultipartAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/MultipartAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/web/MultipartAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/MultipartAutoConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/web/ServerPropertiesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/ServerPropertiesAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/web/ServerPropertiesAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/ServerPropertiesAutoConfiguration.java
diff --git a/spring-boot-config/src/main/java/org/springframework/boot/config/web/WebMvcAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/WebMvcAutoConfiguration.java
similarity index 100%
rename from spring-boot-config/src/main/java/org/springframework/boot/config/web/WebMvcAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/WebMvcAutoConfiguration.java
diff --git a/spring-boot-config/src/main/resources/META-INF/spring.factories b/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from spring-boot-config/src/main/resources/META-INF/spring.factories
rename to spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/AdhocTestSuite.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/AdhocTestSuite.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/AdhocTestSuite.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/AdhocTestSuite.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/AutoConfigurationSorterTest.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/AutoConfigurationSorterTest.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/AutoConfigurationSorterTest.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/AutoConfigurationSorterTest.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/ComponentScanDetectorConfiguration.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/ComponentScanDetectorConfiguration.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/ComponentScanDetectorConfiguration.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/ComponentScanDetectorConfiguration.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/MessageSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/MessageSourceAutoConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/MessageSourceAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/MessageSourceAutoConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/SpringJUnitTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/SpringJUnitTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/SpringJUnitTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/SpringJUnitTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/batch/BatchAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/batch/BatchAutoConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/batch/BatchAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/batch/BatchAutoConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/batch/JobExecutionExitCodeGeneratorTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/batch/JobExecutionExitCodeGeneratorTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/batch/JobExecutionExitCodeGeneratorTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/batch/JobExecutionExitCodeGeneratorTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/data/JpaWebAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/JpaWebAutoConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/data/JpaWebAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/JpaWebAutoConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/data/test/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/test/City.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/data/test/City.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/test/City.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/data/test/CityRepository.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/test/CityRepository.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/data/test/CityRepository.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/test/CityRepository.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/BasicDataSourceConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/BasicDataSourceConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/BasicDataSourceConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/BasicDataSourceConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/DataSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/DataSourceAutoConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/DataSourceAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/DataSourceAutoConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/orm/jpa/test/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/orm/jpa/test/City.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/orm/jpa/test/City.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/orm/jpa/test/City.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/reactor/ReactorAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/reactor/ReactorAutoConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/reactor/ReactorAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/reactor/ReactorAutoConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/web/MultipartAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/MultipartAutoConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/web/MultipartAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/MultipartAutoConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/web/ServerPropertiesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/ServerPropertiesAutoConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/web/ServerPropertiesAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/ServerPropertiesAutoConfigurationTests.java
diff --git a/spring-boot-config/src/test/java/org/springframework/boot/config/web/WebMvcAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/WebMvcAutoConfigurationTests.java
similarity index 100%
rename from spring-boot-config/src/test/java/org/springframework/boot/config/web/WebMvcAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/WebMvcAutoConfigurationTests.java
diff --git a/spring-boot-config/src/test/resources/org/springframework/boot/config/jdbc/schema.sql b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/config/jdbc/schema.sql
similarity index 100%
rename from spring-boot-config/src/test/resources/org/springframework/boot/config/jdbc/schema.sql
rename to spring-boot-autoconfigure/src/test/resources/org/springframework/boot/config/jdbc/schema.sql
diff --git a/spring-boot-config/src/test/resources/templates/layout.html b/spring-boot-autoconfigure/src/test/resources/templates/layout.html
similarity index 100%
rename from spring-boot-config/src/test/resources/templates/layout.html
rename to spring-boot-autoconfigure/src/test/resources/templates/layout.html
diff --git a/spring-boot-config/src/test/resources/templates/template.txt b/spring-boot-autoconfigure/src/test/resources/templates/template.txt
similarity index 100%
rename from spring-boot-config/src/test/resources/templates/template.txt
rename to spring-boot-autoconfigure/src/test/resources/templates/template.txt
diff --git a/spring-boot-config/src/test/resources/templates/tiles.xml b/spring-boot-autoconfigure/src/test/resources/templates/tiles.xml
similarity index 100%
rename from spring-boot-config/src/test/resources/templates/tiles.xml
rename to spring-boot-autoconfigure/src/test/resources/templates/tiles.xml
diff --git a/spring-boot-config/src/test/resources/templates/view.html b/spring-boot-autoconfigure/src/test/resources/templates/view.html
similarity index 100%
rename from spring-boot-config/src/test/resources/templates/view.html
rename to spring-boot-autoconfigure/src/test/resources/templates/view.html
diff --git a/spring-boot-config/src/test/resources/test/messages.properties b/spring-boot-autoconfigure/src/test/resources/test/messages.properties
similarity index 100%
rename from spring-boot-config/src/test/resources/test/messages.properties
rename to spring-boot-autoconfigure/src/test/resources/test/messages.properties
diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml
index 7d915fe4474..5df942c36a9 100644
--- a/spring-boot-cli/pom.xml
+++ b/spring-boot-cli/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot</artifactId>
+		<artifactId>spring-boot-parent</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-boot-cli</artifactId>
diff --git a/spring-boot-integration-tests/pom.xml b/spring-boot-integration-tests/pom.xml
index afdfd46abba..1af6a8ca37d 100644
--- a/spring-boot-integration-tests/pom.xml
+++ b/spring-boot-integration-tests/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot</artifactId>
+		<artifactId>spring-boot-parent</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-boot-integration-tests</artifactId>
@@ -16,12 +16,12 @@
 		<!-- Ensure other reactor projects are build before running integration tests -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-ops</artifactId>
+			<artifactId>spring-boot</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-config</artifactId>
+			<artifactId>spring-boot-autoconfigure</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -31,12 +31,7 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-strap</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-load</artifactId>
+			<artifactId>spring-boot-loader</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -46,12 +41,12 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-ops</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-ops</artifactId>
+			<artifactId>spring-boot-up</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -69,11 +64,37 @@
 			<artifactId>spring-boot-up-integration</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-boot-up-jetty</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-boot-up-logging</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-boot-up-ops</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-boot-up-parent</artifactId>
+			<version>${project.version}</version>
+			<type>pom</type>
+		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-boot-up-security</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-boot-up-tomcat</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-boot-up-web</artifactId>
diff --git a/spring-boot-load/README.md b/spring-boot-loader/README.md
similarity index 100%
rename from spring-boot-load/README.md
rename to spring-boot-loader/README.md
diff --git a/spring-boot-load/pom.xml b/spring-boot-loader/pom.xml
similarity index 93%
rename from spring-boot-load/pom.xml
rename to spring-boot-loader/pom.xml
index eb729dc8e76..2bc6203469d 100644
--- a/spring-boot-load/pom.xml
+++ b/spring-boot-loader/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot</artifactId>
+		<artifactId>spring-boot-parent</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-load</artifactId>
+	<artifactId>spring-boot-loader</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
diff --git a/spring-boot-load/src/it/executable-jar/pom.xml b/spring-boot-loader/src/it/executable-jar/pom.xml
similarity index 100%
rename from spring-boot-load/src/it/executable-jar/pom.xml
rename to spring-boot-loader/src/it/executable-jar/pom.xml
diff --git a/spring-boot-load/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml b/spring-boot-loader/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml
similarity index 100%
rename from spring-boot-load/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml
rename to spring-boot-loader/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml
diff --git a/spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java b/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java
similarity index 100%
rename from spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java
rename to spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java
diff --git a/spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java b/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java
similarity index 100%
rename from spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java
rename to spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java
diff --git a/spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java b/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java
similarity index 100%
rename from spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java
rename to spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java
diff --git a/spring-boot-load/src/it/executable-war/pom.xml b/spring-boot-loader/src/it/executable-war/pom.xml
similarity index 100%
rename from spring-boot-load/src/it/executable-war/pom.xml
rename to spring-boot-loader/src/it/executable-war/pom.xml
diff --git a/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java b/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java
similarity index 100%
rename from spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java
rename to spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java
diff --git a/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java b/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java
similarity index 100%
rename from spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java
rename to spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java
diff --git a/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java b/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java
similarity index 100%
rename from spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java
rename to spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java
diff --git a/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java b/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-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java
rename to spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java
diff --git a/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java b/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-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java
rename to spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java
diff --git a/spring-boot-load/src/it/settings.xml b/spring-boot-loader/src/it/settings.xml
similarity index 100%
rename from spring-boot-load/src/it/settings.xml
rename to spring-boot-loader/src/it/settings.xml
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/Archive.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/Archive.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/Archive.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/Archive.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/ExplodedArchive.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/ExplodedArchive.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/ExplodedArchive.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/ExplodedArchive.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/JarFileArchive.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/JarFileArchive.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/JarFileArchive.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/JarFileArchive.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/JarLauncher.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/JarLauncher.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/JarLauncher.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/JarLauncher.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/LaunchedURLClassLoader.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/LaunchedURLClassLoader.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/LaunchedURLClassLoader.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/LaunchedURLClassLoader.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/Launcher.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/Launcher.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/Launcher.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/Launcher.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/MainMethodRunner.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/MainMethodRunner.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/MainMethodRunner.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/MainMethodRunner.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/WarLauncher.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/WarLauncher.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/WarLauncher.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/WarLauncher.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/data/RandomAccessData.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/data/RandomAccessData.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/data/RandomAccessData.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/data/RandomAccessData.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/data/RandomAccessDataFile.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/data/RandomAccessDataFile.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/data/RandomAccessDataFile.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/data/RandomAccessDataFile.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/data/package-info.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/data/package-info.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/data/package-info.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/data/package-info.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/jar/JarEntryFilter.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/JarEntryFilter.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/jar/JarEntryFilter.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/jar/JarEntryFilter.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipEntry.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipEntry.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipEntry.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipEntry.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStream.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStream.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStream.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStream.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessJarFile.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessJarFile.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessJarFile.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessJarFile.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/jar/package-info.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/package-info.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/jar/package-info.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/jar/package-info.java
diff --git a/spring-boot-load/src/main/java/org/springframework/boot/load/package-info.java b/spring-boot-loader/src/main/java/org/springframework/boot/load/package-info.java
similarity index 100%
rename from spring-boot-load/src/main/java/org/springframework/boot/load/package-info.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/load/package-info.java
diff --git a/spring-boot-load/src/test/java/org/springframework/boot/load/ByteArrayStartsWith.java b/spring-boot-loader/src/test/java/org/springframework/boot/load/ByteArrayStartsWith.java
similarity index 100%
rename from spring-boot-load/src/test/java/org/springframework/boot/load/ByteArrayStartsWith.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/load/ByteArrayStartsWith.java
diff --git a/spring-boot-load/src/test/java/org/springframework/boot/load/ExplodedArchiveTests.java b/spring-boot-loader/src/test/java/org/springframework/boot/load/ExplodedArchiveTests.java
similarity index 100%
rename from spring-boot-load/src/test/java/org/springframework/boot/load/ExplodedArchiveTests.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/load/ExplodedArchiveTests.java
diff --git a/spring-boot-load/src/test/java/org/springframework/boot/load/JarFileArchiveTests.java b/spring-boot-loader/src/test/java/org/springframework/boot/load/JarFileArchiveTests.java
similarity index 100%
rename from spring-boot-load/src/test/java/org/springframework/boot/load/JarFileArchiveTests.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/load/JarFileArchiveTests.java
diff --git a/spring-boot-load/src/test/java/org/springframework/boot/load/TestJarCreator.java b/spring-boot-loader/src/test/java/org/springframework/boot/load/TestJarCreator.java
similarity index 100%
rename from spring-boot-load/src/test/java/org/springframework/boot/load/TestJarCreator.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/load/TestJarCreator.java
diff --git a/spring-boot-load/src/test/java/org/springframework/boot/load/data/RandomAccessDataFileTests.java b/spring-boot-loader/src/test/java/org/springframework/boot/load/data/RandomAccessDataFileTests.java
similarity index 100%
rename from spring-boot-load/src/test/java/org/springframework/boot/load/data/RandomAccessDataFileTests.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/load/data/RandomAccessDataFileTests.java
diff --git a/spring-boot-load/src/test/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStreamTests.java b/spring-boot-loader/src/test/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStreamTests.java
similarity index 100%
rename from spring-boot-load/src/test/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStreamTests.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStreamTests.java
diff --git a/spring-boot-load/src/test/java/org/springframework/boot/load/jar/RandomAccessJarFileTests.java b/spring-boot-loader/src/test/java/org/springframework/boot/load/jar/RandomAccessJarFileTests.java
similarity index 100%
rename from spring-boot-load/src/test/java/org/springframework/boot/load/jar/RandomAccessJarFileTests.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/load/jar/RandomAccessJarFileTests.java
diff --git a/spring-boot-maven-plugin/pom.xml b/spring-boot-maven-plugin/pom.xml
index 674a2136b41..bd12c7d0356 100644
--- a/spring-boot-maven-plugin/pom.xml
+++ b/spring-boot-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot</artifactId>
+		<artifactId>spring-boot-parent</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-boot-maven-plugin</artifactId>
@@ -16,7 +16,7 @@
 		<!-- Compile -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-load</artifactId>
+			<artifactId>spring-boot-loader</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-maven-plugin/src/it/jar/pom.xml b/spring-boot-maven-plugin/src/it/jar/pom.xml
index ab120d833b8..11febdaedfb 100644
--- a/spring-boot-maven-plugin/src/it/jar/pom.xml
+++ b/spring-boot-maven-plugin/src/it/jar/pom.xml
@@ -26,9 +26,9 @@
 				<version>2.4</version>
 				<configuration>
 					<archive>
-                        <manifest>
-                          <mainClass>some.random.Main</mainClass>
-                        </manifest>
+						<manifest>
+							<mainClass>some.random.Main</mainClass>
+						</manifest>
 						<manifestEntries>
 							<Not-Used>Foo</Not-Used>
 						</manifestEntries>
diff --git a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableArchiveMojo.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableArchiveMojo.java
index d705f7d3a7a..0e7e4c7175c 100644
--- a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableArchiveMojo.java
+++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableArchiveMojo.java
@@ -56,7 +56,7 @@ import org.sonatype.aether.util.artifact.DefaultArtifact;
 /**
  * MOJO that can can be used to repackage existing JAR and WAR archives so that they can
  * be executed from the command line using {@literal java -jar}.
- * 
+ *
  * @author Phillip Webb
  * @author Dave Syer
  */
@@ -247,7 +247,7 @@ public class ExecutableArchiveMojo extends AbstractExecutableArchiveMojo {
 
 			String version = getClass().getPackage().getImplementationVersion();
 			DefaultArtifact artifact = new DefaultArtifact(
-					"org.springframework.boot:spring-boot-load:" + version);
+					"org.springframework.boot:spring-boot-loader:" + version);
 			ArtifactDescriptorRequest descriptorRequest = new ArtifactDescriptorRequest(
 					artifact, repositories, "plugin");
 			ArtifactDescriptorResult descriptorResult = this.repositorySystem
diff --git a/spring-boot-ops/pom.xml b/spring-boot-ops/pom.xml
index 7f8a7867c25..18b195c28f6 100644
--- a/spring-boot-ops/pom.xml
+++ b/spring-boot-ops/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot</artifactId>
+		<artifactId>spring-boot-parent</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-boot-ops</artifactId>
@@ -16,7 +16,12 @@
 		<!-- Compile -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-config</artifactId>
+			<artifactId>spring-boot</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-boot-autoconfigure</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
index a34ad3517cc..588d81c58fd 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot</artifactId>
+		<artifactId>spring-boot-parent</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-boot-samples</artifactId>
@@ -26,23 +26,23 @@
 		<module>spring-boot-sample-web-ui</module>
 		<module>spring-boot-sample-xml</module>
 	</modules>
-    <build>
-      <pluginManagement>
-        <plugins>
-			<plugin>
-				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>${project.version}</version>
-				<extensions>true</extensions>
-				<executions>
-					<execution>
-						<goals>
-							<goal>package</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-        </plugins>
-      </pluginManagement>
-    </build>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>${project.groupId}</groupId>
+					<artifactId>spring-boot-maven-plugin</artifactId>
+					<version>${project.version}</version>
+					<extensions>true</extensions>
+					<executions>
+						<execution>
+							<goals>
+								<goal>package</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 </project>
diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
index 1688717f22d..99c07548376 100644
--- a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
@@ -34,7 +34,6 @@
 			<plugin>
 				<groupId>${project.groupId}</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<extensions>true</extensions>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/spring-boot-samples/spring-boot-sample-jetty/pom.xml b/spring-boot-samples/spring-boot-sample-jetty/pom.xml
index 20aa4439007..84fe3a13c52 100644
--- a/spring-boot-samples/spring-boot-sample-jetty/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-jetty/pom.xml
@@ -18,15 +18,15 @@
 			<artifactId>spring-boot-up</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-boot-up-jetty</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/spring-boot-ups/pom.xml b/spring-boot-ups/pom.xml
index e5ff528d216..5dd931767c7 100644
--- a/spring-boot-ups/pom.xml
+++ b/spring-boot-ups/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot</artifactId>
+		<artifactId>spring-boot-parent</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-boot-ups</artifactId>
@@ -13,7 +13,6 @@
 		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
 	<modules>
-		<module>spring-boot-up-parent</module>
 		<module>spring-boot-up</module>
 		<module>spring-boot-up-batch</module>
 		<module>spring-boot-up-data-jpa</module>
@@ -21,6 +20,7 @@
 		<module>spring-boot-up-jetty</module>
 		<module>spring-boot-up-logging</module>
 		<module>spring-boot-up-ops</module>
+		<module>spring-boot-up-parent</module>
 		<module>spring-boot-up-security</module>
 		<module>spring-boot-up-tomcat</module>
 		<module>spring-boot-up-web</module>
diff --git a/spring-boot-ups/spring-boot-up-batch/pom.xml b/spring-boot-ups/spring-boot-up-batch/pom.xml
index b9b60be95ff..806a15386cd 100644
--- a/spring-boot-ups/spring-boot-up-batch/pom.xml
+++ b/spring-boot-ups/spring-boot-up-batch/pom.xml
@@ -4,9 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-up-parent</artifactId>
+		<artifactId>spring-boot-ups</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
-        <relativePath>../spring-boot-up-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-up-batch</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-boot-ups/spring-boot-up-data-jpa/pom.xml b/spring-boot-ups/spring-boot-up-data-jpa/pom.xml
index cd2a0af0b28..891817a595d 100644
--- a/spring-boot-ups/spring-boot-up-data-jpa/pom.xml
+++ b/spring-boot-ups/spring-boot-up-data-jpa/pom.xml
@@ -4,9 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-up-parent</artifactId>
+		<artifactId>spring-boot-ups</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
-        <relativePath>../spring-boot-up-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-up-data-jpa</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-boot-ups/spring-boot-up-integration/pom.xml b/spring-boot-ups/spring-boot-up-integration/pom.xml
index db678a0b4f2..986386b435f 100644
--- a/spring-boot-ups/spring-boot-up-integration/pom.xml
+++ b/spring-boot-ups/spring-boot-up-integration/pom.xml
@@ -4,9 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-up-parent</artifactId>
+		<artifactId>spring-boot-ups</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
-        <relativePath>../spring-boot-up-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-up-integration</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-boot-ups/spring-boot-up-jetty/pom.xml b/spring-boot-ups/spring-boot-up-jetty/pom.xml
index 09cdad91554..c8c9a916591 100644
--- a/spring-boot-ups/spring-boot-up-jetty/pom.xml
+++ b/spring-boot-ups/spring-boot-up-jetty/pom.xml
@@ -4,9 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-up-parent</artifactId>
+		<artifactId>spring-boot-ups</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
-        <relativePath>../spring-boot-up-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-up-jetty</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-boot-ups/spring-boot-up-logging/pom.xml b/spring-boot-ups/spring-boot-up-logging/pom.xml
index 9ab186ae86f..dc8e444daed 100644
--- a/spring-boot-ups/spring-boot-up-logging/pom.xml
+++ b/spring-boot-ups/spring-boot-up-logging/pom.xml
@@ -4,9 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-up-parent</artifactId>
+		<artifactId>spring-boot-ups</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
-        <relativePath>../spring-boot-up-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-up-logging</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-boot-ups/spring-boot-up-ops/pom.xml b/spring-boot-ups/spring-boot-up-ops/pom.xml
index 2c8250f0524..a5901236c30 100644
--- a/spring-boot-ups/spring-boot-up-ops/pom.xml
+++ b/spring-boot-ups/spring-boot-up-ops/pom.xml
@@ -4,9 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-up-parent</artifactId>
+		<artifactId>spring-boot-ups</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
-        <relativePath>../spring-boot-up-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-up-ops</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-boot-ups/spring-boot-up-parent/pom.xml b/spring-boot-ups/spring-boot-up-parent/pom.xml
index ff272317144..ac14b242b91 100644
--- a/spring-boot-ups/spring-boot-up-parent/pom.xml
+++ b/spring-boot-ups/spring-boot-up-parent/pom.xml
@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+This POM file that can be used as a parent for your own builds. It provides generally
+useful dependencies and plugins.
+
+NOTE: If you are editing a local checkout of this file, be sure to modify
+'spring-boot-ups/src/main/parent/pom.xml'.
+
+-->
+
 <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>
-	<!-- NOTE: Intentionally does not inherit from root parent. Autogenerated, 
-		do not edit. -->
+
+	<!-- Intentionally do not inherit from boot-parent -->
 	<groupId>org.springframework.boot</groupId>
 	<artifactId>spring-boot-up-parent</artifactId>
 	<version>0.5.0.BUILD-SNAPSHOT</version>
+
 	<packaging>pom</packaging>
+
 	<properties>
 		<java.version>1.6</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,14 +31,16 @@
 		<spring.boot.version>0.5.0.BUILD-SNAPSHOT</spring.boot.version>
 		<start-class>org.springframework.boot.strap.SpringApplication</start-class>
 	</properties>
+
 	<prerequisites>
 		<maven>3.0</maven>
 	</prerequisites>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot</artifactId>
+				<artifactId>spring-boot-parent</artifactId>
 				<version>${spring.boot.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
@@ -85,6 +102,7 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+
 	<dependencies>
 		<!-- Generally useful test dependencies -->
 		<dependency>
@@ -103,28 +121,7 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<profiles>
-		<profile>
-			<id>spring-deploy</id>
-			<distributionManagement>
-				<downloadUrl>http://www.springsource.com/download/community</downloadUrl>
-				<site>
-					<id>spring-docs</id>
-					<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/docs/${project.version}</url>
-				</site>
-				<repository>
-					<id>spring-repo-release</id>
-					<name>Spring Release Repository</name>
-					<url>http://repo.springsource.org/libs-release-local</url>
-				</repository>
-				<snapshotRepository>
-					<id>spring-repo-snapshot</id>
-					<name>Spring Snapshot Repository</name>
-					<url>http://repo.springsource.org/libs-snapshot-local</url>
-				</snapshotRepository>
-			</distributionManagement>
-		</profile>
-	</profiles>
+
 	<build>
 		<resources>
 			<resource>
@@ -356,4 +353,27 @@
 			</plugins>
 		</pluginManagement>
 	</build>
+
+	<profiles>
+		<profile>
+			<id>spring-deploy</id>
+			<distributionManagement>
+				<downloadUrl>http://www.springsource.com/download/community</downloadUrl>
+				<site>
+					<id>spring-docs</id>
+					<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/docs/${project.version}</url>
+				</site>
+				<repository>
+					<id>spring-repo-release</id>
+					<name>Spring Release Repository</name>
+					<url>http://repo.springsource.org/libs-release-local</url>
+				</repository>
+				<snapshotRepository>
+					<id>spring-repo-snapshot</id>
+					<name>Spring Snapshot Repository</name>
+					<url>http://repo.springsource.org/libs-snapshot-local</url>
+				</snapshotRepository>
+			</distributionManagement>
+		</profile>
+	</profiles>
 </project>
diff --git a/spring-boot-ups/spring-boot-up-security/pom.xml b/spring-boot-ups/spring-boot-up-security/pom.xml
index ae0c5bc9b54..74099ce1f66 100644
--- a/spring-boot-ups/spring-boot-up-security/pom.xml
+++ b/spring-boot-ups/spring-boot-up-security/pom.xml
@@ -4,9 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-up-parent</artifactId>
+		<artifactId>spring-boot-ups</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
-        <relativePath>../spring-boot-up-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-up-security</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-boot-ups/spring-boot-up-tomcat/pom.xml b/spring-boot-ups/spring-boot-up-tomcat/pom.xml
index 6d375724ab5..bed99bc2e03 100644
--- a/spring-boot-ups/spring-boot-up-tomcat/pom.xml
+++ b/spring-boot-ups/spring-boot-up-tomcat/pom.xml
@@ -4,9 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-up-parent</artifactId>
+		<artifactId>spring-boot-ups</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
-        <relativePath>../spring-boot-up-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-up-tomcat</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-boot-ups/spring-boot-up-web/pom.xml b/spring-boot-ups/spring-boot-up-web/pom.xml
index 33edd6c4c15..78563f85c99 100644
--- a/spring-boot-ups/spring-boot-up-web/pom.xml
+++ b/spring-boot-ups/spring-boot-up-web/pom.xml
@@ -4,9 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-up-parent</artifactId>
+		<artifactId>spring-boot-ups</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
-        <relativePath>../spring-boot-up-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-up-web</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-boot-ups/spring-boot-up/pom.xml b/spring-boot-ups/spring-boot-up/pom.xml
index b72e5e686c0..ea9c60a05d3 100644
--- a/spring-boot-ups/spring-boot-up/pom.xml
+++ b/spring-boot-ups/spring-boot-up/pom.xml
@@ -4,9 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-up-parent</artifactId>
+		<artifactId>spring-boot-ups</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
-        <relativePath>../spring-boot-up-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-up</artifactId>
 	<packaging>jar</packaging>
@@ -16,7 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-config</artifactId>
+			<artifactId>spring-boot</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-boot-autoconfigure</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-ups/src/main/parent/pom.xml b/spring-boot-ups/src/main/parent/pom.xml
index 23322024a3b..3c109594958 100644
--- a/spring-boot-ups/src/main/parent/pom.xml
+++ b/spring-boot-ups/src/main/parent/pom.xml
@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+This POM file that can be used as a parent for your own builds. It provides generally
+useful dependencies and plugins.
+
+NOTE: If you are editing a local checkout of this file, be sure to modify
+'spring-boot-ups/src/main/parent/pom.xml'.
+
+-->
+
 <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>
-	<!-- NOTE: Intentionally does not inherit from root parent. Autogenerated, 
-		do not edit. -->
+
+	<!-- Intentionally do not inherit from boot-parent -->
 	<groupId>org.springframework.boot</groupId>
 	<artifactId>spring-boot-up-parent</artifactId>
 	<version>0.5.0.BUILD-SNAPSHOT</version>
+
 	<packaging>pom</packaging>
+
 	<properties>
 		<java.version>1.6</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,14 +31,16 @@
 		<spring.boot.version>@{project.version}</spring.boot.version>
 		<start-class>org.springframework.boot.strap.SpringApplication</start-class>
 	</properties>
+
 	<prerequisites>
 		<maven>3.0</maven>
 	</prerequisites>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot</artifactId>
+				<artifactId>spring-boot-parent</artifactId>
 				<version>${spring.boot.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
@@ -85,6 +102,7 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+
 	<dependencies>
 		<!-- Generally useful test dependencies -->
 		<dependency>
@@ -103,28 +121,7 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<profiles>
-		<profile>
-			<id>spring-deploy</id>
-			<distributionManagement>
-				<downloadUrl>http://www.springsource.com/download/community</downloadUrl>
-				<site>
-					<id>spring-docs</id>
-					<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/docs/${project.version}</url>
-				</site>
-				<repository>
-					<id>spring-repo-release</id>
-					<name>Spring Release Repository</name>
-					<url>http://repo.springsource.org/libs-release-local</url>
-				</repository>
-				<snapshotRepository>
-					<id>spring-repo-snapshot</id>
-					<name>Spring Snapshot Repository</name>
-					<url>http://repo.springsource.org/libs-snapshot-local</url>
-				</snapshotRepository>
-			</distributionManagement>
-		</profile>
-	</profiles>
+
 	<build>
 		<resources>
 			<resource>
@@ -356,4 +353,27 @@
 			</plugins>
 		</pluginManagement>
 	</build>
+
+	<profiles>
+		<profile>
+			<id>spring-deploy</id>
+			<distributionManagement>
+				<downloadUrl>http://www.springsource.com/download/community</downloadUrl>
+				<site>
+					<id>spring-docs</id>
+					<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/docs/${project.version}</url>
+				</site>
+				<repository>
+					<id>spring-repo-release</id>
+					<name>Spring Release Repository</name>
+					<url>http://repo.springsource.org/libs-release-local</url>
+				</repository>
+				<snapshotRepository>
+					<id>spring-repo-snapshot</id>
+					<name>Spring Snapshot Repository</name>
+					<url>http://repo.springsource.org/libs-snapshot-local</url>
+				</snapshotRepository>
+			</distributionManagement>
+		</profile>
+	</profiles>
 </project>
diff --git a/spring-boot-strap/README.md b/spring-boot/README.md
similarity index 100%
rename from spring-boot-strap/README.md
rename to spring-boot/README.md
diff --git a/spring-boot-strap/docs/Features.md b/spring-boot/docs/Features.md
similarity index 100%
rename from spring-boot-strap/docs/Features.md
rename to spring-boot/docs/Features.md
diff --git a/spring-boot-strap/pom.xml b/spring-boot/pom.xml
similarity index 97%
rename from spring-boot-strap/pom.xml
rename to spring-boot/pom.xml
index 6425e861dfe..05e4b95ef25 100644
--- a/spring-boot-strap/pom.xml
+++ b/spring-boot/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot</artifactId>
+		<artifactId>spring-boot-parent</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-strap</artifactId>
+	<artifactId>spring-boot</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/Banner.java b/spring-boot/src/main/java/org/springframework/boot/strap/Banner.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/Banner.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/Banner.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/BeanDefinitionLoader.java b/spring-boot/src/main/java/org/springframework/boot/strap/BeanDefinitionLoader.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/BeanDefinitionLoader.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/BeanDefinitionLoader.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/CommandLineRunner.java b/spring-boot/src/main/java/org/springframework/boot/strap/CommandLineRunner.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/CommandLineRunner.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/CommandLineRunner.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/ExitCodeGenerator.java b/spring-boot/src/main/java/org/springframework/boot/strap/ExitCodeGenerator.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/ExitCodeGenerator.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/ExitCodeGenerator.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/strap/SpringApplication.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/SpringApplication.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/SpringApplication.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/SpringApplicationInitializer.java b/spring-boot/src/main/java/org/springframework/boot/strap/SpringApplicationInitializer.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/SpringApplicationInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/SpringApplicationInitializer.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/StartupInfoLogger.java b/spring-boot/src/main/java/org/springframework/boot/strap/StartupInfoLogger.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/StartupInfoLogger.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/StartupInfoLogger.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/ansi/AnsiElement.java b/spring-boot/src/main/java/org/springframework/boot/strap/ansi/AnsiElement.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/ansi/AnsiElement.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/ansi/AnsiElement.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/ansi/AnsiOutput.java b/spring-boot/src/main/java/org/springframework/boot/strap/ansi/AnsiOutput.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/ansi/AnsiOutput.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/ansi/AnsiOutput.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/CustomPropertyConstructor.java b/spring-boot/src/main/java/org/springframework/boot/strap/bind/CustomPropertyConstructor.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/CustomPropertyConstructor.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/bind/CustomPropertyConstructor.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/InetAddressEditor.java b/spring-boot/src/main/java/org/springframework/boot/strap/bind/InetAddressEditor.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/InetAddressEditor.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/bind/InetAddressEditor.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactory.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactory.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValues.java b/spring-boot/src/main/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValues.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValues.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValues.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/RelaxedDataBinder.java b/spring-boot/src/main/java/org/springframework/boot/strap/bind/RelaxedDataBinder.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/RelaxedDataBinder.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/bind/RelaxedDataBinder.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/YamlConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/strap/bind/YamlConfigurationFactory.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/YamlConfigurationFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/bind/YamlConfigurationFactory.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/ArrayDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/ArrayDocumentMatcher.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/ArrayDocumentMatcher.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/ArrayDocumentMatcher.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/DefaultProfileDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/DefaultProfileDocumentMatcher.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/DefaultProfileDocumentMatcher.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/DefaultProfileDocumentMatcher.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JacksonJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/JacksonJsonParser.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JacksonJsonParser.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/JacksonJsonParser.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JsonParser.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/JsonParser.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JsonParser.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/JsonParser.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JsonParserFactory.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/JsonParserFactory.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JsonParserFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/JsonParserFactory.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/PropertiesPropertySourceLoader.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/PropertiesPropertySourceLoader.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/PropertiesPropertySourceLoader.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/PropertiesPropertySourceLoader.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/PropertySourceLoader.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/PropertySourceLoader.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/PropertySourceLoader.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/PropertySourceLoader.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/SimpleJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/SimpleJsonParser.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/SimpleJsonParser.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/SimpleJsonParser.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/SpringProfileDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/SpringProfileDocumentMatcher.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/SpringProfileDocumentMatcher.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/SpringProfileDocumentMatcher.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlJsonParser.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlJsonParser.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/YamlJsonParser.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlMapFactoryBean.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlMapFactoryBean.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlMapFactoryBean.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/YamlMapFactoryBean.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlProcessor.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlProcessor.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlProcessor.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/YamlProcessor.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBean.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBean.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBean.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBean.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlPropertySourceLoader.java b/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlPropertySourceLoader.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlPropertySourceLoader.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/config/YamlPropertySourceLoader.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/AbstractOnBeanCondition.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/AbstractOnBeanCondition.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/AbstractOnBeanCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/AbstractOnBeanCondition.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionLogUtils.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionLogUtils.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionLogUtils.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionLogUtils.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnBean.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnBean.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnBean.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnBean.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnClass.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnClass.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnClass.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnClass.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnExpression.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnExpression.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnExpression.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnExpression.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingBean.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingBean.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingBean.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingBean.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingClass.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingClass.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingClass.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingClass.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnNotWebApplication.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnNotWebApplication.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnNotWebApplication.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnNotWebApplication.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnResource.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnResource.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnResource.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnResource.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnWebApplication.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnWebApplication.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnWebApplication.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnWebApplication.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnBeanCondition.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnBeanCondition.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnBeanCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnBeanCondition.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnClassCondition.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnClassCondition.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnClassCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnClassCondition.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnExpressionCondition.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnExpressionCondition.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnExpressionCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnExpressionCondition.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnMissingBeanCondition.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnMissingBeanCondition.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnMissingBeanCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnMissingBeanCondition.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnMissingClassCondition.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnMissingClassCondition.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnMissingClassCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnMissingClassCondition.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationCondition.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationCondition.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationCondition.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnResourceCondition.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnResourceCondition.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnResourceCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnResourceCondition.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnWebApplicationCondition.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnWebApplicationCondition.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnWebApplicationCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnWebApplicationCondition.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/SearchStrategy.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/SearchStrategy.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/SearchStrategy.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/condition/SearchStrategy.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactory.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainer.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainer.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainer.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizer.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizer.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizer.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizer.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerException.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerException.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerException.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerException.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerFactory.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContext.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContext.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContext.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContext.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ErrorPage.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ErrorPage.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ErrorPage.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ErrorPage.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBean.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBean.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBean.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/MimeMappings.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/MimeMappings.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/MimeMappings.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/MimeMappings.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/RegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/RegistrationBean.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/RegistrationBean.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/RegistrationBean.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ServletContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ServletContextInitializer.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ServletContextInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ServletContextInitializer.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBean.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBean.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBean.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/WebApplicationContextServletContextAwareProcessor.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/WebApplicationContextServletContextAwareProcessor.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/WebApplicationContextServletContextAwareProcessor.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/WebApplicationContextServletContextAwareProcessor.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContext.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContext.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContext.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContext.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainer.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainer.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainer.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/ServletContextInitializerConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/ServletContextInitializerConfiguration.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/ServletContextInitializerConfiguration.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/ServletContextInitializerConfiguration.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/package-info.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/package-info.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/package-info.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/package-info.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/package-info.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/package-info.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/package-info.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/package-info.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/properties/ServerProperties.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/properties/ServerProperties.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/properties/ServerProperties.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/properties/ServerProperties.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/package-info.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/package-info.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/package-info.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/package-info.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializer.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializer.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializer.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializer.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializer.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializer.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializer.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializer.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationProperties.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationProperties.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationProperties.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationProperties.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessor.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessor.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessor.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesHolder.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesHolder.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesHolder.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesHolder.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationProperties.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationProperties.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationProperties.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationProperties.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesImportSelector.java b/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesImportSelector.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesImportSelector.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesImportSelector.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/AbstractLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/strap/logging/AbstractLoggingSystem.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/AbstractLoggingSystem.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/logging/AbstractLoggingSystem.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/LoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/strap/logging/LoggingSystem.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/LoggingSystem.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/logging/LoggingSystem.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/java/JavaLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/strap/logging/java/JavaLoggingSystem.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/java/JavaLoggingSystem.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/logging/java/JavaLoggingSystem.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/java/SimpleFormatter.java b/spring-boot/src/main/java/org/springframework/boot/strap/logging/java/SimpleFormatter.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/java/SimpleFormatter.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/logging/java/SimpleFormatter.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/log4j/Log4JLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/strap/logging/log4j/Log4JLoggingSystem.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/log4j/Log4JLoggingSystem.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/logging/log4j/Log4JLoggingSystem.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/ColorConverter.java b/spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/ColorConverter.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/ColorConverter.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/ColorConverter.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystem.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystem.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystem.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverter.java b/spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverter.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverter.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverter.java
diff --git a/spring-boot-strap/src/main/java/org/springframework/boot/strap/web/SpringServletInitializer.java b/spring-boot/src/main/java/org/springframework/boot/strap/web/SpringServletInitializer.java
similarity index 100%
rename from spring-boot-strap/src/main/java/org/springframework/boot/strap/web/SpringServletInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/strap/web/SpringServletInitializer.java
diff --git a/spring-boot-strap/src/main/resources/META-INF/spring.factories b/spring-boot/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from spring-boot-strap/src/main/resources/META-INF/spring.factories
rename to spring-boot/src/main/resources/META-INF/spring.factories
diff --git a/spring-boot-strap/src/main/resources/favicon.ico b/spring-boot/src/main/resources/favicon.ico
similarity index 100%
rename from spring-boot-strap/src/main/resources/favicon.ico
rename to spring-boot/src/main/resources/favicon.ico
diff --git a/spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/java/logging.properties b/spring-boot/src/main/resources/org/springframework/boot/strap/logging/java/logging.properties
similarity index 100%
rename from spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/java/logging.properties
rename to spring-boot/src/main/resources/org/springframework/boot/strap/logging/java/logging.properties
diff --git a/spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/log4j/log4j.properties b/spring-boot/src/main/resources/org/springframework/boot/strap/logging/log4j/log4j.properties
similarity index 100%
rename from spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/log4j/log4j.properties
rename to spring-boot/src/main/resources/org/springframework/boot/strap/logging/log4j/log4j.properties
diff --git a/spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/logback/logback.xml b/spring-boot/src/main/resources/org/springframework/boot/strap/logging/logback/logback.xml
similarity index 100%
rename from spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/logback/logback.xml
rename to spring-boot/src/main/resources/org/springframework/boot/strap/logging/logback/logback.xml
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/BannerTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/BannerTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/BannerTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/BannerTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/BeanDefinitionLoaderTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/BeanDefinitionLoaderTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/BeanDefinitionLoaderTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/BeanDefinitionLoaderTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/SimpleMainTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/SimpleMainTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/SimpleMainTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/SimpleMainTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/SpringApplicationTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/SpringApplicationTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/SpringApplicationTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/SpringApplicationTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/StartUpLoggerTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/StartUpLoggerTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/StartUpLoggerTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/StartUpLoggerTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/TestUtils.java b/spring-boot/src/test/java/org/springframework/boot/strap/TestUtils.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/TestUtils.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/TestUtils.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/ansi/AnsiOutputTest.java b/spring-boot/src/test/java/org/springframework/boot/strap/ansi/AnsiOutputTest.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/ansi/AnsiOutputTest.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/ansi/AnsiOutputTest.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/BindingPreparationTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/bind/BindingPreparationTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/BindingPreparationTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/bind/BindingPreparationTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactoryTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactoryTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactoryTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValuesTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValuesTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValuesTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValuesTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/RelaxedDataBinderTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/bind/RelaxedDataBinderTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/RelaxedDataBinderTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/bind/RelaxedDataBinderTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/YamlConfigurationFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/bind/YamlConfigurationFactoryTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/YamlConfigurationFactoryTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/bind/YamlConfigurationFactoryTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/ArrayDocumentMatcherTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/config/ArrayDocumentMatcherTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/config/ArrayDocumentMatcherTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/config/ArrayDocumentMatcherTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/JacksonParserTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/config/JacksonParserTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/config/JacksonParserTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/config/JacksonParserTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/SimpleJsonParserTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/config/SimpleJsonParserTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/config/SimpleJsonParserTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/config/SimpleJsonParserTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlJsonParserTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/config/YamlJsonParserTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlJsonParserTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/config/YamlJsonParserTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlMapFactoryBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/config/YamlMapFactoryBeanTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlMapFactoryBeanTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/config/YamlMapFactoryBeanTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlProcessorTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/config/YamlProcessorTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlProcessorTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/config/YamlProcessorTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBeanTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBeanTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBeanTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBean.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBean.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBean.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBean.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBeanCondition.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBeanCondition.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBeanCondition.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBeanCondition.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnBeanConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnBeanConditionTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnBeanConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnBeanConditionTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnClassConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnClassConditionTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnClassConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnClassConditionTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnExpressionConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnExpressionConditionTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnExpressionConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnExpressionConditionTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnMissingBeanConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnMissingBeanConditionTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnMissingBeanConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnMissingBeanConditionTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnMissingClassConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnMissingClassConditionTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnMissingClassConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnMissingClassConditionTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationConditionTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationConditionTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnResourceConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnResourceConditionTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnResourceConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnResourceConditionTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnWebApplicationConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnWebApplicationConditionTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnWebApplicationConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnWebApplicationConditionTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContextTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContextTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContextTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContextTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ExampleFilter.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ExampleFilter.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ExampleFilter.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ExampleFilter.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ExampleServlet.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ExampleServlet.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ExampleServlet.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ExampleServlet.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBeanTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBeanTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBeanTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MimeMappingsTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MimeMappingsTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MimeMappingsTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MimeMappingsTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockEmbeddedServletContainerFactory.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockEmbeddedServletContainerFactory.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockFilter.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockFilter.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockFilter.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockFilter.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockServlet.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockServlet.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockServlet.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockServlet.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBeanTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBeanTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBeanTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContextTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContextTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContextTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContextTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/properties/ServerPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/properties/ServerPropertiesTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/properties/ServerPropertiesTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/properties/ServerPropertiesTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializerTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializerTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializerTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializerTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializerTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializerTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializerTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializerTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializerTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializerTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializerTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializerTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/test/EnableConfigurationPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/context/test/EnableConfigurationPropertiesTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/context/test/EnableConfigurationPropertiesTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/context/test/EnableConfigurationPropertiesTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/java/JavaLoggerSystemTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/logging/java/JavaLoggerSystemTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/java/JavaLoggerSystemTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/logging/java/JavaLoggerSystemTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/java/TestFormatter.java b/spring-boot/src/test/java/org/springframework/boot/strap/logging/java/TestFormatter.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/java/TestFormatter.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/logging/java/TestFormatter.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/ColorConverterTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/ColorConverterTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/ColorConverterTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/ColorConverterTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystemTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystemTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystemTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystemTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverterTests.java b/spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverterTests.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverterTests.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverterTests.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/sampleconfig/MyComponent.java b/spring-boot/src/test/java/org/springframework/boot/strap/sampleconfig/MyComponent.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/sampleconfig/MyComponent.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/sampleconfig/MyComponent.java
diff --git a/spring-boot-strap/src/test/java/org/springframework/boot/strap/sampleconfig/package-info.java b/spring-boot/src/test/java/org/springframework/boot/strap/sampleconfig/package-info.java
similarity index 100%
rename from spring-boot-strap/src/test/java/org/springframework/boot/strap/sampleconfig/package-info.java
rename to spring-boot/src/test/java/org/springframework/boot/strap/sampleconfig/package-info.java
diff --git a/spring-boot-strap/src/test/resources/application.properties b/spring-boot/src/test/resources/application.properties
similarity index 100%
rename from spring-boot-strap/src/test/resources/application.properties
rename to spring-boot/src/test/resources/application.properties
diff --git a/spring-boot-strap/src/test/resources/dispatcher.properties b/spring-boot/src/test/resources/dispatcher.properties
similarity index 100%
rename from spring-boot-strap/src/test/resources/dispatcher.properties
rename to spring-boot/src/test/resources/dispatcher.properties
diff --git a/spring-boot-strap/src/test/resources/enableprofile-myprofile.properties b/spring-boot/src/test/resources/enableprofile-myprofile.properties
similarity index 100%
rename from spring-boot-strap/src/test/resources/enableprofile-myprofile.properties
rename to spring-boot/src/test/resources/enableprofile-myprofile.properties
diff --git a/spring-boot-strap/src/test/resources/enableprofile.properties b/spring-boot/src/test/resources/enableprofile.properties
similarity index 100%
rename from spring-boot-strap/src/test/resources/enableprofile.properties
rename to spring-boot/src/test/resources/enableprofile.properties
diff --git a/spring-boot-strap/src/test/resources/logback-nondefault.xml b/spring-boot/src/test/resources/logback-nondefault.xml
similarity index 100%
rename from spring-boot-strap/src/test/resources/logback-nondefault.xml
rename to spring-boot/src/test/resources/logback-nondefault.xml
diff --git a/spring-boot-strap/src/test/resources/logback-test.xml b/spring-boot/src/test/resources/logback-test.xml
similarity index 100%
rename from spring-boot-strap/src/test/resources/logback-test.xml
rename to spring-boot/src/test/resources/logback-test.xml
diff --git a/spring-boot-strap/src/test/resources/logging-nondefault.properties b/spring-boot/src/test/resources/logging-nondefault.properties
similarity index 100%
rename from spring-boot-strap/src/test/resources/logging-nondefault.properties
rename to spring-boot/src/test/resources/logging-nondefault.properties
diff --git a/spring-boot-strap/src/test/resources/logging.properties b/spring-boot/src/test/resources/logging.properties
similarity index 100%
rename from spring-boot-strap/src/test/resources/logging.properties
rename to spring-boot/src/test/resources/logging.properties
diff --git a/spring-boot-strap/src/test/resources/moreproperties.properties b/spring-boot/src/test/resources/moreproperties.properties
similarity index 100%
rename from spring-boot-strap/src/test/resources/moreproperties.properties
rename to spring-boot/src/test/resources/moreproperties.properties
diff --git a/spring-boot-strap/src/test/resources/name.yml b/spring-boot/src/test/resources/name.yml
similarity index 100%
rename from spring-boot-strap/src/test/resources/name.yml
rename to spring-boot/src/test/resources/name.yml
diff --git a/spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/embedded/conf.properties b/spring-boot/src/test/resources/org/springframework/boot/strap/context/embedded/conf.properties
similarity index 100%
rename from spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/embedded/conf.properties
rename to spring-boot/src/test/resources/org/springframework/boot/strap/context/embedded/conf.properties
diff --git a/spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml b/spring-boot/src/test/resources/org/springframework/boot/strap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
similarity index 100%
rename from spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
rename to spring-boot/src/test/resources/org/springframework/boot/strap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
diff --git a/spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/foo.xml b/spring-boot/src/test/resources/org/springframework/boot/strap/context/foo.xml
similarity index 100%
rename from spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/foo.xml
rename to spring-boot/src/test/resources/org/springframework/boot/strap/context/foo.xml
diff --git a/spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/properties/testProperties.xml b/spring-boot/src/test/resources/org/springframework/boot/strap/context/properties/testProperties.xml
similarity index 100%
rename from spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/properties/testProperties.xml
rename to spring-boot/src/test/resources/org/springframework/boot/strap/context/properties/testProperties.xml
diff --git a/spring-boot-strap/src/test/resources/org/springframework/boot/strap/sample-beans.xml b/spring-boot/src/test/resources/org/springframework/boot/strap/sample-beans.xml
similarity index 100%
rename from spring-boot-strap/src/test/resources/org/springframework/boot/strap/sample-beans.xml
rename to spring-boot/src/test/resources/org/springframework/boot/strap/sample-beans.xml
diff --git a/spring-boot-strap/src/test/resources/other.yml b/spring-boot/src/test/resources/other.yml
similarity index 100%
rename from spring-boot-strap/src/test/resources/other.yml
rename to spring-boot/src/test/resources/other.yml
diff --git a/spring-boot-strap/src/test/resources/specificfile-specificprofile.properties b/spring-boot/src/test/resources/specificfile-specificprofile.properties
similarity index 100%
rename from spring-boot-strap/src/test/resources/specificfile-specificprofile.properties
rename to spring-boot/src/test/resources/specificfile-specificprofile.properties
diff --git a/spring-boot-strap/src/test/resources/specificlocation.properties b/spring-boot/src/test/resources/specificlocation.properties
similarity index 100%
rename from spring-boot-strap/src/test/resources/specificlocation.properties
rename to spring-boot/src/test/resources/specificlocation.properties
diff --git a/spring-boot-strap/src/test/resources/testprofiles.yml b/spring-boot/src/test/resources/testprofiles.yml
similarity index 100%
rename from spring-boot-strap/src/test/resources/testprofiles.yml
rename to spring-boot/src/test/resources/testprofiles.yml
diff --git a/spring-boot-strap/src/test/resources/testproperties.properties b/spring-boot/src/test/resources/testproperties.properties
similarity index 100%
rename from spring-boot-strap/src/test/resources/testproperties.properties
rename to spring-boot/src/test/resources/testproperties.properties
diff --git a/spring-boot-strap/src/test/resources/testsetprofiles.yml b/spring-boot/src/test/resources/testsetprofiles.yml
similarity index 100%
rename from spring-boot-strap/src/test/resources/testsetprofiles.yml
rename to spring-boot/src/test/resources/testsetprofiles.yml
diff --git a/spring-boot-strap/src/test/resources/testyaml.yml b/spring-boot/src/test/resources/testyaml.yml
similarity index 100%
rename from spring-boot-strap/src/test/resources/testyaml.yml
rename to spring-boot/src/test/resources/testyaml.yml