diff --git a/README.md b/README.md
index 63a408926e5..201c464f2af 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ add `@EnableAutoConfiguration`:
 
 	import org.springframework.stereotype.*;
 	import org.springframework.web.bind.annotation.*;
-	import org.springframework.bootstrap.context.annotation.*;
+	import org.springframework.boot.context.annotation.*;
 	
 	@Controller
 	@EnableAutoConfiguration
@@ -116,7 +116,7 @@ Features include:
 * Embedded web applications with a choice of container (Tomcat or Jetty for now)
 * First class externalized configuration support 
 
-_See [spring-bootstrap/README](spring-bootstrap/README.md)._
+_See [spring-boot/README](spring-boot/README.md)._
 
   
 ### Spring Autoconfigure
diff --git a/pom.xml b/pom.xml
index fd23926d071..9590322308e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,12 +39,12 @@
 	<modules>
 		<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>
+		<module>spring-boot-cli</module>
+		<module>spring-boot-integration-tests</module>
 	</modules>
 	<build>
 		<pluginManagement>
diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml
index 0356cd48f9c..679e9b4b2f5 100644
--- a/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-autoconfigure/pom.xml
@@ -118,7 +118,7 @@
 		<!-- Test -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-strap</artifactId>
+			<artifactId>spring-boot</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigurationSorter.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java
similarity index 99%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigurationSorter.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java
index 28a8994df45..2214e5feae8 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigurationSorter.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config;
+package org.springframework.boot.autoconfigure;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigurationUtils.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationUtils.java
similarity index 97%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigurationUtils.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationUtils.java
index 2453d905aa1..0358e14bc9a 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigurationUtils.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config;
+package org.springframework.boot.autoconfigure;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigureAfter.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureAfter.java
similarity index 95%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigureAfter.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureAfter.java
index 4e840d047f7..b55aaabe717 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/AutoConfigureAfter.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureAfter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config;
+package org.springframework.boot.autoconfigure;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/ComponentScanDetector.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ComponentScanDetector.java
similarity index 99%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/ComponentScanDetector.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ComponentScanDetector.java
index 3fb76984902..5dbb7cc9076 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/ComponentScanDetector.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ComponentScanDetector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config;
+package org.springframework.boot.autoconfigure;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/EnableAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java
similarity index 85%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/EnableAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java
index eebc230303e..e3cc430d497 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/EnableAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config;
+package org.springframework.boot.autoconfigure;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -22,11 +22,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.boot.strap.context.condition.ConditionalOnBean;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.boot.context.condition.ConditionalOnBean;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/EnableAutoConfigurationImportSelector.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java
similarity index 98%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/EnableAutoConfigurationImportSelector.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java
index 4b4405bcf23..f7ee1c83ed9 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/EnableAutoConfigurationImportSelector.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config;
+package org.springframework.boot.autoconfigure;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/MessageSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java
similarity index 92%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/MessageSourceAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java
index 2c6eb3e225b..5dcea25e835 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/MessageSourceAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config;
+package org.springframework.boot.autoconfigure;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/PropertyPlaceholderAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfiguration.java
similarity index 92%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/PropertyPlaceholderAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfiguration.java
index 5affb3b2c2e..c784d218d20 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/PropertyPlaceholderAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfiguration.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config;
+package org.springframework.boot.autoconfigure;
 
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/BatchAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java
similarity index 77%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/BatchAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java
index 96c55ce2a3a..748815e560a 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/BatchAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.batch;
+package org.springframework.boot.autoconfigure.batch;
 
 import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.CommandLineRunner;
-import org.springframework.boot.strap.ExitCodeGenerator;
-import org.springframework.boot.strap.context.condition.ConditionalOnBean;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.ExitCodeGenerator;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnBean;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/BatchDatabaseInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDatabaseInitializer.java
similarity index 97%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/BatchDatabaseInitializer.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDatabaseInitializer.java
index 99e99e45332..3b8514abd88 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/BatchDatabaseInitializer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDatabaseInitializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.batch;
+package org.springframework.boot.autoconfigure.batch;
 
 import javax.annotation.PostConstruct;
 import javax.sql.DataSource;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobExecutionEvent.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionEvent.java
similarity index 95%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobExecutionEvent.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionEvent.java
index 064235c9320..fde47f745d7 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobExecutionEvent.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionEvent.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.batch;
+package org.springframework.boot.autoconfigure.batch;
 
 import org.springframework.batch.core.JobExecution;
 import org.springframework.context.ApplicationEvent;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobExecutionExitCodeGenerator.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGenerator.java
similarity index 93%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobExecutionExitCodeGenerator.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGenerator.java
index 4231c8013f0..351acb5930b 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobExecutionExitCodeGenerator.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGenerator.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.batch;
+package org.springframework.boot.autoconfigure.batch;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.batch.core.JobExecution;
-import org.springframework.boot.strap.ExitCodeGenerator;
+import org.springframework.boot.ExitCodeGenerator;
 import org.springframework.context.ApplicationListener;
 
 /**
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobLauncherCommandLineRunner.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
similarity index 96%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobLauncherCommandLineRunner.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
index a21f7e20aa1..8c5d7e03e36 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/batch/JobLauncherCommandLineRunner.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.batch;
+package org.springframework.boot.autoconfigure.batch;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -30,7 +30,7 @@ import org.springframework.batch.core.converter.DefaultJobParametersConverter;
 import org.springframework.batch.core.converter.JobParametersConverter;
 import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.strap.CommandLineRunner;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.stereotype.Component;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfiguration.java
similarity index 83%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfiguration.java
index f0a7ec4005b..21ee6019b73 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfiguration.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.data;
+package org.springframework.boot.autoconfigure.data;
 
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigureRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java
similarity index 97%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigureRegistrar.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java
index 8b8e73d97e2..9c33472e7fe 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigureRegistrar.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.data;
+package org.springframework.boot.autoconfigure.data;
 
 import java.util.Collection;
 import java.util.List;
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.boot.config.AutoConfigurationUtils;
+import org.springframework.boot.autoconfigure.AutoConfigurationUtils;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/AbstractDataSourceConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/AbstractDataSourceConfiguration.java
similarity index 98%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/AbstractDataSourceConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/AbstractDataSourceConfiguration.java
index ec7f14321f9..d4dced07463 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/AbstractDataSourceConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/AbstractDataSourceConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.jdbc;
+package org.springframework.boot.autoconfigure.jdbc;
 
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/BasicDataSourceConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/BasicDataSourceConfiguration.java
similarity index 97%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/BasicDataSourceConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/BasicDataSourceConfiguration.java
index 21c2bcfd566..3b066350b5f 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/BasicDataSourceConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/BasicDataSourceConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.jdbc;
+package org.springframework.boot.autoconfigure.jdbc;
 
 import java.sql.SQLException;
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/DataSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
similarity index 96%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/DataSourceAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
index f9477268a9d..975281e4c23 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/DataSourceAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.jdbc;
+package org.springframework.boot.autoconfigure.jdbc;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,10 +28,10 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.context.condition.ConditionLogUtils;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionLogUtils;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Condition;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
similarity index 83%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
index b0a57d75376..404c757618f 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.jdbc;
+package org.springframework.boot.autoconfigure.jdbc;
 
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.context.condition.ConditionalOnBean;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnBean;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java
similarity index 96%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java
index d952288ff4c..ffdf504efe2 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.jdbc;
+package org.springframework.boot.autoconfigure.jdbc;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -22,7 +22,7 @@ import java.util.Map;
 import javax.annotation.PreDestroy;
 import javax.sql.DataSource;
 
-import org.springframework.boot.config.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfiguration.java
similarity index 96%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfiguration.java
index e6f73136983..8ed8a48d97a 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.jdbc;
+package org.springframework.boot.autoconfigure.jdbc;
 
 import javax.annotation.PreDestroy;
 import javax.sql.DataSource;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
similarity index 94%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
index 06dbd2618bc..5c9666515bd 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.orm.jpa;
+package org.springframework.boot.autoconfigure.orm.jpa;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.hibernate.ejb.HibernateEntityManager;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/orm/jpa/JpaBaseConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java
similarity index 88%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/orm/jpa/JpaBaseConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java
index e90fe4f1b57..0fe5d02ad4e 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/orm/jpa/JpaBaseConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.orm.jpa;
+package org.springframework.boot.autoconfigure.orm.jpa;
 
 import java.util.List;
 
@@ -27,14 +27,14 @@ import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.boot.config.AutoConfigurationUtils;
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration;
-import org.springframework.boot.strap.context.condition.ConditionalOnBean;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnExpression;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
-import org.springframework.boot.strap.context.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.AutoConfigurationUtils;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnBean;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnExpression;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.orm.jpa.JpaTransactionManager;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/reactor/ReactorAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
similarity index 81%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/reactor/ReactorAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
index 9e61a96568a..718d5f184dc 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/reactor/ReactorAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.reactor;
+package org.springframework.boot.autoconfigure.reactor;
 
-import org.springframework.boot.config.AutoConfigureAfter;
-import org.springframework.boot.config.web.WebMvcAutoConfiguration;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
similarity index 92%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
index 781612f5a16..7b56514c134 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.thymeleaf;
+package org.springframework.boot.autoconfigure.thymeleaf;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,11 +27,11 @@ import nz.net.ultraq.thymeleaf.LayoutDialect;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.config.AutoConfigureAfter;
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.config.web.WebMvcAutoConfiguration;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.DefaultResourceLoader;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java
similarity index 82%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java
index 7f3afcc72da..57bc5c3c04f 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.web;
+package org.springframework.boot.autoconfigure.web;
 
 import javax.servlet.Servlet;
 
@@ -28,16 +28,16 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration.EmbeddedServletContainerCustomizerBeanPostProcessorRegistrar;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
-import org.springframework.boot.strap.context.condition.SearchStrategy;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.ServletContextInitializer;
-import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration.EmbeddedServletContainerCustomizerBeanPostProcessorRegistrar;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.condition.SearchStrategy;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.ServletContextInitializer;
+import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/MultipartAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java
similarity index 81%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/MultipartAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java
index 8c5fe3c073d..0d739467921 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/MultipartAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.web;
+package org.springframework.boot.autoconfigure.web;
 
 import javax.servlet.MultipartConfigElement;
 import javax.servlet.Servlet;
 
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.context.condition.ConditionalOnBean;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.embedded.EmbeddedWebApplicationContext;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnBean;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.multipart.support.StandardServletMultipartResolver;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/ServerPropertiesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java
similarity index 76%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/ServerPropertiesAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java
index af391a7870d..44045b3d674 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/ServerPropertiesAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.web;
+package org.springframework.boot.autoconfigure.web;
 
 import org.springframework.beans.BeansException;
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
-import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizer;
-import org.springframework.boot.strap.context.embedded.properties.ServerProperties;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
+import org.springframework.boot.context.embedded.properties.ServerProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
@@ -44,7 +44,7 @@ public class ServerPropertiesAutoConfiguration implements ApplicationContextAwar
 
 	private ApplicationContext applicationContext;
 
-	@Bean(name = "org.springframework.boot.strap.context.embedded.properties.ServerProperties")
+	@Bean(name = "org.springframework.boot.context.embedded.properties.ServerProperties")
 	@ConditionalOnMissingBean
 	public ServerProperties serverProperties() {
 		return new ServerProperties();
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/WebMvcAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
similarity index 93%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/WebMvcAutoConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
index cb8e988bab4..c633843173a 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/config/web/WebMvcAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.web;
+package org.springframework.boot.autoconfigure.web;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -25,11 +25,11 @@ import javax.servlet.Servlet;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.config.AutoConfigureAfter;
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.context.condition.ConditionalOnBean;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnBean;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
index 4bc3179f49f..311bbdf2311 100644
--- a/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
+++ b/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -1,15 +1,15 @@
 # Auto Configure
-org.springframework.boot.config.EnableAutoConfiguration=\
-org.springframework.boot.config.MessageSourceAutoConfiguration,\
-org.springframework.boot.config.PropertyPlaceholderAutoConfiguration,\
-org.springframework.boot.config.batch.BatchAutoConfiguration,\
-org.springframework.boot.config.data.JpaRepositoriesAutoConfiguration,\
-org.springframework.boot.config.jdbc.DataSourceAutoConfiguration,\
-org.springframework.boot.config.jdbc.DataSourceTransactionManagerAutoConfiguration,\
-org.springframework.boot.config.orm.jpa.HibernateJpaAutoConfiguration,\
-org.springframework.boot.config.reactor.ReactorAutoConfiguration,\
-org.springframework.boot.config.thymeleaf.ThymeleafAutoConfiguration,\
-org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration,\
-org.springframework.boot.config.web.ServerPropertiesAutoConfiguration,\
-org.springframework.boot.config.web.MultipartAutoConfiguration,\
-org.springframework.boot.config.web.WebMvcAutoConfiguration
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springframework.boot.autoconfigure.MessageSourceAutoConfiguration,\
+org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration,\
+org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration,\
+org.springframework.boot.autoconfigure.data.JpaRepositoriesAutoConfiguration,\
+org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,\
+org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration,\
+org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,\
+org.springframework.boot.autoconfigure.reactor.ReactorAutoConfiguration,\
+org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration,\
+org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration,\
+org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration,\
+org.springframework.boot.autoconfigure.web.MultipartAutoConfiguration,\
+org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/AdhocTestSuite.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AdhocTestSuite.java
similarity index 83%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/AdhocTestSuite.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AdhocTestSuite.java
index 5b62d501a2d..387592a0d99 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/AdhocTestSuite.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AdhocTestSuite.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config;
+package org.springframework.boot.autoconfigure;
 
 import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
-import org.springframework.boot.strap.SimpleMainTests;
-import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactoryTests;
+import org.springframework.boot.SimpleMainTests;
+import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactoryTests;
 
 /**
  * A test suite for probing weird ordering problems in the tests.
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/AutoConfigurationSorterTest.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTest.java
similarity index 94%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/AutoConfigurationSorterTest.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTest.java
index 1d10c2eae54..df4ad9bd5cc 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/AutoConfigurationSorterTest.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config;
+package org.springframework.boot.autoconfigure;
 
 import java.util.Arrays;
 import java.util.List;
@@ -23,8 +23,8 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.springframework.boot.config.AutoConfigurationSorter;
-import org.springframework.boot.config.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfigurationSorter;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.io.DefaultResourceLoader;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/ComponentScanDetectorConfiguration.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ComponentScanDetectorConfiguration.java
similarity index 88%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/ComponentScanDetectorConfiguration.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ComponentScanDetectorConfiguration.java
index 094258e198d..a9ea20a152d 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/ComponentScanDetectorConfiguration.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ComponentScanDetectorConfiguration.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config;
+package org.springframework.boot.autoconfigure;
 
-import org.springframework.boot.config.ComponentScanDetector;
+import org.springframework.boot.autoconfigure.ComponentScanDetector;
 import org.springframework.context.annotation.Import;
 
 /**
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/MessageSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java
similarity index 90%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/MessageSourceAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java
index 22a2ca0a858..2258f0d84b9 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/MessageSourceAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config;
+package org.springframework.boot.autoconfigure;
 
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
 import org.junit.Test;
-import org.springframework.boot.config.MessageSourceAutoConfiguration;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.MessageSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.core.env.MapPropertySource;
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/SpringJUnitTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java
similarity index 85%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/SpringJUnitTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java
index 8ef8e83b836..c74138d4257 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/SpringJUnitTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config;
+package org.springframework.boot.autoconfigure;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.config.SpringJUnitTests.TestConfiguration;
-import org.springframework.boot.strap.context.initializer.ConfigFileApplicationContextInitializer;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringJUnitTests.TestConfiguration;
+import org.springframework.boot.context.initializer.ConfigFileApplicationContextInitializer;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/batch/BatchAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java
similarity index 89%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/batch/BatchAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java
index c4ec19fc59e..7be7b84c29f 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/batch/BatchAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.batch;
+package org.springframework.boot.autoconfigure.batch;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -31,10 +31,10 @@ import org.springframework.batch.core.job.AbstractJob;
 import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.config.batch.BatchAutoConfiguration;
-import org.springframework.boot.config.batch.JobLauncherCommandLineRunner;
-import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
+import org.springframework.boot.autoconfigure.batch.JobLauncherCommandLineRunner;
+import org.springframework.boot.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/batch/JobExecutionExitCodeGeneratorTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java
similarity index 89%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/batch/JobExecutionExitCodeGeneratorTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java
index 118c54609d0..01d1c17fa92 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/batch/JobExecutionExitCodeGeneratorTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.batch;
+package org.springframework.boot.autoconfigure.batch;
 
 import org.junit.Test;
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobExecution;
-import org.springframework.boot.config.batch.JobExecutionEvent;
-import org.springframework.boot.config.batch.JobExecutionExitCodeGenerator;
+import org.springframework.boot.autoconfigure.batch.JobExecutionEvent;
+import org.springframework.boot.autoconfigure.batch.JobExecutionExitCodeGenerator;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java
similarity index 76%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java
index 1196c9e0c98..a2c0f4c5be9 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.data;
+package org.springframework.boot.autoconfigure.data;
 
 import javax.persistence.EntityManagerFactory;
 
 import org.junit.Test;
-import org.springframework.boot.config.ComponentScanDetectorConfiguration;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.config.data.JpaRepositoriesAutoConfiguration;
-import org.springframework.boot.config.data.test.City;
-import org.springframework.boot.config.data.test.CityRepository;
-import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration;
-import org.springframework.boot.config.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.ComponentScanDetectorConfiguration;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.JpaRepositoriesAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.test.City;
+import org.springframework.boot.autoconfigure.data.test.CityRepository;
+import org.springframework.boot.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/JpaWebAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaWebAutoConfigurationTests.java
similarity index 79%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/JpaWebAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaWebAutoConfigurationTests.java
index e5c603929cd..0c70b62833d 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/JpaWebAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/JpaWebAutoConfigurationTests.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.data;
+package org.springframework.boot.autoconfigure.data;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.config.data.JpaRepositoriesAutoConfiguration;
-import org.springframework.boot.config.data.test.City;
-import org.springframework.boot.config.data.test.CityRepository;
-import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration;
-import org.springframework.boot.config.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.JpaRepositoriesAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.test.City;
+import org.springframework.boot.autoconfigure.data.test.CityRepository;
+import org.springframework.boot.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.repository.support.DomainClassConverter;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/orm/jpa/test/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/test/City.java
similarity index 96%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/orm/jpa/test/City.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/test/City.java
index add14f7df84..4c8a9832659 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/orm/jpa/test/City.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/test/City.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.orm.jpa.test;
+package org.springframework.boot.autoconfigure.data.test;
 
 import java.io.Serializable;
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/test/CityRepository.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/test/CityRepository.java
similarity index 94%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/test/CityRepository.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/test/CityRepository.java
index 10bb86b9466..bc931f0491c 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/test/CityRepository.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/test/CityRepository.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.data.test;
+package org.springframework.boot.autoconfigure.data.test;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/BasicDataSourceConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java
similarity index 90%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/BasicDataSourceConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java
index 160e29653a6..99f6c2ef5a6 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/BasicDataSourceConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.jdbc;
+package org.springframework.boot.autoconfigure.jdbc;
 
 import javax.sql.DataSource;
 
 import org.junit.Test;
-import org.springframework.boot.config.jdbc.BasicDataSourceConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.BasicDataSourceConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/DataSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
similarity index 94%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/DataSourceAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
index ecf0ea7cc46..51c0d438832 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/DataSourceAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.jdbc;
+package org.springframework.boot.autoconfigure.jdbc;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,8 +23,8 @@ import javax.sql.DataSource;
 
 import org.apache.commons.dbcp.BasicDataSource;
 import org.junit.Test;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.config.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
similarity index 89%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
index 0515842659c..9ef2d637b8a 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.jdbc;
+package org.springframework.boot.autoconfigure.jdbc;
 
 import javax.sql.DataSource;
 
 import org.junit.Test;
-import org.springframework.boot.config.jdbc.DataSourceTransactionManagerAutoConfiguration;
-import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java
similarity index 90%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java
index d168a69c197..b882fc11239 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.jdbc;
+package org.springframework.boot.autoconfigure.jdbc;
 
 import javax.sql.DataSource;
 
 import org.junit.Test;
-import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
similarity index 90%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
index 48e9ba8c08d..9adf36b384f 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.jdbc;
+package org.springframework.boot.autoconfigure.jdbc;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -25,9 +25,9 @@ import javax.sql.DataSource;
 import org.junit.After;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration;
-import org.springframework.boot.config.jdbc.TomcatDataSourceConfiguration;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.TomcatDataSourceConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.util.ReflectionUtils;
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
similarity index 89%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
index 99f8d23d9dd..3675fd3c8eb 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.orm.jpa;
+package org.springframework.boot.autoconfigure.orm.jpa;
 
 import javax.sql.DataSource;
 
 import org.junit.After;
 import org.junit.Test;
-import org.springframework.boot.config.ComponentScanDetectorConfiguration;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.config.jdbc.DataSourceTransactionManagerAutoConfiguration;
-import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration;
-import org.springframework.boot.config.orm.jpa.HibernateJpaAutoConfiguration;
-import org.springframework.boot.config.orm.jpa.test.City;
-import org.springframework.boot.strap.TestUtils;
+import org.springframework.boot.TestUtils;
+import org.springframework.boot.autoconfigure.ComponentScanDetectorConfiguration;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.test.City;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/test/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/test/City.java
similarity index 96%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/test/City.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/test/City.java
index 67c44e95d5c..4bec85b99ee 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/data/test/City.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/test/City.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.data.test;
+package org.springframework.boot.autoconfigure.orm.jpa.test;
 
 import java.io.Serializable;
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/reactor/ReactorAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java
similarity index 89%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/reactor/ReactorAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java
index ef3d0a29a63..ca3c72cf057 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/reactor/ReactorAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.reactor;
+package org.springframework.boot.autoconfigure.reactor;
 
 import org.junit.Test;
-import org.springframework.boot.config.reactor.ReactorAutoConfiguration;
+import org.springframework.boot.autoconfigure.reactor.ReactorAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 import reactor.core.Reactor;
-
 import static org.junit.Assert.assertNotNull;
 
 /**
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
similarity index 93%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
index 3666339df43..980beaf98a8 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.thymeleaf;
+package org.springframework.boot.autoconfigure.thymeleaf;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -22,8 +22,8 @@ import java.util.Locale;
 import java.util.Map;
 
 import org.junit.Test;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.config.thymeleaf.ThymeleafAutoConfiguration;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.mock.web.MockHttpServletRequest;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
similarity index 84%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
index e9dedd197ff..ef9fa605782 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.web;
+package org.springframework.boot.autoconfigure.web;
 
 import javax.servlet.Servlet;
 
 import org.junit.Test;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration;
-import org.springframework.boot.strap.context.condition.ConditionalOnExpression;
-import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
-import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizer;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.MockEmbeddedServletContainerFactory;
+import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnExpression;
+import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
+import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.MockEmbeddedServletContainerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/MultipartAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java
similarity index 92%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/MultipartAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java
index 01e58ff0da5..272d1b17487 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/MultipartAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.web;
+package org.springframework.boot.autoconfigure.web;
 
 import javax.servlet.MultipartConfigElement;
 
@@ -22,11 +22,11 @@ import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration;
-import org.springframework.boot.config.web.MultipartAutoConfiguration;
-import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
-import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.MultipartAutoConfiguration;
+import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
+import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Controller;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/ServerPropertiesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java
similarity index 82%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/ServerPropertiesAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java
index 842542251cc..84347fc0092 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/ServerPropertiesAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.web;
+package org.springframework.boot.autoconfigure.web;
 
 import java.io.File;
 
@@ -25,15 +25,15 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.config.web.ServerPropertiesAutoConfiguration;
-import org.springframework.boot.strap.TestUtils;
-import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
-import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.properties.ServerProperties;
-import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.boot.TestUtils;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration;
+import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
+import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.properties.ServerProperties;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/WebMvcAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java
similarity index 87%
rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/WebMvcAutoConfigurationTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java
index 1f8de4636f8..c0d71bdeae5 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/config/web/WebMvcAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.config.web;
+package org.springframework.boot.autoconfigure.web;
 
 import java.util.Map;
 
@@ -25,11 +25,11 @@ import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.springframework.boot.config.web.WebMvcAutoConfiguration;
-import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.MockEmbeddedServletContainerFactory;
+import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.MockEmbeddedServletContainerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.HandlerAdapter;
diff --git a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/config/jdbc/schema.sql b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql
similarity index 100%
rename from spring-boot-autoconfigure/src/test/resources/org/springframework/boot/config/jdbc/schema.sql
rename to spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java
index 4800e5ebbe0..7deefee6cbc 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java
@@ -38,10 +38,9 @@ public class SpringBootCompilerAutoConfiguration extends CompilerAutoConfigurati
 
 	@Override
 	public void applyDependencies(DependencyCustomizer dependencies) {
-		dependencies.ifAnyMissingClasses(
-				"org.springframework.boot.strap.SpringApplication").add(
-				"org.springframework.boot", "spring-boot-up",
-				dependencies.getProperty("spring.boot.version"));
+		dependencies.ifAnyMissingClasses("org.springframework.boot.SpringApplication")
+				.add("org.springframework.boot", "spring-boot-up",
+						dependencies.getProperty("spring.boot.version"));
 	}
 
 	@Override
@@ -64,8 +63,8 @@ public class SpringBootCompilerAutoConfiguration extends CompilerAutoConfigurati
 				"org.springframework.context.MessageSource",
 				"org.springframework.core.annotation.Order",
 				"org.springframework.core.io.ResourceLoader",
-				"org.springframework.boot.strap.CommandLineRunner",
-				"org.springframework.boot.config.EnableAutoConfiguration");
+				"org.springframework.boot.CommandLineRunner",
+				"org.springframework.boot.autoconfigure.EnableAutoConfiguration");
 		imports.addStarImports("org.springframework.stereotype");
 	}
 
@@ -82,7 +81,7 @@ public class SpringBootCompilerAutoConfiguration extends CompilerAutoConfigurati
 		if (!hasEnableAutoConfigureAnnotation(classNode)) {
 			try {
 				Class<?> annotationClass = source.getClassLoader().loadClass(
-						"org.springframework.boot.config.EnableAutoConfiguration");
+						"org.springframework.boot.autoconfigure.EnableAutoConfiguration");
 				AnnotationNode annotationNode = new AnnotationNode(new ClassNode(
 						annotationClass));
 				classNode.addAnnotation(annotationNode);
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/runner/SpringApplicationRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/runner/SpringApplicationRunner.java
index 2bc174d08fa..074d2f8484c 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/runner/SpringApplicationRunner.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/runner/SpringApplicationRunner.java
@@ -135,7 +135,7 @@ public class SpringApplicationRunner {
 			try {
 				// User reflection to load and call Spring
 				Class<?> application = getContextClassLoader().loadClass(
-						"org.springframework.boot.strap.SpringApplication");
+						"org.springframework.boot.SpringApplication");
 				Method method = application.getMethod("run", Object[].class,
 						String[].class);
 				this.applicationContext = method.invoke(null, this.sources,
diff --git a/spring-boot-cli/src/test/resources/logback.xml b/spring-boot-cli/src/test/resources/logback.xml
index 845832cda61..91bcaffa1d0 100644
--- a/spring-boot-cli/src/test/resources/logback.xml
+++ b/spring-boot-cli/src/test/resources/logback.xml
@@ -2,7 +2,7 @@
 <configuration>
 	<property name="CONSOLE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%t] --- %-40.40logger{39} : %m%n%wex"/>
 
-	<conversionRule conversionWord="wex" converterClass="org.springframework.bootstrap.logging.logback.WhitespaceThrowableProxyConverter" />
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
 
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
@@ -13,7 +13,7 @@
 	<root level="INFO">
 		<appender-ref ref="CONSOLE" />
 	</root>
-	
+
 	<!-- logger name="org.springframework" level="DEBUG"/-->
-	
+
 </configuration>
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/Archive.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/Archive.java
similarity index 98%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/Archive.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/Archive.java
index 7161c1d8def..bda0cf5f5d5 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/Archive.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/Archive.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load;
+package org.springframework.boot.loader;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/ExplodedArchive.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExplodedArchive.java
similarity index 99%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/ExplodedArchive.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/ExplodedArchive.java
index 95069ad9c01..c98d0a8fe4a 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/ExplodedArchive.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExplodedArchive.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load;
+package org.springframework.boot.loader;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/JarFileArchive.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarFileArchive.java
similarity index 94%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/JarFileArchive.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/JarFileArchive.java
index ee270f5df4d..e4387f6e2e3 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/JarFileArchive.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarFileArchive.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load;
+package org.springframework.boot.loader;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,8 +27,8 @@ import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.Manifest;
 
-import org.springframework.boot.load.jar.JarEntryFilter;
-import org.springframework.boot.load.jar.RandomAccessJarFile;
+import org.springframework.boot.loader.jar.JarEntryFilter;
+import org.springframework.boot.loader.jar.RandomAccessJarFile;
 
 /**
  * {@link Archive} implementation backed by a {@link RandomAccessJarFile}.
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/JarLauncher.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarLauncher.java
similarity index 96%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/JarLauncher.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/JarLauncher.java
index d6c371a4cda..87720bdd9d2 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/JarLauncher.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/JarLauncher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load;
+package org.springframework.boot.loader;
 
 import java.util.List;
 
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/LaunchedURLClassLoader.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
similarity index 96%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/LaunchedURLClassLoader.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
index 186fa5a97d6..bae9a6f43bd 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/LaunchedURLClassLoader.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load;
+package org.springframework.boot.loader;
 
 import java.io.IOException;
 import java.net.URL;
@@ -22,7 +22,7 @@ import java.net.URLClassLoader;
 import java.security.AccessController;
 import java.security.PrivilegedExceptionAction;
 
-import org.springframework.boot.load.jar.RandomAccessJarFile;
+import org.springframework.boot.loader.jar.RandomAccessJarFile;
 
 /**
  * {@link ClassLoader} used by the {@link Launcher}.
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/Launcher.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java
similarity index 99%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/Launcher.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java
index f6f9b73c02f..5130b22fe19 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/Launcher.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load;
+package org.springframework.boot.loader;
 
 import java.io.File;
 import java.lang.reflect.Constructor;
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/MainMethodRunner.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/MainMethodRunner.java
similarity index 97%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/MainMethodRunner.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/MainMethodRunner.java
index 6f1a79b1fa2..2c2f6b4b40b 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/MainMethodRunner.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/MainMethodRunner.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load;
+package org.springframework.boot.loader;
 
 import java.lang.reflect.Method;
 
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/WarLauncher.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/WarLauncher.java
similarity index 98%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/WarLauncher.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/WarLauncher.java
index 2803af2dede..34a269613a3 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/WarLauncher.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/WarLauncher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load;
+package org.springframework.boot.loader;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/data/RandomAccessData.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessData.java
similarity index 97%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/data/RandomAccessData.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessData.java
index 8c583283b21..2e05d070696 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/data/RandomAccessData.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessData.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load.data;
+package org.springframework.boot.loader.data;
 
 import java.io.InputStream;
 
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/data/RandomAccessDataFile.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
similarity index 99%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/data/RandomAccessDataFile.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
index e25e5542165..5170b05b483 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/data/RandomAccessDataFile.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load.data;
+package org.springframework.boot.loader.data;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/data/package-info.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/package-info.java
similarity index 86%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/data/package-info.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/data/package-info.java
index 34039e34feb..8d0a098adca 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/data/package-info.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/package-info.java
@@ -17,7 +17,7 @@
 /**
  * Classes and interfaces to allows random access to a block of data.
  *
- *  @see org.springframework.boot.load.data.RandomAccessData
+ *  @see org.springframework.boot.loader.data.RandomAccessData
  */
