diff --git a/pom.xml b/pom.xml
index 66b5adc1c2..eb221adb12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,14 +36,14 @@
 		</developer>
 	</developers>
 	<modules>
-		<module>spring-zero-actuator</module>
-		<module>spring-zero-autoconfigure</module>
-		<module>spring-zero-cli</module>
-		<module>spring-zero-core</module>
+		<module>spring-bootstrap</module>
+		<module>spring-autoconfigure</module>
+		<module>spring-starters</module>
+		<module>spring-actuator</module>
+		<module>spring-launcher</module>
+		<module>spring-package-maven-plugin</module>
+		<module>spring-cli</module>
 		<module>spring-zero-intergration-tests</module>
-		<module>spring-zero-launcher</module>
-		<module>spring-zero-maven-plugin</module>
-		<module>spring-zero-starters</module>
 	</modules>
 	<build>
 		<pluginManagement>
diff --git a/spring-zero-actuator/README.md b/spring-actuator/README.md
similarity index 100%
rename from spring-zero-actuator/README.md
rename to spring-actuator/README.md
diff --git a/spring-zero-actuator/docs/Features.md b/spring-actuator/docs/Features.md
similarity index 100%
rename from spring-zero-actuator/docs/Features.md
rename to spring-actuator/docs/Features.md
diff --git a/spring-zero-actuator/pom.xml b/spring-actuator/pom.xml
similarity index 94%
rename from spring-zero-actuator/pom.xml
rename to spring-actuator/pom.xml
index a0e2d92625..65b4a208bc 100644
--- a/spring-zero-actuator/pom.xml
+++ b/spring-actuator/pom.xml
@@ -7,7 +7,7 @@
 		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-actuator</artifactId>
+	<artifactId>spring-actuator</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
@@ -16,7 +16,7 @@
 		<!-- Compile -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-autoconfigure</artifactId>
+			<artifactId>spring-autoconfigure</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -69,7 +69,7 @@
 		<!-- Test -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-core</artifactId>
+			<artifactId>spring-bootstrap</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java
diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java
similarity index 100%
rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java
rename to spring-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java
diff --git a/spring-zero-actuator/src/main/resources/META-INF/spring.factories b/spring-actuator/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from spring-zero-actuator/src/main/resources/META-INF/spring.factories
rename to spring-actuator/src/main/resources/META-INF/spring.factories
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java
diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java
similarity index 100%
rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java
rename to spring-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java
diff --git a/spring-zero-actuator/src/test/resources/git.properties b/spring-actuator/src/test/resources/git.properties
similarity index 100%
rename from spring-zero-actuator/src/test/resources/git.properties
rename to spring-actuator/src/test/resources/git.properties
diff --git a/spring-zero-autoconfigure/pom.xml b/spring-autoconfigure/pom.xml
similarity index 96%
rename from spring-zero-autoconfigure/pom.xml
rename to spring-autoconfigure/pom.xml
index 2de900f63b..0f04f0543f 100644
--- a/spring-zero-autoconfigure/pom.xml
+++ b/spring-autoconfigure/pom.xml
@@ -7,7 +7,7 @@
 		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-autoconfigure</artifactId>
+	<artifactId>spring-autoconfigure</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
@@ -16,7 +16,7 @@
 		<!-- Compile -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-core</artifactId>
+			<artifactId>spring-bootstrap</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<!-- Optional -->
@@ -103,7 +103,7 @@
 		<!-- Test -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-core</artifactId>
+			<artifactId>spring-bootstrap</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java
diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java b/spring-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java
similarity index 100%
rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java
rename to spring-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java
diff --git a/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-autoconfigure/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories
rename to spring-autoconfigure/src/main/resources/META-INF/spring.factories
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java
diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java
similarity index 100%
rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java
rename to spring-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java
diff --git a/spring-zero-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql b/spring-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql
similarity index 100%
rename from spring-zero-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql
rename to spring-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql
diff --git a/spring-zero-autoconfigure/src/test/resources/templates/layout.html b/spring-autoconfigure/src/test/resources/templates/layout.html
similarity index 100%
rename from spring-zero-autoconfigure/src/test/resources/templates/layout.html
rename to spring-autoconfigure/src/test/resources/templates/layout.html
diff --git a/spring-zero-autoconfigure/src/test/resources/templates/template.txt b/spring-autoconfigure/src/test/resources/templates/template.txt
similarity index 100%
rename from spring-zero-autoconfigure/src/test/resources/templates/template.txt
rename to spring-autoconfigure/src/test/resources/templates/template.txt
diff --git a/spring-zero-autoconfigure/src/test/resources/templates/tiles.xml b/spring-autoconfigure/src/test/resources/templates/tiles.xml
similarity index 100%
rename from spring-zero-autoconfigure/src/test/resources/templates/tiles.xml
rename to spring-autoconfigure/src/test/resources/templates/tiles.xml
diff --git a/spring-zero-autoconfigure/src/test/resources/templates/view.html b/spring-autoconfigure/src/test/resources/templates/view.html
similarity index 100%
rename from spring-zero-autoconfigure/src/test/resources/templates/view.html
rename to spring-autoconfigure/src/test/resources/templates/view.html
diff --git a/spring-zero-autoconfigure/src/test/resources/test/messages.properties b/spring-autoconfigure/src/test/resources/test/messages.properties
similarity index 100%
rename from spring-zero-autoconfigure/src/test/resources/test/messages.properties
rename to spring-autoconfigure/src/test/resources/test/messages.properties
diff --git a/spring-zero-core/pom.xml b/spring-bootstrap/pom.xml
similarity index 98%
rename from spring-zero-core/pom.xml
rename to spring-bootstrap/pom.xml
index 0eeb3c4ab6..29e3b1b099 100644
--- a/spring-zero-core/pom.xml
+++ b/spring-bootstrap/pom.xml
@@ -7,7 +7,7 @@
 		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-core</artifactId>
