Renamed packages

Issue: #54095231

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

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>

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>

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;
 
 /**

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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();

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;

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

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.

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;

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;
 
 /**

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;
 

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;

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;
 

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;
 

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;

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;

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;
 

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;

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;

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;

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;
 

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;

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;
 

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;

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;
 

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;
 
 /**

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;

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;

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;

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;
 

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;

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);

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,

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>

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;

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;

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}.

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;
 

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}.

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;

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;
 

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;

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;
 

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;

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;
 

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;
 

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}.

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

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

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;
 

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;
 

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;

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;

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;

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;

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}.

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}.

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;

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";
 	}
 }

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";
 	}
 }

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"));

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.

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>

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;
 

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;

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;

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;

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;
 

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;
 

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;

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;
 

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;

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;