-package org.springframework.boot.load.data;
+package org.springframework.boot.loader.data;
 
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/JarEntryFilter.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.java
similarity index 96%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/jar/JarEntryFilter.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.java
index 443bbc073e2..421b9571f4c 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/JarEntryFilter.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load.jar;
+package org.springframework.boot.loader.jar;
 
 import java.util.jar.JarEntry;
 
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipEntry.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipEntry.java
similarity index 92%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipEntry.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipEntry.java
index 0f8056c9fd3..215639631f6 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipEntry.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipEntry.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load.jar;
+package org.springframework.boot.loader.jar;
 
 import java.util.zip.ZipEntry;
 
-import org.springframework.boot.load.data.RandomAccessData;
+import org.springframework.boot.loader.data.RandomAccessData;
 
 /**
  * A {@link ZipEntry} returned from a {@link RandomAccessDataZipInputStream}.
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStream.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStream.java
similarity index 96%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStream.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStream.java
index 2f7bc86bd92..05ac7b868a5 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStream.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStream.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load.jar;
+package org.springframework.boot.loader.jar;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
@@ -23,7 +23,7 @@ import java.io.PushbackInputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import org.springframework.boot.load.data.RandomAccessData;
+import org.springframework.boot.loader.data.RandomAccessData;
 
 /**
  * A {@link ZipInputStream} backed by {@link RandomAccessData}. Parsed entries provide
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessJarFile.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessJarFile.java
similarity index 98%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessJarFile.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessJarFile.java
index af87b3fcd6f..56d58f07565 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/RandomAccessJarFile.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/RandomAccessJarFile.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load.jar;
+package org.springframework.boot.loader.jar;
 
 import java.io.BufferedInputStream;
 import java.io.EOFException;
@@ -39,8 +39,8 @@ import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
 import java.util.zip.ZipEntry;
 
-import org.springframework.boot.load.data.RandomAccessData;
-import org.springframework.boot.load.data.RandomAccessDataFile;
+import org.springframework.boot.loader.data.RandomAccessData;
+import org.springframework.boot.loader.data.RandomAccessDataFile;
 
 /**
  * A Jar file that can loaded from a {@link RandomAccessDataFile}. This class extends and
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/package-info.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/package-info.java
similarity index 93%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/jar/package-info.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/package-info.java
index 31ab1513b2a..010d22b2311 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/jar/package-info.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/package-info.java
@@ -17,5 +17,5 @@
 /**
  * Support for loading and manipulating JAR/WAR files.
  */
-package org.springframework.boot.load.jar;
+package org.springframework.boot.loader.jar;
 
diff --git a/spring-boot-loader/src/main/java/org/springframework/boot/load/package-info.java b/spring-boot-loader/src/main/java/org/springframework/boot/loader/package-info.java
similarity index 86%
rename from spring-boot-loader/src/main/java/org/springframework/boot/load/package-info.java
rename to spring-boot-loader/src/main/java/org/springframework/boot/loader/package-info.java
index d52d7137b7d..b094cc86039 100644
--- a/spring-boot-loader/src/main/java/org/springframework/boot/load/package-info.java
+++ b/spring-boot-loader/src/main/java/org/springframework/boot/loader/package-info.java
@@ -20,8 +20,8 @@
  * no need to create shade style jars) and are executed without unpacking. The only
  * constraint is that nested JARs must be stored in the archive uncompressed.
  *
- * @see org.springframework.boot.load.JarLauncher
- * @see org.springframework.boot.load.WarLauncher
+ * @see org.springframework.boot.loader.JarLauncher
+ * @see org.springframework.boot.loader.WarLauncher
  */
-package org.springframework.boot.load;
+package org.springframework.boot.loader;
 
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/load/ByteArrayStartsWith.java b/spring-boot-loader/src/test/java/org/springframework/boot/loader/ByteArrayStartsWith.java
similarity index 97%
rename from spring-boot-loader/src/test/java/org/springframework/boot/load/ByteArrayStartsWith.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/loader/ByteArrayStartsWith.java
index 81b81084d2c..59b9cbacf58 100644
--- a/spring-boot-loader/src/test/java/org/springframework/boot/load/ByteArrayStartsWith.java
+++ b/spring-boot-loader/src/test/java/org/springframework/boot/loader/ByteArrayStartsWith.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load;
+package org.springframework.boot.loader;
 
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/load/ExplodedArchiveTests.java b/spring-boot-loader/src/test/java/org/springframework/boot/loader/ExplodedArchiveTests.java
similarity index 95%
rename from spring-boot-loader/src/test/java/org/springframework/boot/load/ExplodedArchiveTests.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/loader/ExplodedArchiveTests.java
index 00b656a1f01..a8512aae6d0 100644
--- a/spring-boot-loader/src/test/java/org/springframework/boot/load/ExplodedArchiveTests.java
+++ b/spring-boot-loader/src/test/java/org/springframework/boot/loader/ExplodedArchiveTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load;
+package org.springframework.boot.loader;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -33,9 +33,9 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.springframework.boot.load.Archive;
-import org.springframework.boot.load.ExplodedArchive;
-import org.springframework.boot.load.Archive.Entry;
+import org.springframework.boot.loader.Archive;
+import org.springframework.boot.loader.ExplodedArchive;
+import org.springframework.boot.loader.Archive.Entry;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/load/JarFileArchiveTests.java b/spring-boot-loader/src/test/java/org/springframework/boot/loader/JarFileArchiveTests.java
similarity index 93%
rename from spring-boot-loader/src/test/java/org/springframework/boot/load/JarFileArchiveTests.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/loader/JarFileArchiveTests.java
index f7ae0b33868..b880fb8bb07 100644
--- a/spring-boot-loader/src/test/java/org/springframework/boot/load/JarFileArchiveTests.java
+++ b/spring-boot-loader/src/test/java/org/springframework/boot/loader/JarFileArchiveTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load;
+package org.springframework.boot.loader;
 
 import java.io.File;
 import java.net.URL;