+	<artifactId>spring-bootstrap</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/Banner.java b/spring-bootstrap/src/main/java/org/springframework/zero/Banner.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/Banner.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/Banner.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java b/spring-bootstrap/src/main/java/org/springframework/zero/BeanDefinitionLoader.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/BeanDefinitionLoader.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/CommandLineRunner.java b/spring-bootstrap/src/main/java/org/springframework/zero/CommandLineRunner.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/CommandLineRunner.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/CommandLineRunner.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/ExitCodeGenerator.java b/spring-bootstrap/src/main/java/org/springframework/zero/ExitCodeGenerator.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/ExitCodeGenerator.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/ExitCodeGenerator.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java b/spring-bootstrap/src/main/java/org/springframework/zero/SpringApplication.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/SpringApplication.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java b/spring-bootstrap/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java b/spring-bootstrap/src/main/java/org/springframework/zero/bind/InetAddressEditor.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/bind/InetAddressEditor.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java b/spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java b/spring-bootstrap/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/JacksonJsonParser.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/config/JacksonJsonParser.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParser.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParser.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/config/JsonParser.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParser.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParserFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParserFactory.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/config/JsonParserFactory.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParserFactory.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/SimpleJsonParser.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/SimpleJsonParser.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/config/SimpleJsonParser.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/config/SimpleJsonParser.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlJsonParser.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlJsonParser.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/config/YamlJsonParser.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/config/YamlJsonParser.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlProcessor.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/config/YamlProcessor.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/package-info.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/package-info.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/package-info.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/package-info.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java b/spring-bootstrap/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java b/spring-bootstrap/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java
diff --git a/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/web/SpringServletInitializer.java
similarity index 100%
rename from spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java
rename to spring-bootstrap/src/main/java/org/springframework/zero/web/SpringServletInitializer.java
diff --git a/spring-zero-core/src/main/resources/META-INF/spring.factories b/spring-bootstrap/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from spring-zero-core/src/main/resources/META-INF/spring.factories
rename to spring-bootstrap/src/main/resources/META-INF/spring.factories
diff --git a/spring-zero-core/src/main/resources/favicon.ico b/spring-bootstrap/src/main/resources/favicon.ico
similarity index 100%
rename from spring-zero-core/src/main/resources/favicon.ico
rename to spring-bootstrap/src/main/resources/favicon.ico
diff --git a/spring-zero-core/src/main/resources/org/springframework/zero/logging/log4j.properties b/spring-bootstrap/src/main/resources/org/springframework/zero/logging/log4j.properties
similarity index 100%
rename from spring-zero-core/src/main/resources/org/springframework/zero/logging/log4j.properties
rename to spring-bootstrap/src/main/resources/org/springframework/zero/logging/log4j.properties
diff --git a/spring-zero-core/src/main/resources/org/springframework/zero/logging/logback.xml b/spring-bootstrap/src/main/resources/org/springframework/zero/logging/logback.xml
similarity index 100%
rename from spring-zero-core/src/main/resources/org/springframework/zero/logging/logback.xml
rename to spring-bootstrap/src/main/resources/org/springframework/zero/logging/logback.xml
diff --git a/spring-zero-core/src/main/resources/org/springframework/zero/logging/logging.properties b/spring-bootstrap/src/main/resources/org/springframework/zero/logging/logging.properties
similarity index 100%
rename from spring-zero-core/src/main/resources/org/springframework/zero/logging/logging.properties
rename to spring-bootstrap/src/main/resources/org/springframework/zero/logging/logging.properties
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/SpringApplicationTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/SpringApplicationTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/SpringApplicationTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/SpringApplicationTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/TestUtils.java b/spring-bootstrap/src/test/java/org/springframework/zero/TestUtils.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/TestUtils.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/TestUtils.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/JacksonParserTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/config/JacksonParserTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/config/JacksonParserTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/config/JacksonParserTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockFilter.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockFilter.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockFilter.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockFilter.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockServlet.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockServlet.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockServlet.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockServlet.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/logging/TestFormatter.java b/spring-bootstrap/src/test/java/org/springframework/zero/logging/TestFormatter.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/logging/TestFormatter.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/logging/TestFormatter.java
diff --git a/spring-zero-core/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java b/spring-bootstrap/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java
similarity index 100%
rename from spring-zero-core/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java
rename to spring-bootstrap/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java
diff --git a/spring-zero-core/src/test/resources/application.properties b/spring-bootstrap/src/test/resources/application.properties
similarity index 100%
rename from spring-zero-core/src/test/resources/application.properties
rename to spring-bootstrap/src/test/resources/application.properties
diff --git a/spring-zero-core/src/test/resources/enableprofile-myprofile.properties b/spring-bootstrap/src/test/resources/enableprofile-myprofile.properties
similarity index 100%
rename from spring-zero-core/src/test/resources/enableprofile-myprofile.properties
rename to spring-bootstrap/src/test/resources/enableprofile-myprofile.properties
diff --git a/spring-zero-core/src/test/resources/enableprofile.properties b/spring-bootstrap/src/test/resources/enableprofile.properties
similarity index 100%
rename from spring-zero-core/src/test/resources/enableprofile.properties
rename to spring-bootstrap/src/test/resources/enableprofile.properties
diff --git a/spring-zero-core/src/test/resources/logback-nondefault.xml b/spring-bootstrap/src/test/resources/logback-nondefault.xml
similarity index 100%
rename from spring-zero-core/src/test/resources/logback-nondefault.xml
rename to spring-bootstrap/src/test/resources/logback-nondefault.xml
diff --git a/spring-zero-core/src/test/resources/logback-test.xml b/spring-bootstrap/src/test/resources/logback-test.xml
similarity index 100%
rename from spring-zero-core/src/test/resources/logback-test.xml
rename to spring-bootstrap/src/test/resources/logback-test.xml
diff --git a/spring-zero-core/src/test/resources/logging-nondefault.properties b/spring-bootstrap/src/test/resources/logging-nondefault.properties
similarity index 100%
rename from spring-zero-core/src/test/resources/logging-nondefault.properties
rename to spring-bootstrap/src/test/resources/logging-nondefault.properties
diff --git a/spring-zero-core/src/test/resources/org/springframework/zero/context/embedded/conf.properties b/spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/conf.properties
similarity index 100%
rename from spring-zero-core/src/test/resources/org/springframework/zero/context/embedded/conf.properties
rename to spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/conf.properties
diff --git a/spring-zero-core/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml b/spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
similarity index 100%
rename from spring-zero-core/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
rename to spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
diff --git a/spring-zero-core/src/test/resources/org/springframework/zero/context/foo.xml b/spring-bootstrap/src/test/resources/org/springframework/zero/context/foo.xml
similarity index 100%
rename from spring-zero-core/src/test/resources/org/springframework/zero/context/foo.xml
rename to spring-bootstrap/src/test/resources/org/springframework/zero/context/foo.xml
diff --git a/spring-zero-core/src/test/resources/org/springframework/zero/context/properties/testProperties.xml b/spring-bootstrap/src/test/resources/org/springframework/zero/context/properties/testProperties.xml
similarity index 100%
rename from spring-zero-core/src/test/resources/org/springframework/zero/context/properties/testProperties.xml
rename to spring-bootstrap/src/test/resources/org/springframework/zero/context/properties/testProperties.xml
diff --git a/spring-zero-core/src/test/resources/org/springframework/zero/sample-beans.xml b/spring-bootstrap/src/test/resources/org/springframework/zero/sample-beans.xml
similarity index 100%
rename from spring-zero-core/src/test/resources/org/springframework/zero/sample-beans.xml
rename to spring-bootstrap/src/test/resources/org/springframework/zero/sample-beans.xml
diff --git a/spring-zero-core/src/test/resources/specificfile-specificprofile.properties b/spring-bootstrap/src/test/resources/specificfile-specificprofile.properties
similarity index 100%
rename from spring-zero-core/src/test/resources/specificfile-specificprofile.properties
rename to spring-bootstrap/src/test/resources/specificfile-specificprofile.properties
diff --git a/spring-zero-core/src/test/resources/specificlocation.properties b/spring-bootstrap/src/test/resources/specificlocation.properties
similarity index 100%
rename from spring-zero-core/src/test/resources/specificlocation.properties
rename to spring-bootstrap/src/test/resources/specificlocation.properties
diff --git a/spring-zero-core/src/test/resources/testprofiles.yml b/spring-bootstrap/src/test/resources/testprofiles.yml
similarity index 100%
rename from spring-zero-core/src/test/resources/testprofiles.yml
rename to spring-bootstrap/src/test/resources/testprofiles.yml
diff --git a/spring-zero-core/src/test/resources/testproperties.properties b/spring-bootstrap/src/test/resources/testproperties.properties
similarity index 100%
rename from spring-zero-core/src/test/resources/testproperties.properties
rename to spring-bootstrap/src/test/resources/testproperties.properties
diff --git a/spring-zero-core/src/test/resources/testsetprofiles.yml b/spring-bootstrap/src/test/resources/testsetprofiles.yml
similarity index 100%
rename from spring-zero-core/src/test/resources/testsetprofiles.yml
rename to spring-bootstrap/src/test/resources/testsetprofiles.yml
diff --git a/spring-zero-core/src/test/resources/testyaml.yml b/spring-bootstrap/src/test/resources/testyaml.yml
similarity index 100%
rename from spring-zero-core/src/test/resources/testyaml.yml
rename to spring-bootstrap/src/test/resources/testyaml.yml
diff --git a/spring-zero-cli/pom.xml b/spring-cli/pom.xml
similarity index 98%
rename from spring-zero-cli/pom.xml
rename to spring-cli/pom.xml
index 6b25178ff0..79421c5c0f 100644
--- a/spring-zero-cli/pom.xml
+++ b/spring-cli/pom.xml
@@ -7,7 +7,7 @@
 		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-cli</artifactId>