@@ -25,9 +25,9 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.springframework.boot.load.Archive;
-import org.springframework.boot.load.JarFileArchive;
-import org.springframework.boot.load.Archive.Entry;
+import org.springframework.boot.loader.Archive;
+import org.springframework.boot.loader.JarFileArchive;
+import org.springframework.boot.loader.Archive.Entry;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/load/TestJarCreator.java b/spring-boot-loader/src/test/java/org/springframework/boot/loader/TestJarCreator.java
similarity index 98%
rename from spring-boot-loader/src/test/java/org/springframework/boot/load/TestJarCreator.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/loader/TestJarCreator.java
index 483b9bc1fef..4ca5f1e4924 100644
--- a/spring-boot-loader/src/test/java/org/springframework/boot/load/TestJarCreator.java
+++ b/spring-boot-loader/src/test/java/org/springframework/boot/loader/TestJarCreator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load;
+package org.springframework.boot.loader;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/load/data/RandomAccessDataFileTests.java b/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java
similarity index 97%
rename from spring-boot-loader/src/test/java/org/springframework/boot/load/data/RandomAccessDataFileTests.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java
index b07121fdedb..6cee3a404b6 100644
--- a/spring-boot-loader/src/test/java/org/springframework/boot/load/data/RandomAccessDataFileTests.java
+++ b/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load.data;
+package org.springframework.boot.loader.data;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
@@ -39,9 +39,9 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-import org.springframework.boot.load.ByteArrayStartsWith;
-import org.springframework.boot.load.data.RandomAccessData;
-import org.springframework.boot.load.data.RandomAccessDataFile;
+import org.springframework.boot.loader.ByteArrayStartsWith;
+import org.springframework.boot.loader.data.RandomAccessData;
+import org.springframework.boot.loader.data.RandomAccessDataFile;
 
 /**
  * Tests for {@link RandomAccessDataFile}.
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStreamTests.java b/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStreamTests.java
similarity index 91%
rename from spring-boot-loader/src/test/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStreamTests.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStreamTests.java
index 234cb3dec75..2111fb370b9 100644
--- a/spring-boot-loader/src/test/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStreamTests.java
+++ b/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessDataZipInputStreamTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load.jar;
+package org.springframework.boot.loader.jar;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
@@ -31,9 +31,9 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.springframework.boot.load.data.RandomAccessDataFile;
-import org.springframework.boot.load.jar.RandomAccessDataZipEntry;
-import org.springframework.boot.load.jar.RandomAccessDataZipInputStream;
+import org.springframework.boot.loader.data.RandomAccessDataFile;
+import org.springframework.boot.loader.jar.RandomAccessDataZipEntry;
+import org.springframework.boot.loader.jar.RandomAccessDataZipInputStream;
 
 /**
  * Tests for {@link RandomAccessDataZipInputStream}.
diff --git a/spring-boot-loader/src/test/java/org/springframework/boot/load/jar/RandomAccessJarFileTests.java b/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessJarFileTests.java
similarity index 97%
rename from spring-boot-loader/src/test/java/org/springframework/boot/load/jar/RandomAccessJarFileTests.java
rename to spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessJarFileTests.java
index f55aa7a4d80..5e84bf454c0 100644
--- a/spring-boot-loader/src/test/java/org/springframework/boot/load/jar/RandomAccessJarFileTests.java
+++ b/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/RandomAccessJarFileTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.load.jar;
+package org.springframework.boot.loader.jar;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -32,10 +32,10 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-import org.springframework.boot.load.TestJarCreator;
-import org.springframework.boot.load.data.RandomAccessDataFile;
-import org.springframework.boot.load.jar.JarEntryFilter;
-import org.springframework.boot.load.jar.RandomAccessJarFile;
+import org.springframework.boot.loader.TestJarCreator;
+import org.springframework.boot.loader.data.RandomAccessDataFile;
+import org.springframework.boot.loader.jar.JarEntryFilter;
+import org.springframework.boot.loader.jar.RandomAccessJarFile;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
diff --git a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableJarHelper.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableJarHelper.java
index 60921440b15..359920a1657 100644
--- a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableJarHelper.java
+++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableJarHelper.java
@@ -43,6 +43,6 @@ public class ExecutableJarHelper implements ArchiveHelper {
 
 	@Override
 	public String getLauncherClass() {
-		return "org.springframework.boot.load.JarLauncher";
+		return "org.springframework.boot.loader.JarLauncher";
 	}
 }
diff --git a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableWarHelper.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableWarHelper.java
index d4d86915dfe..713956d11fe 100644
--- a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableWarHelper.java
+++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableWarHelper.java
@@ -46,6 +46,6 @@ public class ExecutableWarHelper implements ArchiveHelper {
 
 	@Override
 	public String getLauncherClass() {
-		return "org.springframework.boot.load.WarLauncher";
+		return "org.springframework.boot.loader.WarLauncher";
 	}
 }
diff --git a/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java b/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java
index bba2dda1ca7..2e71889855b 100644
--- a/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java
+++ b/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java
@@ -109,14 +109,14 @@ public class Verify {
 			assertHasEntryNameStartingWith(entries, "lib/spring-core");
 			assertHasEntryNameStartingWith(entries, "lib/javax.servlet-api-3.0.1.jar");
 			assertTrue("Unpacked launcher classes", entries.containsKey("org/"
-					+ "springframework/boot/load/JarLauncher.class"));
+					+ "springframework/boot/loader/JarLauncher.class"));
 			assertTrue("Own classes", entries.containsKey("org/"
 					+ "test/SampleApplication.class"));
 		}
 
 		@Override
 		protected void verifyManifest(Manifest manifest) throws Exception {
-			assertEquals("org.springframework.boot.load.JarLauncher", manifest
+			assertEquals("org.springframework.boot.loader.JarLauncher", manifest
 					.getMainAttributes().getValue("Main-Class"));
 			assertEquals(this.main, manifest.getMainAttributes().getValue("Start-Class"));
 			assertEquals("Foo", manifest.getMainAttributes().getValue("Not-Used"));
@@ -138,7 +138,7 @@ public class Verify {
 			assertHasEntryNameStartingWith(entries,
 					"WEB-INF/lib-provided/javax.servlet-api-3.0.1.jar");
 			assertTrue("Unpacked launcher classes", entries.containsKey("org/"
-					+ "springframework/boot/load/JarLauncher.class"));
+					+ "springframework/boot/loader/JarLauncher.class"));
 			assertTrue("Own classes", entries.containsKey("WEB-INF/classes/org/"
 					+ "test/SampleApplication.class"));
 			assertTrue("Web content", entries.containsKey("index.html"));
@@ -146,7 +146,7 @@ public class Verify {
 
 		@Override
 		protected void verifyManifest(Manifest manifest) throws Exception {
-			assertEquals("org.springframework.boot.load.WarLauncher", manifest
+			assertEquals("org.springframework.boot.loader.WarLauncher", manifest
 					.getMainAttributes().getValue("Main-Class"));
 			assertEquals("org.test.SampleApplication", manifest.getMainAttributes()
 					.getValue("Start-Class"));
diff --git a/spring-boot-ops/docs/Features.md b/spring-boot-ops/docs/Features.md
index f3b6e4d175f..652e2fcffd0 100644
--- a/spring-boot-ops/docs/Features.md
+++ b/spring-boot-ops/docs/Features.md
@@ -7,7 +7,7 @@ getting started project from the main README), and then try each
 feature in turn there.
 
 Many useful features of
-[Spring Bootstrap](../../spring-bootstrap/README.md) are all available
+[Spring Boot](../../spring-boot/README.md) are all available
 in an Actuator application.
 
 TODO: group things together and break them out into separate files.
diff --git a/spring-boot-ops/pom.xml b/spring-boot-ops/pom.xml
index 18b195c28f6..ed3d5c2f05f 100644
--- a/spring-boot-ops/pom.xml
+++ b/spring-boot-ops/pom.xml
@@ -74,7 +74,7 @@
 		<!-- Test -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-strap</artifactId>
+			<artifactId>spring-boot</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java
index 586b91c15f9..5975802cc5e 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java
@@ -17,15 +17,15 @@
 package org.springframework.boot.ops.autoconfigure;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.config.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.boot.ops.audit.AuditEvent;
 import org.springframework.boot.ops.audit.AuditEventRepository;
 import org.springframework.boot.ops.audit.InMemoryAuditEventRepository;
 import org.springframework.boot.ops.audit.listener.AuditListener;
 import org.springframework.boot.ops.security.AuthenticationAuditListener;
 import org.springframework.boot.ops.security.AuthorizationAuditListener;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java
index fa8309bac8d..56ccc5fccb0 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java
@@ -22,7 +22,9 @@ import java.util.Properties;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.config.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.bind.PropertiesConfigurationFactory;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.boot.ops.endpoint.BeansEndpoint;
 import org.springframework.boot.ops.endpoint.DumpEndpoint;
 import org.springframework.boot.ops.endpoint.Endpoint;
@@ -40,8 +42,6 @@ import org.springframework.boot.ops.metrics.InMemoryMetricRepository;
 import org.springframework.boot.ops.metrics.MetricRepository;
 import org.springframework.boot.ops.trace.InMemoryTraceRepository;
 import org.springframework.boot.ops.trace.TraceRepository;
-import org.springframework.boot.strap.bind.PropertiesConfigurationFactory;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java
index d4d62947951..03494729696 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java
@@ -22,19 +22,19 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.config.AutoConfigureAfter;
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration;
-import org.springframework.boot.config.web.WebMvcAutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
+import org.springframework.boot.context.embedded.properties.ServerProperties;
 import org.springframework.boot.ops.endpoint.Endpoint;
 import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerAdapter;
 import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerMapping;
 import org.springframework.boot.ops.properties.ManagementServerProperties;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
-import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
-import org.springframework.boot.strap.context.embedded.properties.ServerProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationListener;
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java
index 4274a844826..3cbbab70401 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java
@@ -21,15 +21,15 @@ import javax.servlet.Filter;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.HierarchicalBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.condition.ConditionalOnBean;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.SearchStrategy;
+import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.EmbeddedServletContainer;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
 import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerAdapter;
 import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerMapping;
 import org.springframework.boot.ops.properties.ManagementServerProperties;
-import org.springframework.boot.strap.context.condition.ConditionalOnBean;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.SearchStrategy;
-import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java
index fd6b52c6796..a81c7586fcc 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java
@@ -19,14 +19,14 @@ package org.springframework.boot.ops.autoconfigure;
 import javax.servlet.Servlet;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.config.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
+import org.springframework.boot.context.embedded.ErrorPage;
 import org.springframework.boot.ops.web.BasicErrorController;
 import org.springframework.boot.ops.web.ErrorController;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
-import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizer;
-import org.springframework.boot.strap.context.embedded.ErrorPage;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.servlet.DispatcherServlet;
 
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
index da8458421f7..9c68e0c7905 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
@@ -16,12 +16,12 @@
 
 package org.springframework.boot.ops.autoconfigure;
 
-import org.springframework.boot.config.AutoConfigureAfter;
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.config.web.ServerPropertiesAutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ops.properties.ManagementServerProperties;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java
index 8b6f09f190c..812cada76bb 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java
@@ -28,12 +28,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.config.AutoConfigureAfter;
-import org.springframework.boot.config.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnBean;
+import org.springframework.boot.context.condition.ConditionalOnClass;
 import org.springframework.boot.ops.metrics.CounterService;
 import org.springframework.boot.ops.metrics.GaugeService;
-import org.springframework.boot.strap.context.condition.ConditionalOnBean;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java
index 295e236882a..5a8d7a5a455 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java
@@ -16,14 +16,14 @@
 
 package org.springframework.boot.ops.autoconfigure;
 
-import org.springframework.boot.config.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.boot.ops.metrics.CounterService;
 import org.springframework.boot.ops.metrics.DefaultCounterService;
 import org.springframework.boot.ops.metrics.DefaultGaugeService;
 import org.springframework.boot.ops.metrics.GaugeService;
 import org.springframework.boot.ops.metrics.InMemoryMetricRepository;
 import org.springframework.boot.ops.metrics.MetricRepository;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java
index dfaac6ffaa1..703bdd20d17 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java
@@ -21,14 +21,14 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.config.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ops.endpoint.Endpoint;
 import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerMapping;
 import org.springframework.boot.ops.properties.SecurityProperties;
 import org.springframework.boot.ops.web.ErrorController;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java
index d6ba454f15e..ae5858de69c 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java
@@ -16,10 +16,10 @@
 
 package org.springframework.boot.ops.autoconfigure;
 
-import org.springframework.boot.config.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.boot.ops.trace.InMemoryTraceRepository;
 import org.springframework.boot.ops.trace.TraceRepository;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java
index 921f6fe586c..b879dc3b4fc 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java
@@ -21,11 +21,11 @@ import javax.servlet.Servlet;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.config.AutoConfigureAfter;
-import org.springframework.boot.config.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.condition.ConditionalOnClass;
 import org.springframework.boot.ops.trace.TraceRepository;
 import org.springframework.boot.ops.trace.WebRequestTraceFilter;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.servlet.DispatcherServlet;
 
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java
index b60e7b9ace6..bd6a6eb8d94 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java
@@ -17,7 +17,7 @@
 package org.springframework.boot.ops.endpoint;
 
 import org.springframework.beans.BeansException;
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.support.LiveBeansView;
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java
index 814e7c22783..76d65ff7a1a 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java
@@ -21,7 +21,7 @@ import java.lang.management.ThreadInfo;
 import java.util.Arrays;
 import java.util.List;
 
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * {@link Endpoint} to expose thread info.
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java
index 2254305a2db..c17be6a3da0 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java
@@ -19,7 +19,7 @@ package org.springframework.boot.ops.endpoint;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.EnumerablePropertySource;
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java
index 3bf18d9eb8e..8233e4b2979 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java
@@ -16,8 +16,8 @@
 
 package org.springframework.boot.ops.endpoint;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.ops.health.HealthIndicator;
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java
index 8992745e3ba..60dbfa801d4 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java
@@ -20,7 +20,7 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java
index 66df7f6a7dd..d95cd426024 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java
@@ -19,8 +19,8 @@ package org.springframework.boot.ops.endpoint;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.ops.metrics.Metric;
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java
index 6245aabdef8..d9ecd347d5b 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java
@@ -21,8 +21,8 @@ import java.util.Map;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.ops.properties.ManagementServerProperties;
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java
index 74a5db7db4a..ed3d1f56e1a 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java
@@ -18,9 +18,9 @@ package org.springframework.boot.ops.endpoint;
 
 import java.util.List;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.ops.trace.Trace;
 import org.springframework.boot.ops.trace.TraceRepository;
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java
index 67367021028..f031649b24f 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java
@@ -20,8 +20,8 @@ import java.net.InetAddress;
 
 import javax.validation.constraints.NotNull;
 
-import org.springframework.boot.strap.context.embedded.properties.ServerProperties;
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.embedded.properties.ServerProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * Properties for the management server (e.g. port and path settings).
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java
index 36cbabcf2eb..217d31a1e0d 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java
@@ -16,7 +16,7 @@
 
 package org.springframework.boot.ops.properties;
 
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.security.config.annotation.web.configurers.SessionCreationPolicy;
 
 /**
diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java
index 57a288f52ec..0be7f355dba 100644
--- a/spring-boot-ops/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java
+++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.AbstractEmbeddedServletContainerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spring-boot-ops/src/main/resources/META-INF/spring.factories b/spring-boot-ops/src/main/resources/META-INF/spring.factories
index e997a1aba60..5756f0fe3d6 100644
--- a/spring-boot-ops/src/main/resources/META-INF/spring.factories
+++ b/spring-boot-ops/src/main/resources/META-INF/spring.factories
@@ -1,4 +1,4 @@
-org.springframework.boot.config.EnableAutoConfiguration=\
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.boot.ops.autoconfigure.AuditAutoConfiguration,\
 org.springframework.boot.ops.autoconfigure.EndpointAutoConfiguration,\
 org.springframework.boot.ops.autoconfigure.EndpointWebMvcAutoConfiguration,\
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java
index 2c575bbc663..165a7a7b551 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java
@@ -18,6 +18,7 @@ package org.springframework.boot.ops.autoconfigure;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.boot.TestUtils;
 import org.springframework.boot.ops.autoconfigure.EndpointAutoConfiguration;
 import org.springframework.boot.ops.endpoint.BeansEndpoint;
 import org.springframework.boot.ops.endpoint.DumpEndpoint;
@@ -27,7 +28,6 @@ import org.springframework.boot.ops.endpoint.InfoEndpoint;
 import org.springframework.boot.ops.endpoint.MetricsEndpoint;
 import org.springframework.boot.ops.endpoint.ShutdownEndpoint;
 import org.springframework.boot.ops.endpoint.TraceEndpoint;
-import org.springframework.boot.strap.TestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 import static org.junit.Assert.assertEquals;
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
index 509ed7764cd..4f9096889cb 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
@@ -23,17 +23,17 @@ import java.nio.charset.Charset;
 
 import org.junit.After;
 import org.junit.Test;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration;
-import org.springframework.boot.config.web.ServerPropertiesAutoConfiguration;
-import org.springframework.boot.config.web.WebMvcAutoConfiguration;
+import org.springframework.boot.TestUtils;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
 import org.springframework.boot.ops.autoconfigure.EndpointWebMvcAutoConfiguration;
 import org.springframework.boot.ops.autoconfigure.ManagementServerPropertiesAutoConfiguration;
 import org.springframework.boot.ops.endpoint.AbstractEndpoint;
 import org.springframework.boot.ops.endpoint.Endpoint;
 import org.springframework.boot.ops.properties.ManagementServerProperties;
-import org.springframework.boot.strap.TestUtils;
-import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java
index 3e2137e5a1c..eb923a56ee3 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java
@@ -17,7 +17,7 @@
 package org.springframework.boot.ops.autoconfigure;
 
 import org.junit.Test;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.ops.autoconfigure.EndpointAutoConfiguration;
 import org.springframework.boot.ops.autoconfigure.SecurityAutoConfiguration;
 import org.springframework.context.annotation.Bean;
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java
index 6babb455170..cce79934dda 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java
@@ -17,7 +17,7 @@
 package org.springframework.boot.ops.autoconfigure;
 
 import org.junit.Test;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.ops.autoconfigure.TraceRepositoryAutoConfiguration;
 import org.springframework.boot.ops.autoconfigure.TraceWebFilterAutoConfiguration;
 import org.springframework.boot.ops.trace.WebRequestTraceFilter;
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java
index 69772423fc7..f2b3dd95e4b 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java
@@ -20,8 +20,8 @@ import java.util.Collections;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.boot.TestUtils;
 import org.springframework.boot.ops.endpoint.Endpoint;
-import org.springframework.boot.strap.TestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.PropertySource;
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java
index f136aac4ff6..bc7cdeb570e 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java
@@ -17,8 +17,8 @@
 package org.springframework.boot.ops.endpoint;
 
 import org.junit.Test;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ops.endpoint.BeansEndpoint;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java
index c8c6cef70e8..7101799e2d0 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java
@@ -20,8 +20,8 @@ import java.lang.management.ThreadInfo;
 import java.util.List;
 
 import org.junit.Test;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ops.endpoint.DumpEndpoint;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java
index eaf3ba3470d..eed0fc87a33 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java
@@ -17,8 +17,8 @@
 package org.springframework.boot.ops.endpoint;
 
 import org.junit.Test;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ops.endpoint.EnvironmentEndpoint;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java
index 5d9eea55fb9..b4b069df04b 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java
@@ -17,9 +17,9 @@
 package org.springframework.boot.ops.endpoint;
 
 import org.junit.Test;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ops.endpoint.HealthEndpoint;
 import org.springframework.boot.ops.health.HealthIndicator;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java
index 6e999c17d59..422d60200af 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java
@@ -19,8 +19,8 @@ package org.springframework.boot.ops.endpoint;
 import java.util.Collections;
 
 import org.junit.Test;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ops.endpoint.InfoEndpoint;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java
index e9c7f234518..8a8d497f7d6 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java
@@ -20,10 +20,10 @@ import java.util.Collection;
 import java.util.Collections;
 
 import org.junit.Test;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ops.endpoint.MetricsEndpoint;
 import org.springframework.boot.ops.endpoint.PublicMetrics;
 import org.springframework.boot.ops.metrics.Metric;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java
index 7a88efef437..0a94827ce8e 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java
@@ -17,9 +17,9 @@
 package org.springframework.boot.ops.endpoint;
 
 import org.junit.Test;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ops.endpoint.ShutdownEndpoint;
 import org.springframework.boot.ops.properties.ManagementServerProperties;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java
index fdd6a03d42f..f1561c8f705 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java
@@ -19,11 +19,11 @@ package org.springframework.boot.ops.endpoint;
 import java.util.Collections;
 
 import org.junit.Test;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ops.endpoint.TraceEndpoint;
 import org.springframework.boot.ops.trace.InMemoryTraceRepository;
 import org.springframework.boot.ops.trace.Trace;
 import org.springframework.boot.ops.trace.TraceRepository;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java
index 029d3230808..2b9f1d26e01 100644
--- a/spring-boot-ops/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java
+++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java
@@ -20,8 +20,8 @@ import java.util.Collections;
 
 import org.junit.Test;
 import org.springframework.beans.MutablePropertyValues;
+import org.springframework.boot.bind.RelaxedDataBinder;
 import org.springframework.boot.ops.properties.SecurityProperties;
-import org.springframework.boot.strap.bind.RelaxedDataBinder;
 import org.springframework.core.convert.support.DefaultConversionService;
 
 import static org.junit.Assert.assertEquals;
diff --git a/spring-boot-samples/spring-boot-sample-batch/src/main/java/org/springframework/boot/sample/batch/SampleBatchApplication.java b/spring-boot-samples/spring-boot-sample-batch/src/main/java/org/springframework/boot/sample/batch/SampleBatchApplication.java
index 6fbd1e354cd..55296c92aaa 100644
--- a/spring-boot-samples/spring-boot-sample-batch/src/main/java/org/springframework/boot/sample/batch/SampleBatchApplication.java
+++ b/spring-boot-samples/spring-boot-sample-batch/src/main/java/org/springframework/boot/sample/batch/SampleBatchApplication.java
@@ -26,8 +26,8 @@ import org.springframework.batch.core.scope.context.ChunkContext;
 import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.repeat.RepeatStatus;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.SpringApplication;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot-samples/spring-boot-sample-batch/src/test/java/org/springframework/boot/sample/batch/SampleBatchApplicationTests.java b/spring-boot-samples/spring-boot-sample-batch/src/test/java/org/springframework/boot/sample/batch/SampleBatchApplicationTests.java
index 55cba6ee4b7..0aa3719b8cf 100644
--- a/spring-boot-samples/spring-boot-sample-batch/src/test/java/org/springframework/boot/sample/batch/SampleBatchApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-batch/src/test/java/org/springframework/boot/sample/batch/SampleBatchApplicationTests.java
@@ -22,8 +22,8 @@ import java.io.PrintStream;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.batch.SampleBatchApplication;
-import org.springframework.boot.strap.SpringApplication;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java
index 1b34ffc6b46..17ac0c4cc71 100644
--- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java
+++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java
@@ -16,8 +16,8 @@
 
 package org.springframework.boot.sample.data.jpa;
 
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.SpringApplication;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java
index e2c0c1cc3ae..0b1caa15da2 100644
--- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java
@@ -25,8 +25,8 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.data.jpa.SampleDataJpaApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleIntegrationApplication.java b/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleIntegrationApplication.java
index 0e8345b4a8a..e7e6eade7ad 100644
--- a/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleIntegrationApplication.java
+++ b/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleIntegrationApplication.java
@@ -16,9 +16,9 @@
 
 package org.springframework.boot.sample.integration;
 
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.SpringApplication;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
diff --git a/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/ServiceProperties.java b/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/ServiceProperties.java
index b1c1d66b1f2..1f1eb735574 100644
--- a/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/ServiceProperties.java
+++ b/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/ServiceProperties.java
@@ -16,7 +16,7 @@
 
 package org.springframework.boot.sample.integration;
 
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(name = "service", ignoreUnknownFields = false)
 public class ServiceProperties {
diff --git a/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/consumer/SampleIntegrationApplicationTests.java b/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/consumer/SampleIntegrationApplicationTests.java
index 7cda1e4a327..0b0c07138b9 100644
--- a/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/consumer/SampleIntegrationApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/consumer/SampleIntegrationApplicationTests.java
@@ -24,9 +24,9 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.integration.SampleIntegrationApplication;
 import org.springframework.boot.sample.integration.producer.ProducerApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
diff --git a/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/producer/ProducerApplication.java b/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/producer/ProducerApplication.java
index e48a773da3a..997bfee2d73 100644
--- a/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/producer/ProducerApplication.java
+++ b/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/producer/ProducerApplication.java
@@ -19,8 +19,8 @@ package org.springframework.boot.sample.integration.producer;
 import java.io.File;
 import java.io.FileOutputStream;
 
-import org.springframework.boot.strap.CommandLineRunner;
-import org.springframework.boot.strap.SpringApplication;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
diff --git a/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/SampleJettyApplication.java b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/SampleJettyApplication.java
index a513d4ce073..95e4bac84bb 100644
--- a/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/SampleJettyApplication.java
+++ b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/SampleJettyApplication.java
@@ -16,8 +16,8 @@
 
 package org.springframework.boot.sample.jetty;
 
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.SpringApplication;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-samples/spring-boot-sample-jetty/src/test/java/org/springframework/boot/sample/jetty/SampleJettyApplicationTests.java b/spring-boot-samples/spring-boot-sample-jetty/src/test/java/org/springframework/boot/sample/jetty/SampleJettyApplicationTests.java
index a41b8f4777e..963895904c5 100644
--- a/spring-boot-samples/spring-boot-sample-jetty/src/test/java/org/springframework/boot/sample/jetty/SampleJettyApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-jetty/src/test/java/org/springframework/boot/sample/jetty/SampleJettyApplicationTests.java
@@ -25,8 +25,8 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.jetty.SampleJettyApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/spring-boot-samples/spring-boot-sample-ops-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java b/spring-boot-samples/spring-boot-sample-ops-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java
index 758796c95cd..97b22deb36b 100644
--- a/spring-boot-samples/spring-boot-sample-ops-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java
+++ b/spring-boot-samples/spring-boot-sample-ops-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java
@@ -19,9 +19,9 @@ package org.springframework.boot.sample.ops.ui;
 import java.util.Date;
 import java.util.Map;
 
-import org.springframework.boot.config.EnableAutoConfiguration;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.ops.properties.SecurityProperties;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.stereotype.Controller;
diff --git a/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationPortTests.java b/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationPortTests.java
index 9376840ac2e..13550ec35db 100644
--- a/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationPortTests.java
+++ b/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationPortTests.java
@@ -27,8 +27,8 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.ops.ui.SampleActuatorUiApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationTests.java
index 87725b1ae8f..adea9753c1a 100644
--- a/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationTests.java
@@ -27,8 +27,8 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.ops.ui.SampleActuatorUiApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
diff --git a/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleActuatorApplication.java b/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleActuatorApplication.java
index a38febbb137..1e747a7f9ce 100644
--- a/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleActuatorApplication.java
+++ b/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleActuatorApplication.java
@@ -16,9 +16,9 @@
 
 package org.springframework.boot.sample.ops;
 
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.SpringApplication;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/ServiceProperties.java b/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/ServiceProperties.java
index d0f6198467d..83a119b8651 100644
--- a/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/ServiceProperties.java
+++ b/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/ServiceProperties.java
@@ -16,7 +16,7 @@
 
 package org.springframework.boot.sample.ops;
 
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 @ConfigurationProperties(name = "service", ignoreUnknownFields = false)
diff --git a/spring-boot-samples/spring-boot-sample-ops/src/main/resources/logback.xml b/spring-boot-samples/spring-boot-sample-ops/src/main/resources/logback.xml
index 705052307d1..2ce818c2856 100644
--- a/spring-boot-samples/spring-boot-sample-ops/src/main/resources/logback.xml
+++ b/spring-boot-samples/spring-boot-sample-ops/src/main/resources/logback.xml
@@ -2,7 +2,7 @@
 <configuration>
 	<property name="CONSOLE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%t] --- %-40.40logger{39} : %m%n%wex"/>
 
-	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.strap.logging.logback.WhitespaceThrowableProxyConverter" />
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
 
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
@@ -13,7 +13,7 @@
 	<root level="INFO">
 		<appender-ref ref="CONSOLE" />
 	</root>
-	
+
 	<!-- logger name="org.springframework" level="DEBUG"/ -->
-	
+
 </configuration>
diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/EndpointsPropertiesSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/EndpointsPropertiesSampleActuatorApplicationTests.java
index 9f0be2accc8..ba27534f713 100644
--- a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/EndpointsPropertiesSampleActuatorApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/EndpointsPropertiesSampleActuatorApplicationTests.java
@@ -27,8 +27,8 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.After;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.ops.SampleActuatorApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.HttpStatus;
diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementAddressSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementAddressSampleActuatorApplicationTests.java
index 96ae8f18b99..bc9673f9711 100644
--- a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementAddressSampleActuatorApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementAddressSampleActuatorApplicationTests.java
@@ -29,8 +29,8 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.ops.SampleActuatorApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.HttpStatus;
diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementSampleActuatorApplicationTests.java
index b6bfc010c00..da55b6d02e2 100644
--- a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementSampleActuatorApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementSampleActuatorApplicationTests.java
@@ -26,8 +26,8 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.ops.SampleActuatorApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/NoManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/NoManagementSampleActuatorApplicationTests.java
index 882ea74f2e7..dcd9aea9d9a 100644
--- a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/NoManagementSampleActuatorApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/NoManagementSampleActuatorApplicationTests.java
@@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.ops.SampleActuatorApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.HttpStatus;
diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/SampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/SampleActuatorApplicationTests.java
index fde0bfd06ce..ea35b0404cd 100644
--- a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/SampleActuatorApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/SampleActuatorApplicationTests.java
@@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.ops.SampleActuatorApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.HttpStatus;
diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ShutdownSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ShutdownSampleActuatorApplicationTests.java
index f98e409a67e..3c94c3c6e9a 100644
--- a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ShutdownSampleActuatorApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ShutdownSampleActuatorApplicationTests.java
@@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.ops.SampleActuatorApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.HttpStatus;
diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/UnsecureSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/UnsecureSampleActuatorApplicationTests.java
index 9bdd547038d..b44b65b54bd 100644
--- a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/UnsecureSampleActuatorApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/UnsecureSampleActuatorApplicationTests.java
@@ -26,8 +26,8 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.ops.SampleActuatorApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/SampleProfileApplication.java b/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/SampleProfileApplication.java
index 3b2815a4541..a3fb245d123 100644
--- a/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/SampleProfileApplication.java
+++ b/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/SampleProfileApplication.java
@@ -17,10 +17,10 @@
 package org.springframework.boot.sample.profile;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.config.EnableAutoConfiguration;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.sample.profile.service.MessageService;
-import org.springframework.boot.strap.CommandLineRunner;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/SampleSimpleApplication.java b/spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/SampleSimpleApplication.java
index c203e33fc27..dcc8070cdd7 100644
--- a/spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/SampleSimpleApplication.java
+++ b/spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/SampleSimpleApplication.java
@@ -17,10 +17,10 @@
 package org.springframework.boot.sample.simple;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.config.EnableAutoConfiguration;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.sample.simple.service.HelloWorldService;
-import org.springframework.boot.strap.CommandLineRunner;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/SampleTomcatApplication.java b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/SampleTomcatApplication.java
index 9cb2168d696..848c786d415 100644
--- a/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/SampleTomcatApplication.java
+++ b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/SampleTomcatApplication.java
@@ -16,8 +16,8 @@
 
 package org.springframework.boot.sample.tomcat;
 
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.SpringApplication;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java
index 6a98a2311f2..89bf8761d3f 100644
--- a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java
@@ -25,13 +25,13 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration;
-import org.springframework.boot.config.web.WebMvcAutoConfiguration;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
 import org.springframework.boot.sample.tomcat.SampleTomcatApplication;
 import org.springframework.boot.sample.tomcat.service.HelloWorldService;
 import org.springframework.boot.sample.tomcat.web.SampleController;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/SampleTomcatApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/SampleTomcatApplicationTests.java
index f4802b65bfa..084df752739 100644
--- a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/SampleTomcatApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/SampleTomcatApplicationTests.java
@@ -25,8 +25,8 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.tomcat.SampleTomcatApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/SampleTraditionalApplication.java b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/SampleTraditionalApplication.java
index eb7b28f9922..905b9a64914 100644
--- a/spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/SampleTraditionalApplication.java
+++ b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/SampleTraditionalApplication.java
@@ -16,8 +16,8 @@
 
 package org.springframework.boot.sample.traditional;
 
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.SpringApplication;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot-samples/spring-boot-sample-traditional/src/test/java/org/springframework/boot/sample/traditional/SampleTraditionalApplicationTests.java b/spring-boot-samples/spring-boot-sample-traditional/src/test/java/org/springframework/boot/sample/traditional/SampleTraditionalApplicationTests.java
index da5dd297451..7e920c41d89 100644
--- a/spring-boot-samples/spring-boot-sample-traditional/src/test/java/org/springframework/boot/sample/traditional/SampleTraditionalApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-traditional/src/test/java/org/springframework/boot/sample/traditional/SampleTraditionalApplicationTests.java
@@ -25,8 +25,8 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.traditional.SampleTraditionalApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/SampleWebUiApplication.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/SampleWebUiApplication.java
index 25160ed266c..a141f212a09 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/SampleWebUiApplication.java
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/SampleWebUiApplication.java
@@ -16,8 +16,8 @@
 
 package org.springframework.boot.sample.ui;
 
-import org.springframework.boot.config.EnableAutoConfiguration;
-import org.springframework.boot.strap.SpringApplication;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java
index 79a3442b3af..802da775440 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java
@@ -10,8 +10,8 @@ import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.ui.SampleWebUiApplication;
-import org.springframework.boot.strap.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/SampleSpringXmlApplication.java b/spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/SampleSpringXmlApplication.java
index 928bdf4e489..d4f8eea3bd4 100644
--- a/spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/SampleSpringXmlApplication.java
+++ b/spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/SampleSpringXmlApplication.java
@@ -17,9 +17,9 @@
 package org.springframework.boot.sample.xml;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.sample.xml.service.HelloWorldService;
-import org.springframework.boot.strap.CommandLineRunner;
-import org.springframework.boot.strap.SpringApplication;
 
 public class SampleSpringXmlApplication implements CommandLineRunner {
 
diff --git a/spring-boot-ups/spring-boot-up-parent/pom.xml b/spring-boot-ups/spring-boot-up-parent/pom.xml
index ac14b242b91..23fd4a72912 100644
--- a/spring-boot-ups/spring-boot-up-parent/pom.xml
+++ b/spring-boot-ups/spring-boot-up-parent/pom.xml
@@ -29,7 +29,6 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
 		<spring.boot.version>0.5.0.BUILD-SNAPSHOT</spring.boot.version>
-		<start-class>org.springframework.boot.strap.SpringApplication</start-class>
 	</properties>
 
 	<prerequisites>
diff --git a/spring-boot-ups/src/main/parent/pom.xml b/spring-boot-ups/src/main/parent/pom.xml
index 3c109594958..2f42fbe5054 100644
--- a/spring-boot-ups/src/main/parent/pom.xml
+++ b/spring-boot-ups/src/main/parent/pom.xml
@@ -29,7 +29,6 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
 		<spring.boot.version>@{project.version}</spring.boot.version>
-		<start-class>org.springframework.boot.strap.SpringApplication</start-class>
 	</properties>
 
 	<prerequisites>
diff --git a/spring-boot/README.md b/spring-boot/README.md
index c59b907fa3b..548f11f4190 100644
--- a/spring-boot/README.md
+++ b/spring-boot/README.md
@@ -75,7 +75,7 @@ Now write a simple main class
 ```
 package com.mycompany;
 
-import org.springframework.boot.strap.SpringApplication;
+import org.springframework.boot.SpringApplication;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
@@ -127,7 +127,7 @@ public class Application {
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
 	}
-    
+
  	public String getMessage() {
 		return message;
 	}
diff --git a/spring-boot/docs/Features.md b/spring-boot/docs/Features.md
index 781ca4ce91d..a132560c03a 100644
--- a/spring-boot/docs/Features.md
+++ b/spring-boot/docs/Features.md
@@ -251,7 +251,7 @@ from the Spring `Environment` to System properties:
 
 All the logging systems supported can consult System properties when
 parsing their configuration files.  See the default configurations in
-`spring-bootstrap.jar` for examples.
+`spring-boot.jar` for examples.
 
 ## Application Context Initializers
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/Banner.java b/spring-boot/src/main/java/org/springframework/boot/Banner.java
similarity index 83%
rename from spring-boot/src/main/java/org/springframework/boot/strap/Banner.java
rename to spring-boot/src/main/java/org/springframework/boot/Banner.java
index 9b069ca189c..19b3fa19009 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/Banner.java
+++ b/spring-boot/src/main/java/org/springframework/boot/Banner.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap;
+package org.springframework.boot;
 
 import java.io.PrintStream;
 
-import org.springframework.boot.strap.ansi.AnsiOutput;
+import org.springframework.boot.ansi.AnsiOutput;
 
-import static org.springframework.boot.strap.ansi.AnsiElement.DEFAULT;
-import static org.springframework.boot.strap.ansi.AnsiElement.FAINT;
-import static org.springframework.boot.strap.ansi.AnsiElement.GREEN;
+import static org.springframework.boot.ansi.AnsiElement.DEFAULT;
+import static org.springframework.boot.ansi.AnsiElement.FAINT;
+import static org.springframework.boot.ansi.AnsiElement.GREEN;
 
 
 /**
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/BeanDefinitionLoader.java b/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
similarity index 99%
rename from spring-boot/src/main/java/org/springframework/boot/strap/BeanDefinitionLoader.java
rename to spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
index 7e2ec67f934..2c07c7c42e3 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/BeanDefinitionLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap;
+package org.springframework.boot;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/CommandLineRunner.java b/spring-boot/src/main/java/org/springframework/boot/CommandLineRunner.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/strap/CommandLineRunner.java
rename to spring-boot/src/main/java/org/springframework/boot/CommandLineRunner.java
index 37a4eed269a..8d3566ee7f0 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/CommandLineRunner.java
+++ b/spring-boot/src/main/java/org/springframework/boot/CommandLineRunner.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap;
+package org.springframework.boot;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/ExitCodeGenerator.java b/spring-boot/src/main/java/org/springframework/boot/ExitCodeGenerator.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/strap/ExitCodeGenerator.java
rename to spring-boot/src/main/java/org/springframework/boot/ExitCodeGenerator.java
index bf1a69fbc7e..28f74bebdeb 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/ExitCodeGenerator.java
+++ b/spring-boot/src/main/java/org/springframework/boot/ExitCodeGenerator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap;
+package org.springframework.boot;
 
 /**
  * Interface used to generate an 'exit code' from a running command line
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
similarity index 99%
rename from spring-boot/src/main/java/org/springframework/boot/strap/SpringApplication.java
rename to spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
index 5a76976cb27..1e2f0a44da1 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/SpringApplication.java
+++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap;
+package org.springframework.boot;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -128,7 +128,7 @@ public class SpringApplication {
 			+ "annotation.AnnotationConfigApplicationContext";
 
 	public static final String DEFAULT_WEB_CONTEXT_CLASS = "org.springframework."
-			+ "boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext";
+			+ "boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext";
 
 	private static final String[] WEB_ENVIRONMENT_CLASSES = { "javax.servlet.Servlet",
 			"org.springframework.web.context.ConfigurableWebApplicationContext" };
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/SpringApplicationInitializer.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplicationInitializer.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/strap/SpringApplicationInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/SpringApplicationInitializer.java
index 9051066ddbb..493424d9294 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/SpringApplicationInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplicationInitializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap;
+package org.springframework.boot;
 
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.Environment;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/StartupInfoLogger.java b/spring-boot/src/main/java/org/springframework/boot/StartupInfoLogger.java
similarity index 99%
rename from spring-boot/src/main/java/org/springframework/boot/strap/StartupInfoLogger.java
rename to spring-boot/src/main/java/org/springframework/boot/StartupInfoLogger.java
index 18ed13712fb..6ffbbaa5228 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/StartupInfoLogger.java
+++ b/spring-boot/src/main/java/org/springframework/boot/StartupInfoLogger.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap;
+package org.springframework.boot;
 
 import java.io.File;
 import java.net.InetAddress;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/ansi/AnsiElement.java b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiElement.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/ansi/AnsiElement.java
rename to spring-boot/src/main/java/org/springframework/boot/ansi/AnsiElement.java
index cad0a9935d8..96d308d21cb 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/ansi/AnsiElement.java
+++ b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiElement.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.ansi;
+package org.springframework.boot.ansi;
 
 /**
  * An ANSI encodable element.
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/ansi/AnsiOutput.java b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/ansi/AnsiOutput.java
rename to spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
index 4163e6ae60c..bb5d3b82992 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/ansi/AnsiOutput.java
+++ b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.ansi;
+package org.springframework.boot.ansi;
 
 import org.springframework.util.Assert;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/bind/CustomPropertyConstructor.java b/spring-boot/src/main/java/org/springframework/boot/bind/CustomPropertyConstructor.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/bind/CustomPropertyConstructor.java
rename to spring-boot/src/main/java/org/springframework/boot/bind/CustomPropertyConstructor.java
index 00273a02a61..98ce94ff3e6 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/bind/CustomPropertyConstructor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/CustomPropertyConstructor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.bind;
+package org.springframework.boot.bind;
 
 import java.beans.IntrospectionException;
 import java.util.HashMap;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/bind/InetAddressEditor.java b/spring-boot/src/main/java/org/springframework/boot/bind/InetAddressEditor.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/strap/bind/InetAddressEditor.java
rename to spring-boot/src/main/java/org/springframework/boot/bind/InetAddressEditor.java
index 6ee8c3d508f..98e9fead504 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/bind/InetAddressEditor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/InetAddressEditor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.bind;
+package org.springframework.boot.bind;
 
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorSupport;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
similarity index 99%
rename from spring-boot/src/main/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
index f96f5d71a31..c32f47262b2 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.bind;
+package org.springframework.boot.bind;
 
 import java.util.Locale;
 import java.util.Properties;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValues.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValues.java
rename to spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
index 93a875f2ba2..569431fb7c3 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValues.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.bind;
+package org.springframework.boot.bind;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/bind/RelaxedDataBinder.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java
similarity index 99%
rename from spring-boot/src/main/java/org/springframework/boot/strap/bind/RelaxedDataBinder.java
rename to spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java
index 228ab18bab9..64cb9fc1e9c 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/bind/RelaxedDataBinder.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.bind;
+package org.springframework.boot.bind;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/bind/YamlConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
similarity index 99%
rename from spring-boot/src/main/java/org/springframework/boot/strap/bind/YamlConfigurationFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
index 4ece6650ca2..787d7c25744 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/bind/YamlConfigurationFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.bind;
+package org.springframework.boot.bind;
 
 import java.nio.charset.Charset;
 import java.util.Collections;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/ArrayDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/config/ArrayDocumentMatcher.java
similarity index 89%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/ArrayDocumentMatcher.java
rename to spring-boot/src/main/java/org/springframework/boot/config/ArrayDocumentMatcher.java
index da84c733950..492e19262e8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/ArrayDocumentMatcher.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/ArrayDocumentMatcher.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.util.Properties;
 import java.util.Set;
 
-import org.springframework.boot.strap.config.YamlProcessor.DocumentMatcher;
-import org.springframework.boot.strap.config.YamlProcessor.MatchStatus;
+import org.springframework.boot.config.YamlProcessor.DocumentMatcher;
+import org.springframework.boot.config.YamlProcessor.MatchStatus;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/DefaultProfileDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/config/DefaultProfileDocumentMatcher.java
similarity index 85%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/DefaultProfileDocumentMatcher.java
rename to spring-boot/src/main/java/org/springframework/boot/config/DefaultProfileDocumentMatcher.java
index f634b6dd1de..aae5400af8c 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/DefaultProfileDocumentMatcher.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/DefaultProfileDocumentMatcher.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.util.Properties;
 
-import org.springframework.boot.strap.config.YamlProcessor.DocumentMatcher;
-import org.springframework.boot.strap.config.YamlProcessor.MatchStatus;
+import org.springframework.boot.config.YamlProcessor.DocumentMatcher;
+import org.springframework.boot.config.YamlProcessor.MatchStatus;
 
 /**
  * A {@link DocumentMatcher} that matches the default profile implicitly but not
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/JacksonJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/config/JacksonJsonParser.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/JacksonJsonParser.java
rename to spring-boot/src/main/java/org/springframework/boot/config/JacksonJsonParser.java
index cbb368cda55..7f86940bbd8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/JacksonJsonParser.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/JacksonJsonParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.util.List;
 import java.util.Map;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/JsonParser.java b/spring-boot/src/main/java/org/springframework/boot/config/JsonParser.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/JsonParser.java
rename to spring-boot/src/main/java/org/springframework/boot/config/JsonParser.java
index 96ab14188a2..a28f6cba409 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/JsonParser.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/JsonParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.util.List;
 import java.util.Map;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/JsonParserFactory.java b/spring-boot/src/main/java/org/springframework/boot/config/JsonParserFactory.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/JsonParserFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/config/JsonParserFactory.java
index 2800ac8d192..bb3dc2d46d4 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/JsonParserFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/JsonParserFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import org.springframework.util.ClassUtils;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/PropertiesPropertySourceLoader.java b/spring-boot/src/main/java/org/springframework/boot/config/PropertiesPropertySourceLoader.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/PropertiesPropertySourceLoader.java
rename to spring-boot/src/main/java/org/springframework/boot/config/PropertiesPropertySourceLoader.java
index f3e9f272c4d..42bb3017698 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/PropertiesPropertySourceLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/PropertiesPropertySourceLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.io.IOException;
 import java.util.Properties;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/PropertySourceLoader.java b/spring-boot/src/main/java/org/springframework/boot/config/PropertySourceLoader.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/PropertySourceLoader.java
rename to spring-boot/src/main/java/org/springframework/boot/config/PropertySourceLoader.java
index f50bc947641..05eb2469ebe 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/PropertySourceLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/PropertySourceLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.Resource;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/SimpleJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/config/SimpleJsonParser.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/SimpleJsonParser.java
rename to spring-boot/src/main/java/org/springframework/boot/config/SimpleJsonParser.java
index c72dccda732..54b00b3f19e 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/SimpleJsonParser.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/SimpleJsonParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/SpringProfileDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/config/SpringProfileDocumentMatcher.java
similarity index 89%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/SpringProfileDocumentMatcher.java
rename to spring-boot/src/main/java/org/springframework/boot/config/SpringProfileDocumentMatcher.java
index afd3e0d1f65..6574af2550e 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/SpringProfileDocumentMatcher.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/SpringProfileDocumentMatcher.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.Properties;
 
-import org.springframework.boot.strap.config.YamlProcessor.DocumentMatcher;
-import org.springframework.boot.strap.config.YamlProcessor.MatchStatus;
+import org.springframework.boot.config.YamlProcessor.DocumentMatcher;
+import org.springframework.boot.config.YamlProcessor.MatchStatus;
 import org.springframework.core.env.Environment;
 
 /**
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/config/YamlJsonParser.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/YamlJsonParser.java
rename to spring-boot/src/main/java/org/springframework/boot/config/YamlJsonParser.java
index d2a8deabb8d..dd32f4f2b03 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlJsonParser.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/YamlJsonParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.util.List;
 import java.util.Map;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlMapFactoryBean.java b/spring-boot/src/main/java/org/springframework/boot/config/YamlMapFactoryBean.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/YamlMapFactoryBean.java
rename to spring-boot/src/main/java/org/springframework/boot/config/YamlMapFactoryBean.java
index b7380ba7ec4..76dfdada6f9 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlMapFactoryBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/YamlMapFactoryBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlProcessor.java b/spring-boot/src/main/java/org/springframework/boot/config/YamlProcessor.java
similarity index 99%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/YamlProcessor.java
rename to spring-boot/src/main/java/org/springframework/boot/config/YamlProcessor.java
index 6bf4c810d4e..7f513b5f31c 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/YamlProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBean.java b/spring-boot/src/main/java/org/springframework/boot/config/YamlPropertiesFactoryBean.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBean.java
rename to spring-boot/src/main/java/org/springframework/boot/config/YamlPropertiesFactoryBean.java
index c719718512a..cbe023bbce5 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/YamlPropertiesFactoryBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.util.Map;
 import java.util.Properties;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlPropertySourceLoader.java b/spring-boot/src/main/java/org/springframework/boot/config/YamlPropertySourceLoader.java
similarity index 94%
rename from spring-boot/src/main/java/org/springframework/boot/strap/config/YamlPropertySourceLoader.java
rename to spring-boot/src/main/java/org/springframework/boot/config/YamlPropertySourceLoader.java
index c50cbac5422..5a015cb9508 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/config/YamlPropertySourceLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/config/YamlPropertySourceLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -22,8 +22,8 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
-import org.springframework.boot.strap.config.YamlProcessor.DocumentMatcher;
-import org.springframework.boot.strap.config.YamlProcessor.MatchStatus;
+import org.springframework.boot.config.YamlProcessor.DocumentMatcher;
+import org.springframework.boot.config.YamlProcessor.MatchStatus;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.Resource;
 import org.springframework.util.StringUtils;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/AbstractOnBeanCondition.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/AbstractOnBeanCondition.java
similarity index 99%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/AbstractOnBeanCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/AbstractOnBeanCondition.java
index 8b8a9f7dc0e..9a5d9f2c046 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/AbstractOnBeanCondition.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/AbstractOnBeanCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionLogUtils.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionLogUtils.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionLogUtils.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionLogUtils.java
index 0d898f165b5..bb7d4eac012 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionLogUtils.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionLogUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import org.apache.commons.logging.Log;
 import org.springframework.core.type.AnnotatedTypeMetadata;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnBean.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnBean.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnBean.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnBean.java
index dea22e35edf..39d5754bb4d 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnClass.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnClass.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnClass.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnClass.java
index 7b82b03505d..9ded0f78830 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnClass.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnClass.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnExpression.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnExpression.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnExpression.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnExpression.java
index d8976a17418..da22c43a662 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnExpression.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnExpression.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingBean.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnMissingBean.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingBean.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnMissingBean.java
index 6bb909269cc..5f7a9a3bb4f 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnMissingBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingClass.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnMissingClass.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingClass.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnMissingClass.java
index 26f93f88d5a..ee7ebdd43fe 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingClass.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnMissingClass.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnNotWebApplication.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnNotWebApplication.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnNotWebApplication.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnNotWebApplication.java
index f96df763384..b54c72d572f 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnNotWebApplication.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnNotWebApplication.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnResource.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnResource.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnResource.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnResource.java
index 7632993ab61..da72a7ea67a 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnResource.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnResource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnWebApplication.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnWebApplication.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnWebApplication.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnWebApplication.java
index 2327b8cf3fe..9fa9436b434 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnWebApplication.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnWebApplication.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnBeanCondition.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnBeanCondition.java
similarity index 94%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnBeanCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/OnBeanCondition.java
index 932a96661f0..bb492f1316c 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnBeanCondition.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnBeanCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import org.springframework.context.annotation.Condition;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnClassCondition.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnClassCondition.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnClassCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/OnClassCondition.java
index 15a5cb0e9d4..fbecd2f3014 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnClassCondition.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnClassCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnExpressionCondition.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnExpressionCondition.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnExpressionCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/OnExpressionCondition.java
index 782e06b8273..8d6426ba90d 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnExpressionCondition.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnExpressionCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnMissingBeanCondition.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnMissingBeanCondition.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnMissingBeanCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/OnMissingBeanCondition.java
index a5e715fc401..48c5ebbe25d 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnMissingBeanCondition.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnMissingBeanCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.util.List;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnMissingClassCondition.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnMissingClassCondition.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnMissingClassCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/OnMissingClassCondition.java
index 21c49b9cfdd..27134b6173d 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnMissingClassCondition.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnMissingClassCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationCondition.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnNotWebApplicationCondition.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/OnNotWebApplicationCondition.java
index d2bd2735884..b66687cf917 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationCondition.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnNotWebApplicationCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnResourceCondition.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnResourceCondition.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnResourceCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/OnResourceCondition.java
index b350cb8e5a3..f9090032c8f 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnResourceCondition.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnResourceCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnWebApplicationCondition.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnWebApplicationCondition.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnWebApplicationCondition.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/OnWebApplicationCondition.java
index 271851d1e66..cb5579bcc99 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/OnWebApplicationCondition.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/OnWebApplicationCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/SearchStrategy.java b/spring-boot/src/main/java/org/springframework/boot/context/condition/SearchStrategy.java
similarity index 94%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/condition/SearchStrategy.java
rename to spring-boot/src/main/java/org/springframework/boot/context/condition/SearchStrategy.java
index c530707ff5a..5a366882cd8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/condition/SearchStrategy.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/condition/SearchStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 /**
  * Some named search strategies for beans in the bean factory hierarchy.
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
similarity index 99%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
index 4131ce6b8fa..18586799ec9 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
similarity index 99%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
index 7bcb7b405a1..01351512207 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
index 3685ac9beb6..c53e5f234a4 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.io.File;
 import java.net.InetAddress;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainer.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainer.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainer.java
index 4d7978d4dbf..7c15755447a 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 /**
  * Simple interface that represents a fully configured embedded servlet container (for
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizer.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizer.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizer.java
index d376affa9a1..cf0e4923908 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import org.springframework.beans.factory.config.BeanPostProcessor;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
index ea8193d225d..860598bc2bc 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerException.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerException.java
similarity index 94%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerException.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerException.java
index 07887e91ebb..56ae0a5d614 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerException.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 /**
  * Exceptions thrown by an embedded servlet container.
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerFactory.java
similarity index 87%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerFactory.java
index 6b5d0aff081..f3e4c469b79 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerFactory.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import org.apache.catalina.core.ApplicationContext;
-import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 
 /**
  * Factory interface that can be used to create {@link EmbeddedServletContainer}s.
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContext.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java
similarity index 99%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContext.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java
index 380a592aee4..a0dcfa4ccb5 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContext.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ErrorPage.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ErrorPage.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ErrorPage.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/ErrorPage.java
index a25684a9bc4..d381c2e12e3 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ErrorPage.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ErrorPage.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.util.ObjectUtils;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java
similarity index 99%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBean.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java
index cc97d400256..84bc46c4289 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/MimeMappings.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/MimeMappings.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/MimeMappings.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/MimeMappings.java
index 7055f4c6290..4a3d9043e49 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/MimeMappings.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/MimeMappings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -22,7 +22,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.springframework.boot.strap.context.embedded.MimeMappings.Mapping;
+import org.springframework.boot.context.embedded.MimeMappings.Mapping;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/RegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/RegistrationBean.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/RegistrationBean.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/RegistrationBean.java
index f52fd6cd7ad..57023abad3a 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/RegistrationBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/RegistrationBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ServletContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletContextInitializer.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ServletContextInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletContextInitializer.java
index 2d49bf37de9..353df3f40eb 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ServletContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletContextInitializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBean.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java
index ba990bcd429..4dba29f2f3e 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/WebApplicationContextServletContextAwareProcessor.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/WebApplicationContextServletContextAwareProcessor.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/WebApplicationContextServletContextAwareProcessor.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/WebApplicationContextServletContextAwareProcessor.java
index cc751aeaac7..a73bbb99470 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/WebApplicationContextServletContextAwareProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/WebApplicationContextServletContextAwareProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContext.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContext.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContext.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContext.java
index 9518f3fc952..2a8b7863b0f 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContext.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java
similarity index 92%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainer.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java
index 52bfec84aef..141f30ff191 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded.jetty;
+package org.springframework.boot.context.embedded.jetty;
 
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerException;
+import org.springframework.boot.context.embedded.EmbeddedServletContainer;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerException;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
index 1f3a10cefc6..0afd326ad53 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded.jetty;
+package org.springframework.boot.context.embedded.jetty;
 
 import java.io.File;
 import java.net.InetSocketAddress;
@@ -33,12 +33,12 @@ import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.webapp.AbstractConfiguration;
 import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.WebAppContext;
-import org.springframework.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.ErrorPage;
-import org.springframework.boot.strap.context.embedded.MimeMappings;
-import org.springframework.boot.strap.context.embedded.ServletContextInitializer;
+import org.springframework.boot.context.embedded.AbstractEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.EmbeddedServletContainer;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.ErrorPage;
+import org.springframework.boot.context.embedded.MimeMappings;
+import org.springframework.boot.context.embedded.ServletContextInitializer;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.Assert;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/ServletContextInitializerConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java
similarity index 94%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/ServletContextInitializerConfiguration.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java
index 0a02afcd079..b5c55d15509 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/ServletContextInitializerConfiguration.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded.jetty;
+package org.springframework.boot.context.embedded.jetty;
 
 import javax.servlet.ServletContext;
 
@@ -23,7 +23,7 @@ import org.eclipse.jetty.util.component.AbstractLifeCycle;
 import org.eclipse.jetty.webapp.AbstractConfiguration;
 import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.WebAppContext;
-import org.springframework.boot.strap.context.embedded.ServletContextInitializer;
+import org.springframework.boot.context.embedded.ServletContextInitializer;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/package-info.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/package-info.java
similarity index 76%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/package-info.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/package-info.java
index ea857a7bfdc..2738866b370 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/jetty/package-info.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/package-info.java
@@ -15,7 +15,7 @@
  */
 
 /**
- * Support for Jetty {@link org.springframework.boot.strap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}.
+ * Support for Jetty {@link org.springframework.boot.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}.
  */