+	<artifactId>spring-cli</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
diff --git a/spring-zero-cli/samples/actuator.groovy b/spring-cli/samples/actuator.groovy
similarity index 100%
rename from spring-zero-cli/samples/actuator.groovy
rename to spring-cli/samples/actuator.groovy
diff --git a/spring-zero-cli/samples/app.groovy b/spring-cli/samples/app.groovy
similarity index 100%
rename from spring-zero-cli/samples/app.groovy
rename to spring-cli/samples/app.groovy
diff --git a/spring-zero-cli/samples/integration.groovy b/spring-cli/samples/integration.groovy
similarity index 100%
rename from spring-zero-cli/samples/integration.groovy
rename to spring-cli/samples/integration.groovy
diff --git a/spring-zero-cli/samples/job.groovy b/spring-cli/samples/job.groovy
similarity index 100%
rename from spring-zero-cli/samples/job.groovy
rename to spring-cli/samples/job.groovy
diff --git a/spring-zero-cli/samples/runner.groovy b/spring-cli/samples/runner.groovy
similarity index 100%
rename from spring-zero-cli/samples/runner.groovy
rename to spring-cli/samples/runner.groovy
diff --git a/spring-zero-cli/samples/runner.xml b/spring-cli/samples/runner.xml
similarity index 100%
rename from spring-zero-cli/samples/runner.xml
rename to spring-cli/samples/runner.xml
diff --git a/spring-zero-cli/samples/template.groovy b/spring-cli/samples/template.groovy
similarity index 100%
rename from spring-zero-cli/samples/template.groovy
rename to spring-cli/samples/template.groovy
diff --git a/spring-zero-cli/samples/ui.groovy b/spring-cli/samples/ui.groovy
similarity index 100%
rename from spring-zero-cli/samples/ui.groovy
rename to spring-cli/samples/ui.groovy
diff --git a/spring-zero-cli/samples/web.groovy b/spring-cli/samples/web.groovy
similarity index 100%
rename from spring-zero-cli/samples/web.groovy
rename to spring-cli/samples/web.groovy
diff --git a/spring-zero-cli/src/main/assembly/descriptor.xml b/spring-cli/src/main/assembly/descriptor.xml
similarity index 100%
rename from spring-zero-cli/src/main/assembly/descriptor.xml
rename to spring-cli/src/main/assembly/descriptor.xml
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/Command.java b/spring-cli/src/main/java/org/springframework/zero/cli/Command.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/Command.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/Command.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java b/spring-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/Log.java b/spring-cli/src/main/java/org/springframework/zero/cli/Log.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/Log.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/Log.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java b/spring-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java b/spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java b/spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/AbstractCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/AbstractCommand.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/AbstractCommand.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/command/AbstractCommand.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/CleanCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/CleanCommand.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/CleanCommand.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/command/CleanCommand.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/CreateCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/CreateCommand.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/CreateCommand.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/command/CreateCommand.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/DefaultCommandFactory.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/DefaultCommandFactory.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/DefaultCommandFactory.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/command/DefaultCommandFactory.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/OptionHandler.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/OptionHandler.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/OptionHandler.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/command/OptionHandler.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/OptionParsingCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/OptionParsingCommand.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/OptionParsingCommand.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/command/OptionParsingCommand.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/RunCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/RunCommand.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/RunCommand.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/command/RunCommand.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/ScriptCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/ScriptCommand.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/ScriptCommand.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/command/ScriptCommand.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/ScriptCompilationCustomizer.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/ScriptCompilationCustomizer.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/ScriptCompilationCustomizer.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/command/ScriptCompilationCustomizer.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/VersionCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/VersionCommand.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/VersionCommand.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/command/VersionCommand.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/AstUtils.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/AstUtils.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/AstUtils.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/AstUtils.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/CompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/CompilerAutoConfiguration.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/CompilerAutoConfiguration.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/CompilerAutoConfiguration.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/DependencyCustomizer.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/DependencyCustomizer.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/DependencyCustomizer.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/DependencyCustomizer.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/ExtendedGroovyClassLoader.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/ExtendedGroovyClassLoader.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/ExtendedGroovyClassLoader.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/ExtendedGroovyClassLoader.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompiler.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompiler.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompiler.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompiler.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java b/spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java
diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java b/spring-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java
similarity index 100%
rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java
rename to spring-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java
diff --git a/spring-zero-cli/src/main/resources/.gitignore b/spring-cli/src/main/resources/.gitignore
similarity index 100%
rename from spring-zero-cli/src/main/resources/.gitignore
rename to spring-cli/src/main/resources/.gitignore
diff --git a/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory b/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory
similarity index 100%
rename from spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory
rename to spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory
diff --git a/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration b/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration
similarity index 100%
rename from spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration
rename to spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration
diff --git a/spring-zero-cli/src/main/scripts/spring b/spring-cli/src/main/scripts/spring
similarity index 100%
rename from spring-zero-cli/src/main/scripts/spring
rename to spring-cli/src/main/scripts/spring
diff --git a/spring-zero-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java b/spring-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java
similarity index 100%
rename from spring-zero-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java
rename to spring-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java
diff --git a/spring-zero-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java b/spring-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java
similarity index 100%
rename from spring-zero-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java
rename to spring-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java
diff --git a/spring-zero-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java b/spring-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java
similarity index 100%
rename from spring-zero-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java
rename to spring-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java
diff --git a/spring-zero-cli/src/test/resources/commands/closure.groovy b/spring-cli/src/test/resources/commands/closure.groovy
similarity index 100%
rename from spring-zero-cli/src/test/resources/commands/closure.groovy
rename to spring-cli/src/test/resources/commands/closure.groovy
diff --git a/spring-zero-cli/src/test/resources/commands/command.groovy b/spring-cli/src/test/resources/commands/command.groovy
similarity index 100%
rename from spring-zero-cli/src/test/resources/commands/command.groovy
rename to spring-cli/src/test/resources/commands/command.groovy
diff --git a/spring-zero-cli/src/test/resources/commands/handler.groovy b/spring-cli/src/test/resources/commands/handler.groovy
similarity index 100%
rename from spring-zero-cli/src/test/resources/commands/handler.groovy
rename to spring-cli/src/test/resources/commands/handler.groovy
diff --git a/spring-zero-cli/src/test/resources/commands/mixin.groovy b/spring-cli/src/test/resources/commands/mixin.groovy
similarity index 100%
rename from spring-zero-cli/src/test/resources/commands/mixin.groovy
rename to spring-cli/src/test/resources/commands/mixin.groovy
diff --git a/spring-zero-cli/src/test/resources/commands/runnable.groovy b/spring-cli/src/test/resources/commands/runnable.groovy
similarity index 100%
rename from spring-zero-cli/src/test/resources/commands/runnable.groovy
rename to spring-cli/src/test/resources/commands/runnable.groovy
diff --git a/spring-zero-cli/src/test/resources/commands/script.groovy b/spring-cli/src/test/resources/commands/script.groovy
similarity index 100%
rename from spring-zero-cli/src/test/resources/commands/script.groovy
rename to spring-cli/src/test/resources/commands/script.groovy
diff --git a/spring-zero-cli/src/test/resources/commands/test.groovy b/spring-cli/src/test/resources/commands/test.groovy
similarity index 100%
rename from spring-zero-cli/src/test/resources/commands/test.groovy
rename to spring-cli/src/test/resources/commands/test.groovy
diff --git a/spring-zero-cli/src/test/resources/css/bootstrap.min.css b/spring-cli/src/test/resources/css/bootstrap.min.css
similarity index 100%
rename from spring-zero-cli/src/test/resources/css/bootstrap.min.css
rename to spring-cli/src/test/resources/css/bootstrap.min.css
diff --git a/spring-zero-cli/src/test/resources/log4j.properties b/spring-cli/src/test/resources/log4j.properties
similarity index 100%
rename from spring-zero-cli/src/test/resources/log4j.properties
rename to spring-cli/src/test/resources/log4j.properties
diff --git a/spring-zero-cli/src/test/resources/templates/home.html b/spring-cli/src/test/resources/templates/home.html
similarity index 100%
rename from spring-zero-cli/src/test/resources/templates/home.html
rename to spring-cli/src/test/resources/templates/home.html
diff --git a/spring-zero-cli/src/test/resources/templates/test.txt b/spring-cli/src/test/resources/templates/test.txt
similarity index 100%
rename from spring-zero-cli/src/test/resources/templates/test.txt
rename to spring-cli/src/test/resources/templates/test.txt
diff --git a/spring-zero-launcher/pom.xml b/spring-launcher/pom.xml
similarity index 92%
rename from spring-zero-launcher/pom.xml
rename to spring-launcher/pom.xml
index 10651bba2a..7d3e5c0f34 100644
--- a/spring-zero-launcher/pom.xml
+++ b/spring-launcher/pom.xml
@@ -7,7 +7,7 @@
 		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-launcher</artifactId>
+	<artifactId>spring-launcher</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java
similarity index 100%
rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java
rename to spring-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java
diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java
similarity index 100%
rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java
rename to spring-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java
diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java
similarity index 100%
rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java
rename to spring-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java
diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java
similarity index 100%
rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java
rename to spring-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java
diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java
similarity index 100%
rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java
rename to spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java
diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java
similarity index 100%
rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java
rename to spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java
diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java
similarity index 100%
rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java
rename to spring-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java
diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java
similarity index 100%
rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java
rename to spring-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java
diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java
similarity index 100%
rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java
rename to spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java
diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java
similarity index 100%
rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java
rename to spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java
diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java
similarity index 100%
rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java
rename to spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java
diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java
similarity index 100%
rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java
rename to spring-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java
diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/package-info.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/package-info.java
similarity index 100%
rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/package-info.java
rename to spring-launcher/src/main/java/org/springframework/zero/launcher/package-info.java
diff --git a/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java b/spring-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java
similarity index 100%
rename from spring-zero-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java
rename to spring-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java
diff --git a/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java b/spring-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java
similarity index 100%
rename from spring-zero-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java
rename to spring-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java
diff --git a/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java b/spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java
similarity index 100%
rename from spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java
rename to spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java
diff --git a/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java b/spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java
similarity index 100%
rename from spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java
rename to spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java
diff --git a/spring-zero-maven-plugin/pom.xml b/spring-package-maven-plugin/pom.xml
similarity index 97%
rename from spring-zero-maven-plugin/pom.xml
rename to spring-package-maven-plugin/pom.xml
index e47d5de482..4b4c5ef463 100644
--- a/spring-zero-maven-plugin/pom.xml
+++ b/spring-package-maven-plugin/pom.xml
@@ -7,7 +7,7 @@
 		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-maven-plugin</artifactId>