-package org.springframework.boot.strap.context.embedded.jetty;
+package org.springframework.boot.context.embedded.jetty;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/package-info.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/package-info.java
similarity index 74%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/package-info.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/package-info.java
index ca8bef25174..eff7d281881 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/package-info.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/package-info.java
@@ -16,8 +16,8 @@
 
 /**
  * Support for embedded servlet containers.
- * @see org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory
- * @see org.springframework.boot.strap.context.embedded.EmbeddedWebApplicationContext
+ * @see org.springframework.boot.context.embedded.EmbeddedServletContainerFactory
+ * @see org.springframework.boot.context.embedded.EmbeddedWebApplicationContext
  */
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/properties/ServerProperties.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/properties/ServerProperties.java
similarity index 87%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/properties/ServerProperties.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/properties/ServerProperties.java
index ea7256e9087..94e4f4cd287 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/properties/ServerProperties.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/properties/ServerProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded.properties;
+package org.springframework.boot.context.embedded.properties;
 
 import java.io.File;
 import java.net.InetAddress;
@@ -23,12 +23,12 @@ import javax.validation.constraints.NotNull;
 
 import org.apache.catalina.valves.AccessLogValve;
 import org.apache.catalina.valves.RemoteIpValve;
-import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizer;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
similarity index 93%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
index ad9d7bd777c..e200778cc67 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded.tomcat;
+package org.springframework.boot.context.embedded.tomcat;
 
 import javax.servlet.ServletException;
 