+	<artifactId>spring-package-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
@@ -85,7 +85,7 @@
 		<!-- Test -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-launcher</artifactId>
+			<artifactId>spring-launcher</artifactId>
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
diff --git a/spring-zero-maven-plugin/src/it/executable-jar/pom.xml b/spring-package-maven-plugin/src/it/executable-jar/pom.xml
similarity index 100%
rename from spring-zero-maven-plugin/src/it/executable-jar/pom.xml
rename to spring-package-maven-plugin/src/it/executable-jar/pom.xml
diff --git a/spring-zero-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java b/spring-package-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java
similarity index 100%
rename from spring-zero-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java
rename to spring-package-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java
diff --git a/spring-zero-maven-plugin/src/it/executable-jar/verify.groovy b/spring-package-maven-plugin/src/it/executable-jar/verify.groovy
similarity index 100%
rename from spring-zero-maven-plugin/src/it/executable-jar/verify.groovy
rename to spring-package-maven-plugin/src/it/executable-jar/verify.groovy
diff --git a/spring-zero-maven-plugin/src/it/executable-war/pom.xml b/spring-package-maven-plugin/src/it/executable-war/pom.xml
similarity index 100%
rename from spring-zero-maven-plugin/src/it/executable-war/pom.xml
rename to spring-package-maven-plugin/src/it/executable-war/pom.xml
diff --git a/spring-zero-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java b/spring-package-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java
similarity index 100%
rename from spring-zero-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java
rename to spring-package-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java
diff --git a/spring-zero-maven-plugin/src/it/executable-war/src/main/webapp/index.html b/spring-package-maven-plugin/src/it/executable-war/src/main/webapp/index.html
similarity index 100%
rename from spring-zero-maven-plugin/src/it/executable-war/src/main/webapp/index.html
rename to spring-package-maven-plugin/src/it/executable-war/src/main/webapp/index.html
diff --git a/spring-zero-maven-plugin/src/it/executable-war/verify.groovy b/spring-package-maven-plugin/src/it/executable-war/verify.groovy
similarity index 100%
rename from spring-zero-maven-plugin/src/it/executable-war/verify.groovy
rename to spring-package-maven-plugin/src/it/executable-war/verify.groovy
diff --git a/spring-zero-maven-plugin/src/it/settings.xml b/spring-package-maven-plugin/src/it/settings.xml
similarity index 100%
rename from spring-zero-maven-plugin/src/it/settings.xml
rename to spring-package-maven-plugin/src/it/settings.xml
diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java b/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java
similarity index 99%
rename from spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java
rename to spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java
index 01f36e0bfa..3d8d4f449b 100644
--- a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java
+++ b/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java
@@ -292,7 +292,7 @@ public abstract class AbstractExecutableArchiveMojo extends AbstractMojo {
 
 			String version = getClass().getPackage().getImplementationVersion();
 			DefaultArtifact artifact = new DefaultArtifact(
-					"org.springframework.zero:spring-zero-launcher:" + version);
+					"org.springframework.zero:spring-launcher:" + version);
 			ArtifactDescriptorRequest descriptorRequest = new ArtifactDescriptorRequest(
 					artifact, repositories, "plugin");
 			ArtifactDescriptorResult descriptorResult = this.repositorySystem
diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java b/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java
similarity index 100%
rename from spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java
rename to spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java
diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java b/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java
similarity index 100%
rename from spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java
rename to spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java
diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java b/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java
similarity index 100%
rename from spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java
rename to spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java
diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java b/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java
similarity index 100%
rename from spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java
rename to spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java
diff --git a/spring-zero-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/spring-package-maven-plugin/src/main/resources/META-INF/plexus/components.xml
similarity index 93%
rename from spring-zero-maven-plugin/src/main/resources/META-INF/plexus/components.xml
rename to spring-package-maven-plugin/src/main/resources/META-INF/plexus/components.xml
index f24d528037..1658c975dc 100644
--- a/spring-zero-maven-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/spring-package-maven-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -27,7 +27,7 @@
 							<process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
 							<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
 							<test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
-							<package>org.springframework.zero:spring-zero-maven-plugin:executable-jar</package>
+							<package>org.springframework.zero:spring-package-maven-plugin:executable-jar</package>
 							<install>org.apache.maven.plugins:maven-install-plugin:install</install>
 							<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
 						</phases>
@@ -62,7 +62,7 @@
 							<process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
 							<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
 							<test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
-							<package>org.springframework.zero:spring-zero-maven-plugin:executable-war</package>
+							<package>org.springframework.zero:spring-package-maven-plugin:executable-war</package>
 							<install>org.apache.maven.plugins:maven-install-plugin:install</install>
 							<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
 						</phases>
diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java b/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java
similarity index 100%
rename from spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java
rename to spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java
diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java b/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java
similarity index 100%
rename from spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java
rename to spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java
diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java b/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java
similarity index 100%
rename from spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java
rename to spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java
diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java b/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java
similarity index 100%
rename from spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java
rename to spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java
diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java b/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java
similarity index 100%
rename from spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java
rename to spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java
diff --git a/spring-zero-starters/pom.xml b/spring-starters/pom.xml
similarity index 60%
rename from spring-zero-starters/pom.xml
rename to spring-starters/pom.xml
index e82942c123..65984ce82f 100644
--- a/spring-zero-starters/pom.xml
+++ b/spring-starters/pom.xml
@@ -7,18 +7,18 @@
 		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-starters</artifactId>
+	<artifactId>spring-starters</artifactId>
 	<packaging>pom</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
 	<modules>
-		<module>spring-zero-starter-actuator</module>
-		<module>spring-zero-starter-batch</module>
-		<module>spring-zero-starter-integration</module>
-		<module>spring-zero-starter-data-jpa</module>
-		<module>spring-zero-starter-security</module>
-		<module>spring-zero-starter</module>
-		<module>spring-zero-starter-web</module>
+		<module>spring-starter</module>
+		<module>spring-starter-actuator</module>
+		<module>spring-starter-batch</module>
+		<module>spring-starter-integration</module>
+		<module>spring-starter-data-jpa</module>
+		<module>spring-starter-security</module>
+		<module>spring-starter-web</module>
 	</modules>
 </project>
diff --git a/spring-zero-starters/spring-zero-starter-actuator/pom.xml b/spring-starters/spring-starter-actuator/pom.xml
similarity index 79%
rename from spring-zero-starters/spring-zero-starter-actuator/pom.xml
rename to spring-starters/spring-starter-actuator/pom.xml
index 0d31c5c529..b27d2776e9 100644
--- a/spring-zero-starters/spring-zero-starter-actuator/pom.xml
+++ b/spring-starters/spring-starter-actuator/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.zero</groupId>
-		<artifactId>spring-zero-starters</artifactId>
+		<artifactId>spring-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-starter-actuator</artifactId>
+	<artifactId>spring-starter-actuator</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter</artifactId>
+			<artifactId>spring-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-actuator</artifactId>
+			<artifactId>spring-actuator</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/spring-zero-starters/spring-zero-starter-batch/pom.xml b/spring-starters/spring-starter-batch/pom.xml
similarity index 86%
rename from spring-zero-starters/spring-zero-starter-batch/pom.xml
rename to spring-starters/spring-starter-batch/pom.xml
index d5ffc46428..dff74e224c 100644
--- a/spring-zero-starters/spring-zero-starter-batch/pom.xml
+++ b/spring-starters/spring-starter-batch/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.zero</groupId>
-		<artifactId>spring-zero-starters</artifactId>
+		<artifactId>spring-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-starter-batch</artifactId>
+	<artifactId>spring-starter-batch</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter</artifactId>
+			<artifactId>spring-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-zero-starters/spring-zero-starter-data-jpa/pom.xml b/spring-starters/spring-starter-data-jpa/pom.xml
similarity index 88%
rename from spring-zero-starters/spring-zero-starter-data-jpa/pom.xml
rename to spring-starters/spring-starter-data-jpa/pom.xml
index 9174bd195f..825132f9c7 100644
--- a/spring-zero-starters/spring-zero-starter-data-jpa/pom.xml
+++ b/spring-starters/spring-starter-data-jpa/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.zero</groupId>
-		<artifactId>spring-zero-starters</artifactId>
+		<artifactId>spring-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-starter-data-jpa</artifactId>
+	<artifactId>spring-starter-data-jpa</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter</artifactId>
+			<artifactId>spring-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-zero-starters/spring-zero-starter-integration/pom.xml b/spring-starters/spring-starter-integration/pom.xml
similarity index 89%
rename from spring-zero-starters/spring-zero-starter-integration/pom.xml
rename to spring-starters/spring-starter-integration/pom.xml
index 88dc4b4140..46e5f9e22a 100644
--- a/spring-zero-starters/spring-zero-starter-integration/pom.xml
+++ b/spring-starters/spring-starter-integration/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.zero</groupId>
-		<artifactId>spring-zero-starters</artifactId>
+		<artifactId>spring-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-starter-integration</artifactId>
+	<artifactId>spring-starter-integration</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter</artifactId>
+			<artifactId>spring-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-zero-starters/spring-zero-starter-security/pom.xml b/spring-starters/spring-starter-security/pom.xml
similarity index 83%
rename from spring-zero-starters/spring-zero-starter-security/pom.xml
rename to spring-starters/spring-starter-security/pom.xml
index 97532d0e2f..d4e1846cc9 100644
--- a/spring-zero-starters/spring-zero-starter-security/pom.xml
+++ b/spring-starters/spring-starter-security/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.zero</groupId>
-		<artifactId>spring-zero-starters</artifactId>
+		<artifactId>spring-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-starter-security</artifactId>
+	<artifactId>spring-starter-security</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter</artifactId>
+			<artifactId>spring-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-zero-starters/spring-zero-starter-web/pom.xml b/spring-starters/spring-starter-web/pom.xml
similarity index 88%
rename from spring-zero-starters/spring-zero-starter-web/pom.xml
rename to spring-starters/spring-starter-web/pom.xml
index c5eaa47897..69291ca400 100644
--- a/spring-zero-starters/spring-zero-starter-web/pom.xml
+++ b/spring-starters/spring-starter-web/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.zero</groupId>
-		<artifactId>spring-zero-starters</artifactId>
+		<artifactId>spring-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-starter-web</artifactId>
+	<artifactId>spring-starter-web</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter</artifactId>
+			<artifactId>spring-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-zero-starters/spring-zero-starter/pom.xml b/spring-starters/spring-starter/pom.xml
similarity index 90%
rename from spring-zero-starters/spring-zero-starter/pom.xml
rename to spring-starters/spring-starter/pom.xml
index e418b39597..9ef7545c20 100644
--- a/spring-zero-starters/spring-zero-starter/pom.xml
+++ b/spring-starters/spring-starter/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.zero</groupId>
-		<artifactId>spring-zero-starters</artifactId>
+		<artifactId>spring-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-starter</artifactId>
+	<artifactId>spring-starter</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-core</artifactId>
+			<artifactId>spring-bootstrap</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-autoconfigure</artifactId>
+			<artifactId>spring-autoconfigure</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-zero-intergration-tests/pom.xml b/spring-zero-intergration-tests/pom.xml
index 99411dd398..1d16b84aa5 100644
--- a/spring-zero-intergration-tests/pom.xml
+++ b/spring-zero-intergration-tests/pom.xml
@@ -16,74 +16,74 @@
 		<!-- Ensure other reactor projects are build before running integration tests -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-actuator</artifactId>
+			<artifactId>spring-actuator</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-autoconfigure</artifactId>
+			<artifactId>spring-autoconfigure</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-cli</artifactId>
+			<artifactId>spring-cli</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-core</artifactId>
+			<artifactId>spring-bootstrap</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-launcher</artifactId>
+			<artifactId>spring-launcher</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-maven-plugin</artifactId>
+			<artifactId>spring-package-maven-plugin</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter</artifactId>
+			<artifactId>spring-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter-actuator</artifactId>
+			<artifactId>spring-starter-actuator</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter-batch</artifactId>
+			<artifactId>spring-starter-batch</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter-data-jpa</artifactId>
+			<artifactId>spring-starter-data-jpa</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter-integration</artifactId>
+			<artifactId>spring-starter-integration</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter-security</artifactId>
+			<artifactId>spring-starter-security</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter-web</artifactId>
+			<artifactId>spring-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
-				<!-- Invoke integration tests in the install phase, after the spring-zero-maven-plugin is available -->
+				<!-- Invoke integration tests in the install phase, after the spring-package-maven-plugin is available -->
 				<artifactId>maven-invoker-plugin</artifactId>
 				<configuration>
 					<settingsFile>src/it/settings.xml</settingsFile>
diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml b/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml
index bfe4f4bf05..777a14be8c 100644
--- a/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml
@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter-actuator</artifactId>
+			<artifactId>spring-starter-actuator</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter-web</artifactId>
+			<artifactId>spring-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -40,7 +40,7 @@
 		<plugins>
 			<plugin>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-zero-maven-plugin</artifactId>
+				<artifactId>spring-package-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<extensions>true</extensions>
 			</plugin>
diff --git a/spring-zero-samples/spring-zero-sample-actuator/pom.xml b/spring-zero-samples/spring-zero-sample-actuator/pom.xml
index 84d62b3a20..231f565c5d 100644
--- a/spring-zero-samples/spring-zero-sample-actuator/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-actuator/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter-actuator</artifactId>
+			<artifactId>spring-starter-actuator</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -43,7 +43,7 @@
 		<plugins>
 			<plugin>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-zero-maven-plugin</artifactId>