@@ -22,7 +22,7 @@ import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.core.StandardContext;
-import org.springframework.boot.strap.context.embedded.ServletContextInitializer;
+import org.springframework.boot.context.embedded.ServletContextInitializer;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
similarity index 92%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
index 09cbde43102..ea08b33dd50 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded.tomcat;
+package org.springframework.boot.context.embedded.tomcat;
 
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerException;
+import org.springframework.boot.context.embedded.EmbeddedServletContainer;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerException;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
similarity index 94%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
index 3a86f27068a..9cb2713f587 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded.tomcat;
+package org.springframework.boot.context.embedded.tomcat;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,13 +34,13 @@ import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.Tomcat.FixContextListener;
 import org.apache.coyote.AbstractProtocol;
-import org.springframework.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerException;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.ErrorPage;
-import org.springframework.boot.strap.context.embedded.MimeMappings;
-import org.springframework.boot.strap.context.embedded.ServletContextInitializer;
+import org.springframework.boot.context.embedded.AbstractEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.EmbeddedServletContainer;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerException;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.ErrorPage;
+import org.springframework.boot.context.embedded.MimeMappings;
+import org.springframework.boot.context.embedded.ServletContextInitializer;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.Assert;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
index ecea4dab467..2fb50eac603 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
@@ -1,4 +1,4 @@
-package org.springframework.boot.strap.context.embedded.tomcat;
+package org.springframework.boot.context.embedded.tomcat;
 
 /*
  * Copyright 2012-2013 the original author or authors.
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/package-info.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/package-info.java
similarity index 76%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/package-info.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/package-info.java
index 2942233d8cc..1ea797a06e1 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/package-info.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/package-info.java
@@ -15,7 +15,7 @@
  */
 
 /**
- * Support for Tomcat {@link org.springframework.boot.strap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}.
+ * Support for Tomcat {@link org.springframework.boot.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}.
  */
-package org.springframework.boot.strap.context.embedded.tomcat;
+package org.springframework.boot.context.embedded.tomcat;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializer.java
similarity index 94%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializer.java
index e08538ecbd9..2cc0feb1c68 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.initializer;
+package org.springframework.boot.context.initializer;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,13 +23,13 @@ import java.util.Map;
 import java.util.Set;
 
 import org.springframework.beans.PropertyValues;
-import org.springframework.boot.strap.SpringApplication;
-import org.springframework.boot.strap.SpringApplicationInitializer;
-import org.springframework.boot.strap.bind.PropertySourcesPropertyValues;
-import org.springframework.boot.strap.bind.RelaxedDataBinder;
-import org.springframework.boot.strap.config.PropertiesPropertySourceLoader;
-import org.springframework.boot.strap.config.PropertySourceLoader;
-import org.springframework.boot.strap.config.YamlPropertySourceLoader;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.SpringApplicationInitializer;
+import org.springframework.boot.bind.PropertySourcesPropertyValues;
+import org.springframework.boot.bind.RelaxedDataBinder;
+import org.springframework.boot.config.PropertiesPropertySourceLoader;
+import org.springframework.boot.config.PropertySourceLoader;
+import org.springframework.boot.config.YamlPropertySourceLoader;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.EnvironmentAware;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializer.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializer.java
index a00a7545209..1491043e59d 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.initializer;
+package org.springframework.boot.context.initializer;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextInitializer;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
index 086257ab82e..deb2f736fe0 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.initializer;
+package org.springframework.boot.context.initializer;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/initializer/LoggingApplicationContextInitializer.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/context/initializer/LoggingApplicationContextInitializer.java
index 90960d01c5b..6f400685750 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/initializer/LoggingApplicationContextInitializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.initializer;
+package org.springframework.boot.context.initializer;
 
 import java.lang.management.ManagementFactory;
 import java.util.HashMap;