+				<artifactId>spring-package-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<extensions>true</extensions>
 			</plugin>
diff --git a/spring-zero-samples/spring-zero-sample-batch/pom.xml b/spring-zero-samples/spring-zero-sample-batch/pom.xml
index b8baffbbdf..47aea5414f 100644
--- a/spring-zero-samples/spring-zero-sample-batch/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-batch/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter-batch</artifactId>
+			<artifactId>spring-starter-batch</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
@@ -23,7 +23,7 @@
 		<plugins>
 			<plugin>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-zero-maven-plugin</artifactId>
+				<artifactId>spring-package-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<extensions>true</extensions>
 			</plugin>
diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml b/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml
index af1f1fe468..b1d97e4446 100644
--- a/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml
@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter-data-jpa</artifactId>
+			<artifactId>spring-starter-data-jpa</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter-web</artifactId>
+			<artifactId>spring-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -33,7 +33,7 @@
 		<plugins>
 			<plugin>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-zero-maven-plugin</artifactId>
+				<artifactId>spring-package-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<extensions>true</extensions>
 			</plugin>
diff --git a/spring-zero-samples/spring-zero-sample-integration/pom.xml b/spring-zero-samples/spring-zero-sample-integration/pom.xml
index 44b43bd46f..536c18e0b4 100644
--- a/spring-zero-samples/spring-zero-sample-integration/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-integration/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.zero</groupId>
-			<artifactId>spring-zero-starter-integration</artifactId>
+			<artifactId>spring-starter-integration</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
@@ -23,7 +23,7 @@
 		<plugins>
 			<plugin>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-zero-maven-plugin</artifactId>
+				<artifactId>spring-package-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<extensions>true</extensions>
 			</plugin>
diff --git a/spring-zero-samples/spring-zero-sample-jetty/pom.xml b/spring-zero-samples/spring-zero-sample-jetty/pom.xml
index eccf6b857e..9852f84791 100644
--- a/spring-zero-samples/spring-zero-sample-jetty/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-jetty/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter</artifactId>
+			<artifactId>spring-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -42,7 +42,7 @@
 		<plugins>
 			<plugin>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-zero-maven-plugin</artifactId>
+				<artifactId>spring-package-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<extensions>true</extensions>
 			</plugin>
diff --git a/spring-zero-samples/spring-zero-sample-profile/pom.xml b/spring-zero-samples/spring-zero-sample-profile/pom.xml
index 46b40d65b5..31e5d3e6d1 100644
--- a/spring-zero-samples/spring-zero-sample-profile/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-profile/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter</artifactId>
+			<artifactId>spring-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -28,7 +28,7 @@
 		<plugins>
 			<plugin>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-zero-maven-plugin</artifactId>
+				<artifactId>spring-package-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<extensions>true</extensions>
 			</plugin>
diff --git a/spring-zero-samples/spring-zero-sample-simple/pom.xml b/spring-zero-samples/spring-zero-sample-simple/pom.xml
index 1457432890..ae892af52b 100644
--- a/spring-zero-samples/spring-zero-sample-simple/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-simple/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter</artifactId>
+			<artifactId>spring-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
@@ -23,7 +23,7 @@
 		<plugins>
 			<plugin>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-zero-maven-plugin</artifactId>
+				<artifactId>spring-package-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<extensions>true</extensions>
 			</plugin>
diff --git a/spring-zero-samples/spring-zero-sample-tomcat/pom.xml b/spring-zero-samples/spring-zero-sample-tomcat/pom.xml
index 04935bf2bc..7af98507b5 100644
--- a/spring-zero-samples/spring-zero-sample-tomcat/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-tomcat/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter</artifactId>
+			<artifactId>spring-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -35,7 +35,7 @@
 		<plugins>
 			<plugin>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-zero-maven-plugin</artifactId>
+				<artifactId>spring-package-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<extensions>true</extensions>
 			</plugin>
diff --git a/spring-zero-samples/spring-zero-sample-traditional/pom.xml b/spring-zero-samples/spring-zero-sample-traditional/pom.xml
index 4095d6612f..d964433de4 100644
--- a/spring-zero-samples/spring-zero-sample-traditional/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-traditional/pom.xml
@@ -16,7 +16,7 @@
 		<!-- Compile -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter</artifactId>
+			<artifactId>spring-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -44,7 +44,7 @@
 		<plugins>
 			<plugin>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-zero-maven-plugin</artifactId>
+				<artifactId>spring-package-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<extensions>true</extensions>
 			</plugin>
diff --git a/spring-zero-samples/spring-zero-sample-web-ui/pom.xml b/spring-zero-samples/spring-zero-sample-web-ui/pom.xml
index a790637251..16f71b89ca 100644
--- a/spring-zero-samples/spring-zero-sample-web-ui/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-web-ui/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter-web</artifactId>
+			<artifactId>spring-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -31,7 +31,7 @@
 		<plugins>
 			<plugin>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-zero-maven-plugin</artifactId>
+				<artifactId>spring-package-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<extensions>true</extensions>
 			</plugin>
diff --git a/spring-zero-samples/spring-zero-sample-xml/pom.xml b/spring-zero-samples/spring-zero-sample-xml/pom.xml
index e987c69895..4d335a23f6 100644
--- a/spring-zero-samples/spring-zero-sample-xml/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-xml/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-starter</artifactId>
+			<artifactId>spring-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
@@ -23,7 +23,7 @@
 		<plugins>
 			<plugin>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-zero-maven-plugin</artifactId>
+				<artifactId>spring-package-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<extensions>true</extensions>
 			</plugin>