@@ -22,9 +22,9 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.boot.strap.SpringApplication;
-import org.springframework.boot.strap.SpringApplicationInitializer;
-import org.springframework.boot.strap.logging.LoggingSystem;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.SpringApplicationInitializer;
+import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.Ordered;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/initializer/VcapApplicationContextInitializer.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/context/initializer/VcapApplicationContextInitializer.java
index 491f4ef7392..f6aa22152c4 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/initializer/VcapApplicationContextInitializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.initializer;
+package org.springframework.boot.context.initializer;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -23,8 +23,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 
-import org.springframework.boot.strap.config.JsonParser;
-import org.springframework.boot.strap.config.JsonParserFactory;
+import org.springframework.boot.config.JsonParser;
+import org.springframework.boot.config.JsonParserFactory;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.Ordered;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationProperties.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationProperties.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationProperties.java
rename to spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationProperties.java
index 9fce0f0df7e..b2da2b78ea7 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationProperties.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.properties;
+package org.springframework.boot.context.properties;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessor.java
rename to spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
index 075f946ad04..32a36285a55 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.properties;
+package org.springframework.boot.context.properties;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
@@ -26,10 +26,10 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.boot.strap.bind.PropertiesConfigurationFactory;
-import org.springframework.boot.strap.config.PropertiesPropertySourceLoader;
-import org.springframework.boot.strap.config.PropertySourceLoader;
-import org.springframework.boot.strap.config.YamlPropertySourceLoader;
+import org.springframework.boot.bind.PropertiesConfigurationFactory;
+import org.springframework.boot.config.PropertiesPropertySourceLoader;
+import org.springframework.boot.config.PropertySourceLoader;
+import org.springframework.boot.config.YamlPropertySourceLoader;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java
rename to spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java
index 4ee8d962801..728d43e05b0 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.properties;
+package org.springframework.boot.context.properties;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesHolder.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesHolder.java
similarity index 94%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesHolder.java
rename to spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesHolder.java
index 23ffb0a7e33..eff0f2fbd2f 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesHolder.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesHolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.properties;
+package org.springframework.boot.context.properties;
 
 /**
  * Properties holder registered by {@link EnableConfigurationPropertiesImportSelector} to
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationProperties.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationProperties.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationProperties.java
rename to spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationProperties.java
index db7fe2bb131..6f1822bc7d2 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationProperties.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.properties;
+package org.springframework.boot.context.properties;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesImportSelector.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelector.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesImportSelector.java
rename to spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelector.java
index 81d9a8b0007..cd266b291cb 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesImportSelector.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.properties;
+package org.springframework.boot.context.properties;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/logging/AbstractLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/logging/AbstractLoggingSystem.java
rename to spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java
index 06d320bf26d..fe1698a5d94 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/logging/AbstractLoggingSystem.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.logging;
+package org.springframework.boot.logging;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.ClassUtils;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/logging/LoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/strap/logging/LoggingSystem.java
rename to spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java
index 6a94e9656d5..4fa579758f7 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/logging/LoggingSystem.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.logging;
+package org.springframework.boot.logging;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/logging/java/JavaLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java
similarity index 88%
rename from spring-boot/src/main/java/org/springframework/boot/strap/logging/java/JavaLoggingSystem.java
rename to spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java
index 49f3019cd2c..9bfc93cdecd 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/logging/java/JavaLoggingSystem.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.logging.java;
+package org.springframework.boot.logging.java;
 
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
-import org.springframework.boot.strap.logging.AbstractLoggingSystem;
-import org.springframework.boot.strap.logging.LoggingSystem;
+import org.springframework.boot.logging.AbstractLoggingSystem;
+import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.util.ResourceUtils;
 import org.springframework.util.SystemPropertyUtils;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/logging/java/SimpleFormatter.java b/spring-boot/src/main/java/org/springframework/boot/logging/java/SimpleFormatter.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/strap/logging/java/SimpleFormatter.java
rename to spring-boot/src/main/java/org/springframework/boot/logging/java/SimpleFormatter.java
index 6bb295f439b..55f8d16ad97 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/logging/java/SimpleFormatter.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/java/SimpleFormatter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.logging.java;
+package org.springframework.boot.logging.java;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/logging/log4j/Log4JLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/log4j/Log4JLoggingSystem.java
similarity index 87%
rename from spring-boot/src/main/java/org/springframework/boot/strap/logging/log4j/Log4JLoggingSystem.java
rename to spring-boot/src/main/java/org/springframework/boot/logging/log4j/Log4JLoggingSystem.java
index 50dc2d64114..b78b314e455 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/logging/log4j/Log4JLoggingSystem.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/log4j/Log4JLoggingSystem.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.logging.log4j;
+package org.springframework.boot.logging.log4j;
 
-import org.springframework.boot.strap.logging.AbstractLoggingSystem;
-import org.springframework.boot.strap.logging.LoggingSystem;
+import org.springframework.boot.logging.AbstractLoggingSystem;
+import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.util.Log4jConfigurer;
 
 /**
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/ColorConverter.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/ColorConverter.java
similarity index 93%
rename from spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/ColorConverter.java
rename to spring-boot/src/main/java/org/springframework/boot/logging/logback/ColorConverter.java
index 25e4622c294..1f56c788b18 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/ColorConverter.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/ColorConverter.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.logging.logback;
+package org.springframework.boot.logging.logback;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.boot.strap.ansi.AnsiElement;
-import org.springframework.boot.strap.ansi.AnsiOutput;
+import org.springframework.boot.ansi.AnsiElement;
+import org.springframework.boot.ansi.AnsiOutput;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.ILoggingEvent;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
similarity index 92%
rename from spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystem.java
rename to spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
index ce772ad7d0d..9c7e83b2eba 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystem.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.logging.logback;
+package org.springframework.boot.logging.logback;
 
 import java.net.URL;
 
 import org.slf4j.ILoggerFactory;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 import org.slf4j.impl.StaticLoggerBinder;
-import org.springframework.boot.strap.logging.AbstractLoggingSystem;
-import org.springframework.boot.strap.logging.LoggingSystem;
+import org.springframework.boot.logging.AbstractLoggingSystem;
+import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ResourceUtils;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverter.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/WhitespaceThrowableProxyConverter.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverter.java
rename to spring-boot/src/main/java/org/springframework/boot/logging/logback/WhitespaceThrowableProxyConverter.java
index 1154efab2ba..f5d433f59f4 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverter.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/WhitespaceThrowableProxyConverter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.logging.logback;
+package org.springframework.boot.logging.logback;
 
 import ch.qos.logback.classic.pattern.ThrowableProxyConverter;
 import ch.qos.logback.classic.spi.IThrowableProxy;
diff --git a/spring-boot/src/main/java/org/springframework/boot/strap/web/SpringServletInitializer.java b/spring-boot/src/main/java/org/springframework/boot/web/SpringServletInitializer.java
similarity index 94%
rename from spring-boot/src/main/java/org/springframework/boot/strap/web/SpringServletInitializer.java
rename to spring-boot/src/main/java/org/springframework/boot/web/SpringServletInitializer.java
index 03304527bfa..d591b8cb137 100644
--- a/spring-boot/src/main/java/org/springframework/boot/strap/web/SpringServletInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/SpringServletInitializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.web;
+package org.springframework.boot.web;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
@@ -22,8 +22,8 @@ import javax.servlet.ServletException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.boot.strap.SpringApplication;
-import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.ContextLoaderListener;
diff --git a/spring-boot/src/main/resources/META-INF/spring.factories b/spring-boot/src/main/resources/META-INF/spring.factories
index b8f71f6ae55..d784cb00053 100644
--- a/spring-boot/src/main/resources/META-INF/spring.factories
+++ b/spring-boot/src/main/resources/META-INF/spring.factories
@@ -1,7 +1,7 @@
 # Application Context Initializers
 org.springframework.context.ApplicationContextInitializer=\
-org.springframework.boot.strap.context.initializer.ConfigFileApplicationContextInitializer,\
-org.springframework.boot.strap.context.initializer.ContextIdApplicationContextInitializer,\
-org.springframework.boot.strap.context.initializer.EnvironmentDelegateApplicationContextInitializer,\
-org.springframework.boot.strap.context.initializer.LoggingApplicationContextInitializer,\
-org.springframework.boot.strap.context.initializer.VcapApplicationContextInitializer
+org.springframework.boot.context.initializer.ConfigFileApplicationContextInitializer,\
+org.springframework.boot.context.initializer.ContextIdApplicationContextInitializer,\
+org.springframework.boot.context.initializer.EnvironmentDelegateApplicationContextInitializer,\
+org.springframework.boot.context.initializer.LoggingApplicationContextInitializer,\
+org.springframework.boot.context.initializer.VcapApplicationContextInitializer
diff --git a/spring-boot/src/main/resources/org/springframework/boot/strap/logging/java/logging.properties b/spring-boot/src/main/resources/org/springframework/boot/logging/java/logging.properties
similarity index 84%
rename from spring-boot/src/main/resources/org/springframework/boot/strap/logging/java/logging.properties
rename to spring-boot/src/main/resources/org/springframework/boot/logging/java/logging.properties
index fe490f90167..77e2072e34e 100644
--- a/spring-boot/src/main/resources/org/springframework/boot/strap/logging/java/logging.properties
+++ b/spring-boot/src/main/resources/org/springframework/boot/logging/java/logging.properties
@@ -3,9 +3,9 @@ handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler
 
 # File Logging
 java.util.logging.FileHandler.pattern = %t/service.log
-java.util.logging.FileHandler.formatter = org.springframework.boot.strap.logging.java.SimpleFormatter
+java.util.logging.FileHandler.formatter = org.springframework.boot.logging.java.SimpleFormatter
 java.util.logging.FileHandler.level = INFO
 java.util.logging.FileHandler.limit = 10485760
 java.util.logging.FileHandler.count = 10
 
-java.util.logging.ConsoleHandler.formatter = org.springframework.boot.strap.logging.java.SimpleFormatter
+java.util.logging.ConsoleHandler.formatter = org.springframework.boot.logging.java.SimpleFormatter
diff --git a/spring-boot/src/main/resources/org/springframework/boot/strap/logging/log4j/log4j.properties b/spring-boot/src/main/resources/org/springframework/boot/logging/log4j/log4j.properties
similarity index 100%
rename from spring-boot/src/main/resources/org/springframework/boot/strap/logging/log4j/log4j.properties
rename to spring-boot/src/main/resources/org/springframework/boot/logging/log4j/log4j.properties
diff --git a/spring-boot/src/main/resources/org/springframework/boot/strap/logging/logback/logback.xml b/spring-boot/src/main/resources/org/springframework/boot/logging/logback/logback.xml
similarity index 92%
rename from spring-boot/src/main/resources/org/springframework/boot/strap/logging/logback/logback.xml
rename to spring-boot/src/main/resources/org/springframework/boot/logging/logback/logback.xml
index b5206040dba..199a8ff094a 100644
--- a/spring-boot/src/main/resources/org/springframework/boot/strap/logging/logback/logback.xml
+++ b/spring-boot/src/main/resources/org/springframework/boot/logging/logback/logback.xml
@@ -4,8 +4,8 @@
 	<property name="FILE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%t] --- %-40.40logger{39} : %m%n%wex"/>
 	<property name="CONSOLE_LOG_PATTERN" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t{14}]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex"/>
 
-	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.strap.logging.logback.ColorConverter" />
-	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.strap.logging.logback.WhitespaceThrowableProxyConverter" />
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
 
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/BannerTests.java b/spring-boot/src/test/java/org/springframework/boot/BannerTests.java
similarity index 90%
rename from spring-boot/src/test/java/org/springframework/boot/strap/BannerTests.java
rename to spring-boot/src/test/java/org/springframework/boot/BannerTests.java
index e59e1685b0d..1ddffbe4ac1 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/BannerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/BannerTests.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap;
+package org.springframework.boot;
 
 import org.junit.Test;
-import org.springframework.boot.strap.Banner;
 
 /**
  * Tests for {@link Banner}.
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/BeanDefinitionLoaderTests.java b/spring-boot/src/test/java/org/springframework/boot/BeanDefinitionLoaderTests.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/strap/BeanDefinitionLoaderTests.java
rename to spring-boot/src/test/java/org/springframework/boot/BeanDefinitionLoaderTests.java
index be3359eedf7..aa47427b41a 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/BeanDefinitionLoaderTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/BeanDefinitionLoaderTests.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap;
+package org.springframework.boot;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.boot.strap.BeanDefinitionLoader;
-import org.springframework.boot.strap.sampleconfig.MyComponent;
+import org.springframework.boot.sampleconfig.MyComponent;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 
@@ -83,7 +82,7 @@ public class BeanDefinitionLoaderTests {
 	@Test
 	public void loadResourceName() throws Exception {
 		BeanDefinitionLoader loader = new BeanDefinitionLoader(this.registry,
-				"classpath:org/springframework/boot/strap/sample-beans.xml");
+				"classpath:org/springframework/boot/sample-beans.xml");
 		int loaded = loader.load();
 		assertThat(loaded, equalTo(1));
 		assertTrue(this.registry.containsBean("myXmlComponent"));
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/SimpleMainTests.java b/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/strap/SimpleMainTests.java
rename to spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java
index db550f3c3c8..53ed0dc932b 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/SimpleMainTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap;
+package org.springframework.boot;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -77,15 +77,14 @@ public class SimpleMainTests {
 
 	@Test
 	public void xmlContext() throws Exception {
-		SpringApplication
-				.main(getArgs("org/springframework/boot/strap/sample-beans.xml"));
+		SpringApplication.main(getArgs("org/springframework/boot/sample-beans.xml"));
 		assertTrue(getOutput().contains(SPRING_STARTUP));
 	}
 
 	@Test
 	public void mixedContext() throws Exception {
 		SpringApplication.main(getArgs(getClass().getName(),
-				"org/springframework/boot/strap/sample-beans.xml"));
+				"org/springframework/boot/sample-beans.xml"));
 		assertTrue(getOutput().contains(SPRING_STARTUP));
 	}
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/SpringApplicationTests.java b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
similarity index 97%
rename from spring-boot/src/test/java/org/springframework/boot/strap/SpringApplicationTests.java
rename to spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
index e948c21b1b7..c2a07024ac9 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/SpringApplicationTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap;
+package org.springframework.boot;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -26,12 +26,8 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.beans.factory.support.DefaultBeanNameGenerator;
-import org.springframework.boot.strap.BeanDefinitionLoader;
-import org.springframework.boot.strap.CommandLineRunner;
-import org.springframework.boot.strap.ExitCodeGenerator;
-import org.springframework.boot.strap.SpringApplication;
-import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
-import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
+import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationContextInitializer;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/StartUpLoggerTests.java b/spring-boot/src/test/java/org/springframework/boot/StartUpLoggerTests.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/strap/StartUpLoggerTests.java
rename to spring-boot/src/test/java/org/springframework/boot/StartUpLoggerTests.java
index 2d3ee079329..19e5d53d9cf 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/StartUpLoggerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/StartUpLoggerTests.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap;
+package org.springframework.boot;
 
 import org.apache.commons.logging.impl.SimpleLog;
 import org.junit.Test;
-import org.springframework.boot.strap.StartupInfoLogger;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/TestUtils.java b/spring-boot/src/test/java/org/springframework/boot/TestUtils.java
similarity index 97%
rename from spring-boot/src/test/java/org/springframework/boot/strap/TestUtils.java
rename to spring-boot/src/test/java/org/springframework/boot/TestUtils.java
index 0c55da0bb26..dc5f3e17249 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/TestUtils.java
+++ b/spring-boot/src/test/java/org/springframework/boot/TestUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap;
+package org.springframework.boot;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/ansi/AnsiOutputTest.java b/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTest.java
similarity index 71%
rename from spring-boot/src/test/java/org/springframework/boot/strap/ansi/AnsiOutputTest.java
rename to spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTest.java
index dd783ae4736..19382254a3e 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/ansi/AnsiOutputTest.java
+++ b/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTest.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.ansi;
+package org.springframework.boot.ansi;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.springframework.boot.strap.ansi.AnsiOutput;
-import org.springframework.boot.strap.ansi.AnsiOutput.Enabled;
-
-import static org.springframework.boot.strap.ansi.AnsiElement.BOLD;
-import static org.springframework.boot.strap.ansi.AnsiElement.FAINT;
-import static org.springframework.boot.strap.ansi.AnsiElement.GREEN;
-import static org.springframework.boot.strap.ansi.AnsiElement.NORMAL;
-import static org.springframework.boot.strap.ansi.AnsiElement.RED;
+import org.springframework.boot.ansi.AnsiOutput;
+import org.springframework.boot.ansi.AnsiOutput.Enabled;
+
+import static org.springframework.boot.ansi.AnsiElement.BOLD;
+import static org.springframework.boot.ansi.AnsiElement.FAINT;
+import static org.springframework.boot.ansi.AnsiElement.GREEN;
+import static org.springframework.boot.ansi.AnsiElement.NORMAL;
+import static org.springframework.boot.ansi.AnsiElement.RED;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/bind/BindingPreparationTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java
similarity index 98%
rename from spring-boot/src/test/java/org/springframework/boot/strap/bind/BindingPreparationTests.java
rename to spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java
index 1cb9b268089..90ec0be9b28 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/bind/BindingPreparationTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.bind;
+package org.springframework.boot.bind;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -24,8 +24,8 @@ import java.util.Map;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.BeanWrapperImpl;
-import org.springframework.boot.strap.bind.RelaxedDataBinder;
-import org.springframework.boot.strap.bind.RelaxedDataBinderTests.TargetWithNestedObject;
+import org.springframework.boot.bind.RelaxedDataBinder;
+import org.springframework.boot.bind.RelaxedDataBinderTests.TargetWithNestedObject;
 import org.springframework.context.expression.MapAccessor;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.Expression;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java
similarity index 97%
rename from spring-boot/src/test/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactoryTests.java
rename to spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java
index f057c191d1c..658d69b691c 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.bind;
+package org.springframework.boot.bind;
 
 import javax.validation.Validation;
 import javax.validation.constraints.NotNull;
 
 import org.junit.Test;
 import org.springframework.beans.NotWritablePropertyException;
-import org.springframework.boot.strap.bind.PropertiesConfigurationFactory;
+import org.springframework.boot.bind.PropertiesConfigurationFactory;
 import org.springframework.context.support.StaticMessageSource;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValuesTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesPropertyValuesTests.java
similarity index 96%
rename from spring-boot/src/test/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValuesTests.java
rename to spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesPropertyValuesTests.java
index b32ad23953b..98eb01b61f0 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValuesTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesPropertyValuesTests.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.bind;
+package org.springframework.boot.bind;
 
 import java.util.Collections;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.boot.strap.bind.PropertySourcesPropertyValues;
+import org.springframework.boot.bind.PropertySourcesPropertyValues;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/bind/RelaxedDataBinderTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java
similarity index 99%
rename from spring-boot/src/test/java/org/springframework/boot/strap/bind/RelaxedDataBinderTests.java
rename to spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java
index 566ae56ced3..8df8a72a84a 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/bind/RelaxedDataBinderTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.bind;
+package org.springframework.boot.bind;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -41,7 +41,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.NotWritablePropertyException;
-import org.springframework.boot.strap.bind.RelaxedDataBinder;
+import org.springframework.boot.bind.RelaxedDataBinder;
 import org.springframework.context.support.StaticMessageSource;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/bind/YamlConfigurationFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java
similarity index 96%
rename from spring-boot/src/test/java/org/springframework/boot/strap/bind/YamlConfigurationFactoryTests.java
rename to spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java
index 66731a20765..45d7f2b836c 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/bind/YamlConfigurationFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.bind;
+package org.springframework.boot.bind;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -24,7 +24,7 @@ import javax.validation.Validation;
 import javax.validation.constraints.NotNull;
 
 import org.junit.Test;
-import org.springframework.boot.strap.bind.YamlConfigurationFactory;
+import org.springframework.boot.bind.YamlConfigurationFactory;
 import org.springframework.context.support.StaticMessageSource;
 import org.springframework.validation.BindException;
 import org.springframework.validation.Validator;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/config/ArrayDocumentMatcherTests.java b/spring-boot/src/test/java/org/springframework/boot/config/ArrayDocumentMatcherTests.java
similarity index 90%
rename from spring-boot/src/test/java/org/springframework/boot/strap/config/ArrayDocumentMatcherTests.java
rename to spring-boot/src/test/java/org/springframework/boot/config/ArrayDocumentMatcherTests.java
index b85381a37f8..b44f0d9f3e0 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/config/ArrayDocumentMatcherTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/config/ArrayDocumentMatcherTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.io.IOException;
 import java.util.Properties;
 
 import org.junit.Test;
-import org.springframework.boot.strap.config.ArrayDocumentMatcher;
-import org.springframework.boot.strap.config.YamlProcessor.MatchStatus;
+import org.springframework.boot.config.ArrayDocumentMatcher;
+import org.springframework.boot.config.YamlProcessor.MatchStatus;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/config/JacksonParserTests.java b/spring-boot/src/test/java/org/springframework/boot/config/JacksonParserTests.java
similarity index 83%
rename from spring-boot/src/test/java/org/springframework/boot/strap/config/JacksonParserTests.java
rename to spring-boot/src/test/java/org/springframework/boot/config/JacksonParserTests.java
index 3351a405c8b..73d71ca0349 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/config/JacksonParserTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/config/JacksonParserTests.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
-import org.springframework.boot.strap.config.JacksonJsonParser;
-import org.springframework.boot.strap.config.JsonParser;
+import org.springframework.boot.config.JacksonJsonParser;
+import org.springframework.boot.config.JsonParser;
 
 
 /**
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/config/SimpleJsonParserTests.java b/spring-boot/src/test/java/org/springframework/boot/config/SimpleJsonParserTests.java
similarity index 92%
rename from spring-boot/src/test/java/org/springframework/boot/strap/config/SimpleJsonParserTests.java
rename to spring-boot/src/test/java/org/springframework/boot/config/SimpleJsonParserTests.java
index 6bd172a9645..51c77131e3a 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/config/SimpleJsonParserTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/config/SimpleJsonParserTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.springframework.boot.strap.config.JsonParser;
-import org.springframework.boot.strap.config.SimpleJsonParser;
+import org.springframework.boot.config.JsonParser;
+import org.springframework.boot.config.SimpleJsonParser;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/config/YamlJsonParserTests.java b/spring-boot/src/test/java/org/springframework/boot/config/YamlJsonParserTests.java
similarity index 83%
rename from spring-boot/src/test/java/org/springframework/boot/strap/config/YamlJsonParserTests.java
rename to spring-boot/src/test/java/org/springframework/boot/config/YamlJsonParserTests.java
index 5f68c6ffd5c..665b76604a5 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/config/YamlJsonParserTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/config/YamlJsonParserTests.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
-import org.springframework.boot.strap.config.JsonParser;
-import org.springframework.boot.strap.config.YamlJsonParser;
+import org.springframework.boot.config.JsonParser;
+import org.springframework.boot.config.YamlJsonParser;
 
 
 /**
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/config/YamlMapFactoryBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/config/YamlMapFactoryBeanTests.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/strap/config/YamlMapFactoryBeanTests.java
rename to spring-boot/src/test/java/org/springframework/boot/config/YamlMapFactoryBeanTests.java
index fff38c2862e..a554cfbad43 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/config/YamlMapFactoryBeanTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/config/YamlMapFactoryBeanTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 
 import org.junit.Test;
-import org.springframework.boot.strap.config.YamlMapFactoryBean;
-import org.springframework.boot.strap.config.YamlProcessor.ResolutionMethod;
+import org.springframework.boot.config.YamlMapFactoryBean;
+import org.springframework.boot.config.YamlProcessor.ResolutionMethod;
 import org.springframework.core.io.AbstractResource;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.FileSystemResource;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/config/YamlProcessorTests.java b/spring-boot/src/test/java/org/springframework/boot/config/YamlProcessorTests.java
similarity index 91%
rename from spring-boot/src/test/java/org/springframework/boot/strap/config/YamlProcessorTests.java
rename to spring-boot/src/test/java/org/springframework/boot/config/YamlProcessorTests.java
index d3bb0154422..e068a511754 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/config/YamlProcessorTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/config/YamlProcessorTests.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.util.Map;
 import java.util.Properties;
 
 import org.junit.Test;
-import org.springframework.boot.strap.config.YamlProcessor;
-import org.springframework.boot.strap.config.YamlProcessor.MatchCallback;
+import org.springframework.boot.config.YamlProcessor;
+import org.springframework.boot.config.YamlProcessor.MatchCallback;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/config/YamlPropertiesFactoryBeanTests.java
similarity index 95%
rename from spring-boot/src/test/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBeanTests.java
rename to spring-boot/src/test/java/org/springframework/boot/config/YamlPropertiesFactoryBeanTests.java
index 2cd5c3cf340..adf2829eb2f 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBeanTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/config/YamlPropertiesFactoryBeanTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.config;
+package org.springframework.boot.config;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -22,10 +22,10 @@ import java.util.Properties;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.boot.strap.config.YamlPropertiesFactoryBean;
-import org.springframework.boot.strap.config.YamlProcessor.DocumentMatcher;
-import org.springframework.boot.strap.config.YamlProcessor.MatchStatus;
-import org.springframework.boot.strap.config.YamlProcessor.ResolutionMethod;
+import org.springframework.boot.config.YamlPropertiesFactoryBean;
+import org.springframework.boot.config.YamlProcessor.DocumentMatcher;
+import org.springframework.boot.config.YamlProcessor.MatchStatus;
+import org.springframework.boot.config.YamlProcessor.ResolutionMethod;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBean.java b/spring-boot/src/test/java/org/springframework/boot/context/condition/AssertMissingBean.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBean.java
rename to spring-boot/src/test/java/org/springframework/boot/context/condition/AssertMissingBean.java
index 65e0fd10386..c0ebf80694f 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBean.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/condition/AssertMissingBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Conditional;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBeanCondition.java b/spring-boot/src/test/java/org/springframework/boot/context/condition/AssertMissingBeanCondition.java
similarity index 91%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBeanCondition.java
rename to spring-boot/src/test/java/org/springframework/boot/context/condition/AssertMissingBeanCondition.java
index 03fc63826f8..1a5a48ddb46 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBeanCondition.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/condition/AssertMissingBeanCondition.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import java.util.List;
 
 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.boot.strap.context.condition.OnMissingBeanCondition;
+import org.springframework.boot.context.condition.OnMissingBeanCondition;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.type.AnnotatedTypeMetadata;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnBeanConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnBeanConditionTests.java
similarity index 96%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnBeanConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/condition/OnBeanConditionTests.java
index a0f015bb079..bfcaa50422e 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnBeanConditionTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnBeanConditionTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.boot.strap.context.condition.ConditionalOnBean;
+import org.springframework.boot.context.condition.ConditionalOnBean;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnClassConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnClassConditionTests.java
similarity index 89%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnClassConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/condition/OnClassConditionTests.java
index 26a0ddbe7a6..58fd9c34129 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnClassConditionTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnClassConditionTests.java
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import org.junit.Test;
-import org.springframework.boot.strap.context.condition.ConditionalOnClass;
-import org.springframework.boot.strap.context.condition.OnClassCondition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -97,13 +95,13 @@ public class OnClassConditionTests {
 	}
 
 	@Configuration
-	@ImportResource("org/springframework/boot/strap/context/foo.xml")
+	@ImportResource("org/springframework/boot/context/foo.xml")
 	protected static class XmlConfiguration {
 	}
 
 	@Configuration
 	@Import(BasicConfiguration.class)
-	@ImportResource("org/springframework/boot/strap/context/foo.xml")
+	@ImportResource("org/springframework/boot/context/foo.xml")
 	protected static class CombinedXmlConfiguration {
 	}
 }
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnExpressionConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnExpressionConditionTests.java
similarity index 89%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnExpressionConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/condition/OnExpressionConditionTests.java
index 0d3cd8baa18..2be2bd28073 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnExpressionConditionTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnExpressionConditionTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import org.junit.Test;
-import org.springframework.boot.strap.context.condition.ConditionalOnExpression;
-import org.springframework.boot.strap.context.condition.OnExpressionCondition;
+import org.springframework.boot.context.condition.ConditionalOnExpression;
+import org.springframework.boot.context.condition.OnExpressionCondition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnMissingBeanConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnMissingBeanConditionTests.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnMissingBeanConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/condition/OnMissingBeanConditionTests.java
index 916adc878e1..62785f9311a 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnMissingBeanConditionTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnMissingBeanConditionTests.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import org.junit.Test;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
-import org.springframework.boot.strap.context.condition.OnMissingBeanCondition;
-import org.springframework.boot.strap.context.condition.SearchStrategy;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.condition.OnMissingBeanCondition;
+import org.springframework.boot.context.condition.SearchStrategy;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnMissingClassConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnMissingClassConditionTests.java
similarity index 86%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnMissingClassConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/condition/OnMissingClassConditionTests.java
index fdaa9939a0c..48aba2727a3 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnMissingClassConditionTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnMissingClassConditionTests.java
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import org.junit.Test;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingClass;
-import org.springframework.boot.strap.context.condition.OnMissingClassCondition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -53,7 +51,7 @@ public class OnMissingClassConditionTests {
 	}
 
 	@Configuration
-	@ConditionalOnMissingClass("org.springframework.boot.strap.context.condition.OnMissingClassConditionTests")
+	@ConditionalOnMissingClass("org.springframework.boot.context.condition.OnMissingClassConditionTests")
 	protected static class BasicConfiguration {
 		@Bean
 		public String bar() {
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnNotWebApplicationConditionTests.java
similarity index 85%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/condition/OnNotWebApplicationConditionTests.java
index 7aa4351e130..c2391c2f4bf 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationConditionTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnNotWebApplicationConditionTests.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import org.junit.Test;
-import org.springframework.boot.strap.context.condition.ConditionalOnNotWebApplication;
-import org.springframework.boot.strap.context.condition.ConditionalOnWebApplication;
-import org.springframework.boot.strap.context.condition.OnNotWebApplicationCondition;
+import org.springframework.boot.context.condition.ConditionalOnNotWebApplication;
+import org.springframework.boot.context.condition.ConditionalOnWebApplication;
+import org.springframework.boot.context.condition.OnNotWebApplicationCondition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnResourceConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnResourceConditionTests.java
similarity index 90%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnResourceConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/condition/OnResourceConditionTests.java
index a0dc672aa35..1e4db88015d 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnResourceConditionTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnResourceConditionTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import org.junit.Test;
-import org.springframework.boot.strap.context.condition.ConditionalOnResource;
-import org.springframework.boot.strap.context.condition.OnResourceCondition;
+import org.springframework.boot.context.condition.ConditionalOnResource;
+import org.springframework.boot.context.condition.OnResourceCondition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnWebApplicationConditionTests.java b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnWebApplicationConditionTests.java
similarity index 86%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnWebApplicationConditionTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/condition/OnWebApplicationConditionTests.java
index e403dda2959..a77765a6f87 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/condition/OnWebApplicationConditionTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/condition/OnWebApplicationConditionTests.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.condition;
+package org.springframework.boot.context.condition;
 
 import org.junit.Test;
-import org.springframework.boot.strap.context.condition.ConditionalOnNotWebApplication;
-import org.springframework.boot.strap.context.condition.ConditionalOnWebApplication;
-import org.springframework.boot.strap.context.condition.OnWebApplicationCondition;
+import org.springframework.boot.context.condition.ConditionalOnNotWebApplication;
+import org.springframework.boot.context.condition.ConditionalOnWebApplication;
+import org.springframework.boot.context.condition.OnWebApplicationCondition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.web.MockServletContext;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
index 02e0996a3a8..c6bc69fb256 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.io.FileWriter;
 import java.io.IOException;
@@ -38,13 +38,6 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.mockito.InOrder;
-import org.springframework.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer;
-import org.springframework.boot.strap.context.embedded.FilterRegistrationBean;
-import org.springframework.boot.strap.context.embedded.MimeMappings;
-import org.springframework.boot.strap.context.embedded.ServletContextInitializer;
-import org.springframework.boot.strap.context.embedded.ServletRegistrationBean;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
index 40a1f0e2dd0..d01097092c8 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
 
 import org.junit.Test;
-import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.config.ExampleEmbeddedWebApplicationConfiguration;
+import org.springframework.boot.context.embedded.config.ExampleEmbeddedWebApplicationConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.context.ServletContextAware;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
index 66fa28b4ce0..cf8e6e356d5 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.net.URI;
 import java.nio.charset.Charset;
@@ -22,8 +22,8 @@ import java.nio.charset.Charset;
 import org.junit.After;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
@@ -117,7 +117,7 @@ public class EmbeddedServletContainerMvcIntegrationTests {
 
 	@Configuration
 	@EnableWebMvc
-	@PropertySource("classpath:/org/springframework/boot/strap/context/embedded/conf.properties")
+	@PropertySource("classpath:/org/springframework/boot/context/embedded/conf.properties")
 	public static class AdvancedConfig {
 
 		@Autowired
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContextTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContextTests.java
similarity index 97%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContextTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContextTests.java
index 1cbd9619bc6..9c23cabe875 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContextTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContextTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.lang.reflect.Field;
 import java.util.Properties;
@@ -33,10 +33,6 @@ import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.boot.strap.context.embedded.EmbeddedWebApplicationContext;
-import org.springframework.boot.strap.context.embedded.FilterRegistrationBean;
-import org.springframework.boot.strap.context.embedded.ServletContextInitializer;
-import org.springframework.boot.strap.context.embedded.ServletRegistrationBean;
 import org.springframework.context.ApplicationContextException;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ExampleFilter.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleFilter.java
similarity index 96%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ExampleFilter.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleFilter.java
index 8433ed21eab..0182010375c 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ExampleFilter.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.io.IOException;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ExampleServlet.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleServlet.java
similarity index 95%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ExampleServlet.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleServlet.java
index 0a05b31b69a..23ed7a8400b 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ExampleServlet.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleServlet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.io.IOException;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/FilterRegistrationBeanTests.java
similarity index 82%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBeanTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/FilterRegistrationBeanTests.java
index a5672d0b1d9..c810ef8aa01 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBeanTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/FilterRegistrationBeanTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -32,12 +32,11 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.springframework.boot.strap.context.embedded.FilterRegistrationBean;
-import org.springframework.boot.strap.context.embedded.ServletRegistrationBean;
 
-import static org.mockito.BDDMockito.*;
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.verify;
 
 /**
  * Tests for {@link FilterRegistrationBean}.
@@ -68,7 +67,7 @@ public class FilterRegistrationBeanTests {
 	public void startupWithDefaults() throws Exception {
 		FilterRegistrationBean bean = new FilterRegistrationBean(this.filter);
 		bean.onStartup(this.servletContext);
-		verify(this.servletContext).addFilter("mockFilter", filter);
+		verify(this.servletContext).addFilter("mockFilter", this.filter);
 		verify(this.registration).setAsyncSupported(true);
 		verify(this.registration).addMappingForUrlPatterns(
 				FilterRegistrationBean.ASYNC_DISPATCHER_TYPES, false, "/*");
@@ -126,38 +125,38 @@ public class FilterRegistrationBeanTests {
 	@Test
 	public void setFilterMustNotBeNull() throws Exception {
 		FilterRegistrationBean bean = new FilterRegistrationBean();
-		thrown.expect(IllegalArgumentException.class);
-		thrown.expectMessage("Filter must not be null");
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("Filter must not be null");
 		bean.onStartup(this.servletContext);
 	}
 
 	@Test
 	public void createServletMustNotBeNull() throws Exception {
-		thrown.expect(IllegalArgumentException.class);
-		thrown.expectMessage("Filter must not be null");
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("Filter must not be null");
 		new FilterRegistrationBean(null);
 	}
 
 	@Test
 	public void setServletRegistrationBeanMustNotBeNull() throws Exception {
 		FilterRegistrationBean bean = new FilterRegistrationBean(this.filter);
-		thrown.expect(IllegalArgumentException.class);
-		thrown.expectMessage("ServletRegistrationBeans must not be null");
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("ServletRegistrationBeans must not be null");
 		bean.setServletRegistrationBeans(null);
 	}
 
 	@Test
 	public void createServletRegistrationBeanMustNotBeNull() throws Exception {
-		thrown.expect(IllegalArgumentException.class);
-		thrown.expectMessage("ServletRegistrationBeans must not be null");
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("ServletRegistrationBeans must not be null");
 		new FilterRegistrationBean(this.filter, (ServletRegistrationBean[]) null);
 	}
 
 	@Test
 	public void addServletRegistrationBeanMustNotBeNull() throws Exception {
 		FilterRegistrationBean bean = new FilterRegistrationBean(this.filter);
-		thrown.expect(IllegalArgumentException.class);
-		thrown.expectMessage("ServletRegistrationBeans must not be null");
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("ServletRegistrationBeans must not be null");
 		bean.addServletRegistrationBeans((ServletRegistrationBean[]) null);
 	}
 
@@ -184,32 +183,32 @@ public class FilterRegistrationBeanTests {
 	@Test
 	public void setUrlPatternMustNotBeNull() throws Exception {
 		FilterRegistrationBean bean = new FilterRegistrationBean(this.filter);
-		thrown.expect(IllegalArgumentException.class);
-		thrown.expectMessage("UrlPatterns must not be null");
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("UrlPatterns must not be null");
 		bean.setUrlPatterns(null);
 	}
 
 	@Test
 	public void addUrlPatternMustNotBeNull() throws Exception {
 		FilterRegistrationBean bean = new FilterRegistrationBean(this.filter);
-		thrown.expect(IllegalArgumentException.class);
-		thrown.expectMessage("UrlPatterns must not be null");
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("UrlPatterns must not be null");
 		bean.addUrlPatterns((String[]) null);
 	}
 
 	@Test
 	public void setServletNameMustNotBeNull() throws Exception {
 		FilterRegistrationBean bean = new FilterRegistrationBean(this.filter);
-		thrown.expect(IllegalArgumentException.class);
-		thrown.expectMessage("ServletNames must not be null");
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("ServletNames must not be null");
 		bean.setServletNames(null);
 	}
 
 	@Test
 	public void addServletNameMustNotBeNull() throws Exception {
 		FilterRegistrationBean bean = new FilterRegistrationBean(this.filter);
-		thrown.expect(IllegalArgumentException.class);
-		thrown.expectMessage("ServletNames must not be null");
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("ServletNames must not be null");
 		bean.addServletNames((String[]) null);
 	}
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MimeMappingsTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MimeMappingsTests.java
similarity index 97%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MimeMappingsTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/MimeMappingsTests.java
index c63166f1b1b..e0391f44218 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MimeMappingsTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MimeMappingsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -29,7 +29,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.springframework.boot.strap.context.embedded.MimeMappings;
+import org.springframework.boot.context.embedded.MimeMappings;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockEmbeddedServletContainerFactory.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java
index 15b9d25fe49..754cf4bdf86 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -31,11 +31,6 @@ import javax.servlet.ServletRegistration;
 
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.springframework.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerException;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.ServletContextInitializer;
 
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Matchers.anyObject;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockFilter.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockFilter.java
similarity index 95%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockFilter.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/MockFilter.java
index 4370aa9e86a..437f7b7fa76 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockFilter.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.io.IOException;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockServlet.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockServlet.java
similarity index 94%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockServlet.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/MockServlet.java
index 4c762a9e44c..74772ec5c5e 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/MockServlet.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockServlet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.io.IOException;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/ServletRegistrationBeanTests.java
similarity index 97%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBeanTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/ServletRegistrationBeanTests.java
index a51be118f62..0fdc412961e 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBeanTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/ServletRegistrationBeanTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -34,7 +34,6 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.springframework.boot.strap.context.embedded.ServletRegistrationBean;
 
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Matchers.anyObject;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContextTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContextTests.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContextTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContextTests.java
index 4be0188f02c..afd0eb02d40 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContextTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContextTests.java
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded;
+package org.springframework.boot.context.embedded;
 
 import javax.servlet.Servlet;
 
 import org.junit.Test;
-import org.springframework.boot.strap.context.embedded.XmlEmbeddedWebApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verify;
 
 /**
  * Tests for {@link XmlEmbeddedWebApplicationContext}.
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
similarity index 73%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
index 3ae253a6cc3..ef76a79009d 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded.config;
+package org.springframework.boot.context.embedded.config;
 
 import javax.servlet.Servlet;
 
-import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContextTests;
-import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.MockEmbeddedServletContainerFactory;
-import org.springframework.boot.strap.context.embedded.MockServlet;
+import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContextTests;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.MockEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.MockServlet;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
similarity index 89%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
index b98c2e765db..ef1ddb32852 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded.jetty;
+package org.springframework.boot.context.embedded.jetty;
 
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
@@ -24,9 +24,9 @@ import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.junit.Test;
 import org.mockito.InOrder;
-import org.springframework.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactoryTests;
-import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainer;
-import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.AbstractEmbeddedServletContainerFactoryTests;
+import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainer;
+import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/properties/ServerPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/properties/ServerPropertiesTests.java
similarity index 91%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/properties/ServerPropertiesTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/properties/ServerPropertiesTests.java
index 390663e7b56..6a796e67ef5 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/properties/ServerPropertiesTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/properties/ServerPropertiesTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded.properties;
+package org.springframework.boot.context.embedded.properties;
 
 import java.net.InetAddress;
 import java.util.Collections;
@@ -23,8 +23,8 @@ import java.util.Map;
 
 import org.junit.Test;
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.boot.strap.bind.RelaxedDataBinder;
-import org.springframework.boot.strap.context.embedded.properties.ServerProperties;
+import org.springframework.boot.bind.RelaxedDataBinder;
+import org.springframework.boot.context.embedded.properties.ServerProperties;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
similarity index 89%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
index 1252000b9a2..9b6a6ff9c05 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.embedded.tomcat;
+package org.springframework.boot.context.embedded.tomcat;
 
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
@@ -25,9 +25,9 @@ import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.startup.Tomcat;
 import org.junit.Test;
 import org.mockito.InOrder;
-import org.springframework.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactoryTests;
-import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainer;
-import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.AbstractEmbeddedServletContainerFactoryTests;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializerTests.java
similarity index 96%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializerTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializerTests.java
index 23db0a95368..6c2ad9b69c9 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializerTests.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.initializer;
+package org.springframework.boot.context.initializer;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.springframework.boot.strap.context.initializer.ConfigFileApplicationContextInitializer;
+import org.springframework.boot.context.initializer.ConfigFileApplicationContextInitializer;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.SimpleCommandLinePropertySource;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializerTests.java
similarity index 92%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializerTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializerTests.java
index fa57e03ce22..89dc5366b59 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializerTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.initializer;
+package org.springframework.boot.context.initializer;
 
 import org.junit.Test;
-import org.springframework.boot.strap.TestUtils;
-import org.springframework.boot.strap.context.initializer.ContextIdApplicationContextInitializer;
+import org.springframework.boot.TestUtils;
+import org.springframework.boot.context.initializer.ContextIdApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java b/spring-boot/src/test/java/org/springframework/boot/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
similarity index 97%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
rename to spring-boot/src/test/java/org/springframework/boot/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
index f56ebae1a7e..e58b88a7d64 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.initializer;
+package org.springframework.boot.context.initializer;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,7 +22,7 @@ import java.util.Map;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.springframework.boot.strap.context.initializer.EnvironmentDelegateApplicationContextInitializer;
+import org.springframework.boot.context.initializer.EnvironmentDelegateApplicationContextInitializer;
 import org.springframework.context.ApplicationContextException;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/initializer/LoggingApplicationContextInitializerTests.java
similarity index 95%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializerTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/initializer/LoggingApplicationContextInitializerTests.java
index 09218685456..4a62b498b5e 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/initializer/LoggingApplicationContextInitializerTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.initializer;
+package org.springframework.boot.context.initializer;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,9 +29,9 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.springframework.boot.strap.SpringApplication;
-import org.springframework.boot.strap.context.initializer.LoggingApplicationContextInitializer;
-import org.springframework.boot.strap.logging.java.JavaLoggingSystem;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.context.initializer.LoggingApplicationContextInitializer;
+import org.springframework.boot.logging.java.JavaLoggingSystem;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.env.PropertySource;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/initializer/VcapApplicationContextInitializerTests.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializerTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/initializer/VcapApplicationContextInitializerTests.java
index 700daa383af..abf4aad1150 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/initializer/VcapApplicationContextInitializerTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.initializer;
+package org.springframework.boot.context.initializer;
 
 import org.junit.Test;
-import org.springframework.boot.strap.TestUtils;
-import org.springframework.boot.strap.context.initializer.VcapApplicationContextInitializer;
+import org.springframework.boot.TestUtils;
+import org.springframework.boot.context.initializer.VcapApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java
similarity index 94%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java
index 7a3c0b49788..207eab4ae4c 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.properties;
+package org.springframework.boot.context.properties;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,11 +25,9 @@ import javax.annotation.PostConstruct;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.strap.TestUtils;
-import org.springframework.boot.strap.context.condition.AssertMissingBean;
-import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.TestUtils;
+import org.springframework.boot.context.condition.AssertMissingBean;
+import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -210,7 +208,7 @@ public class EnableConfigurationPropertiesTests {
 	@EnableConfigurationProperties
 	protected static class TestBeanConfiguration {
 		@ConditionalOnMissingBean(TestProperties.class)
-		@Bean(name = "org.springframework.boot.strap.context.annotation.EnableConfigurationPropertiesTests$TestProperties")
+		@Bean(name = "org.springframework.boot.context.annotation.EnableConfigurationPropertiesTests$TestProperties")
 		public TestProperties testProperties() {
 			return new TestProperties();
 		}
@@ -228,7 +226,7 @@ public class EnableConfigurationPropertiesTests {
 	}
 
 	@Configuration
-	@ImportResource("org/springframework/boot/strap/context/properties/testProperties.xml")
+	@ImportResource("org/springframework/boot/context/properties/testProperties.xml")
 	protected static class DefaultXmlConfiguration {
 	}
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/context/test/EnableConfigurationPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/context/test/EnableConfigurationPropertiesTests.java
similarity index 94%
rename from spring-boot/src/test/java/org/springframework/boot/strap/context/test/EnableConfigurationPropertiesTests.java
rename to spring-boot/src/test/java/org/springframework/boot/context/test/EnableConfigurationPropertiesTests.java
index 1b85a242922..bd32f783af5 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/context/test/EnableConfigurationPropertiesTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/test/EnableConfigurationPropertiesTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.context.test;
+package org.springframework.boot.context.test;
 
 import java.util.Properties;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.boot.strap.context.properties.ConfigurationProperties;
-import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/logging/java/JavaLoggerSystemTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggerSystemTests.java
similarity index 96%
rename from spring-boot/src/test/java/org/springframework/boot/strap/logging/java/JavaLoggerSystemTests.java
rename to spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggerSystemTests.java
index 7f5b2d2c9ee..d5a10edb7d1 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/logging/java/JavaLoggerSystemTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggerSystemTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.logging.java;
+package org.springframework.boot.logging.java;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -25,7 +25,7 @@ import org.apache.commons.logging.impl.Jdk14Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.boot.strap.logging.java.JavaLoggingSystem;
+import org.springframework.boot.logging.java.JavaLoggingSystem;
 import org.springframework.util.ClassUtils;
 
 import static org.junit.Assert.assertTrue;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/logging/java/TestFormatter.java b/spring-boot/src/test/java/org/springframework/boot/logging/java/TestFormatter.java
similarity index 94%
rename from spring-boot/src/test/java/org/springframework/boot/strap/logging/java/TestFormatter.java
rename to spring-boot/src/test/java/org/springframework/boot/logging/java/TestFormatter.java
index f7ce6313ac5..9b51b017614 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/logging/java/TestFormatter.java
+++ b/spring-boot/src/test/java/org/springframework/boot/logging/java/TestFormatter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.logging.java;
+package org.springframework.boot.logging.java;
 
 import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/ColorConverterTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java
similarity index 95%
rename from spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/ColorConverterTests.java
rename to spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java
index 1903dda1a53..9349518d5e0 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/ColorConverterTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.logging.logback;
+package org.springframework.boot.logging.logback;
 
 import java.util.Collections;
 
@@ -22,12 +22,11 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.springframework.boot.strap.ansi.AnsiOutput;
-import org.springframework.boot.strap.logging.logback.ColorConverter;
+import org.springframework.boot.ansi.AnsiOutput;
+import org.springframework.boot.logging.logback.ColorConverter;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.LoggingEvent;
-
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystemTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
similarity index 94%
rename from spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystemTests.java
rename to spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
index b3ffd455fb4..bfa265a2656 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystemTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.logging.logback;
+package org.springframework.boot.logging.logback;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.boot.strap.logging.logback.LogbackLoggingSystem;
+import org.springframework.boot.logging.logback.LogbackLoggingSystem;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverterTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/WhitespaceThrowableProxyConverterTests.java
similarity index 91%
rename from spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverterTests.java
rename to spring-boot/src/test/java/org/springframework/boot/logging/logback/WhitespaceThrowableProxyConverterTests.java
index 1d57d7f49dc..5146474b265 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverterTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/WhitespaceThrowableProxyConverterTests.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.logging.logback;
+package org.springframework.boot.logging.logback;
 
 import org.junit.Test;
-import org.springframework.boot.strap.logging.logback.WhitespaceThrowableProxyConverter;
+import org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter;
 
 import ch.qos.logback.classic.spi.LoggingEvent;
 import ch.qos.logback.classic.spi.ThrowableProxy;
-
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.startsWith;
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/sampleconfig/MyComponent.java b/spring-boot/src/test/java/org/springframework/boot/sampleconfig/MyComponent.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/strap/sampleconfig/MyComponent.java
rename to spring-boot/src/test/java/org/springframework/boot/sampleconfig/MyComponent.java
index 9147cf55ca4..25145fc8e46 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/sampleconfig/MyComponent.java
+++ b/spring-boot/src/test/java/org/springframework/boot/sampleconfig/MyComponent.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.strap.sampleconfig;
+package org.springframework.boot.sampleconfig;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/strap/sampleconfig/package-info.java b/spring-boot/src/test/java/org/springframework/boot/sampleconfig/package-info.java
similarity index 92%
rename from spring-boot/src/test/java/org/springframework/boot/strap/sampleconfig/package-info.java
rename to spring-boot/src/test/java/org/springframework/boot/sampleconfig/package-info.java
index 215a667f6bc..530b4f478e1 100644
--- a/spring-boot/src/test/java/org/springframework/boot/strap/sampleconfig/package-info.java
+++ b/spring-boot/src/test/java/org/springframework/boot/sampleconfig/package-info.java
@@ -17,5 +17,5 @@
 /**
  * Sample config for tests
  */
-package org.springframework.boot.strap.sampleconfig;
+package org.springframework.boot.sampleconfig;
 
diff --git a/spring-boot/src/test/resources/dispatcher.properties b/spring-boot/src/test/resources/dispatcher.properties
index 851ea9b5d5f..0ffbf1791fa 100644
--- a/spring-boot/src/test/resources/dispatcher.properties
+++ b/spring-boot/src/test/resources/dispatcher.properties
@@ -1 +1 @@
-main.sources: org.springframework.boot.strap.main.DispatcherMainTests
\ No newline at end of file
+main.sources: org.springframework.boot.main.DispatcherMainTests
diff --git a/spring-boot/src/test/resources/logback-test.xml b/spring-boot/src/test/resources/logback-test.xml
index a15ea5dbe19..a72f5b59b58 100644
--- a/spring-boot/src/test/resources/logback-test.xml
+++ b/spring-boot/src/test/resources/logback-test.xml
@@ -7,8 +7,8 @@
 			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
-	<logger name="org.springframework.boot.strap.context.annotation" level="TRACE" />
-	<logger name="org.springframework.boot.strap.config" level="TRACE" />
+	<logger name="org.springframework.boot.context.annotation" level="TRACE" />
+	<logger name="org.springframework.boot.config" level="TRACE" />
 	<logger name="org.thymeleaf" level="TRACE" />
 	<root level="INFO">
 		<appender-ref ref="CONSOLE" />
diff --git a/spring-boot/src/test/resources/logging.properties b/spring-boot/src/test/resources/logging.properties
index 2e306c9a5d2..187c49109c0 100644
--- a/spring-boot/src/test/resources/logging.properties
+++ b/spring-boot/src/test/resources/logging.properties
@@ -1,4 +1,4 @@
 handlers= java.util.logging.ConsoleHandler
 .level= INFO
 java.util.logging.ConsoleHandler.level = INFO
-java.util.logging.ConsoleHandler.formatter = org.springframework.boot.strap.logging.java.SimpleFormatter
+java.util.logging.ConsoleHandler.formatter = org.springframework.boot.logging.java.SimpleFormatter
diff --git a/spring-boot/src/test/resources/org/springframework/boot/strap/context/embedded/conf.properties b/spring-boot/src/test/resources/org/springframework/boot/context/embedded/conf.properties
similarity index 100%
rename from spring-boot/src/test/resources/org/springframework/boot/strap/context/embedded/conf.properties
rename to spring-boot/src/test/resources/org/springframework/boot/context/embedded/conf.properties
diff --git a/spring-boot/src/test/resources/org/springframework/boot/strap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml b/spring-boot/src/test/resources/org/springframework/boot/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
similarity index 63%
rename from spring-boot/src/test/resources/org/springframework/boot/strap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
rename to spring-boot/src/test/resources/org/springframework/boot/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
index 4b81b8f5913..5dc0d4e3c41 100644
--- a/spring-boot/src/test/resources/org/springframework/boot/strap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
+++ b/spring-boot/src/test/resources/org/springframework/boot/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
@@ -4,8 +4,8 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean name="servletContainerFactory"
-		class="org.springframework.boot.strap.context.embedded.MockEmbeddedServletContainerFactory" />
+		class="org.springframework.boot.context.embedded.MockEmbeddedServletContainerFactory" />
 
-	<bean name="servlet" class="org.springframework.boot.strap.context.embedded.MockServlet"/>
+	<bean name="servlet" class="org.springframework.boot.context.embedded.MockServlet"/>
 
 </beans>
diff --git a/spring-boot/src/test/resources/org/springframework/boot/strap/context/foo.xml b/spring-boot/src/test/resources/org/springframework/boot/context/foo.xml
similarity index 100%
rename from spring-boot/src/test/resources/org/springframework/boot/strap/context/foo.xml
rename to spring-boot/src/test/resources/org/springframework/boot/context/foo.xml
diff --git a/spring-boot/src/test/resources/org/springframework/boot/strap/context/properties/testProperties.xml b/spring-boot/src/test/resources/org/springframework/boot/context/properties/testProperties.xml
similarity index 61%
rename from spring-boot/src/test/resources/org/springframework/boot/strap/context/properties/testProperties.xml
rename to spring-boot/src/test/resources/org/springframework/boot/context/properties/testProperties.xml
index 3591aef3474..bb8c2eb2de5 100644
--- a/spring-boot/src/test/resources/org/springframework/boot/strap/context/properties/testProperties.xml
+++ b/spring-boot/src/test/resources/org/springframework/boot/context/properties/testProperties.xml
@@ -4,8 +4,8 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean
-		id="org.springframework.boot.strap.context.properties.EnableConfigurationPropertiesTests$TestProperties"
-		class="org.springframework.boot.strap.context.properties.EnableConfigurationPropertiesTests$TestProperties">
+		id="org.springframework.boot.context.properties.EnableConfigurationPropertiesTests$TestProperties"
+		class="org.springframework.boot.context.properties.EnableConfigurationPropertiesTests$TestProperties">
 		<property name="name" value="bar"/>
 	</bean>
 
diff --git a/spring-boot/src/test/resources/org/springframework/boot/strap/sample-beans.xml b/spring-boot/src/test/resources/org/springframework/boot/sample-beans.xml
similarity index 83%
rename from spring-boot/src/test/resources/org/springframework/boot/strap/sample-beans.xml
rename to spring-boot/src/test/resources/org/springframework/boot/sample-beans.xml
index 6c1b3aa12d1..f0fb6ce5138 100644
--- a/spring-boot/src/test/resources/org/springframework/boot/strap/sample-beans.xml
+++ b/spring-boot/src/test/resources/org/springframework/boot/sample-beans.xml
@@ -5,5 +5,5 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-	<bean id="myXmlComponent" class="org.springframework.boot.strap.sampleconfig.MyComponent"/>
+	<bean id="myXmlComponent" class="org.springframework.boot.sampleconfig.MyComponent"/>
 </beans>