diff --git a/.gitignore b/.gitignore
index 5251eb99a9..3116e183be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,4 @@ build
 target
 .springBeans
 dependency-reduced-pom.xml
-
+build.log
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index d7d0dce8b3..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: java
-
-install: mvn -U install --quiet -DskipTests=true
-script: mvn clean test
-
diff --git a/pom.xml b/pom.xml
index 452f74d91a..ad61ff648c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,16 +2,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.bootstrap</groupId>
-	<artifactId>spring-bootstrap-parent</artifactId>
+	<groupId>org.springframework.zero</groupId>
+	<artifactId>spring-zero</artifactId>
 	<version>0.5.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<prerequisites>
 		<maven>3.0.0</maven>
 	</prerequisites>
 	<properties>
+		<main.basedir>${basedir}</main.basedir>
 		<java.version>1.6</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.version>3.0.5</maven.version>
 		<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
 		<spring.security.version>3.1.3.RELEASE</spring.security.version>
 		<spring.security.javaconfig.version>1.0.0.CI-SNAPSHOT</spring.security.javaconfig.version>
@@ -21,47 +23,28 @@
 		<jetty.version>8.1.9.v20130131</jetty.version>
 		<aspectj.version>1.7.2</aspectj.version>
 	</properties>
-
 	<scm>
 		<url>http://github.com/SpringSource/spring-bootstrap</url>
 		<connection>scm:git:git://github.com/SpringSource/spring-bootstrap.git</connection>
 		<developerConnection>scm:git:ssh://git@github.com/SpringSource/spring-bootstrap.git</developerConnection>
 	</scm>
-
 	<developers>
 		<developer>
-			<id>dsyer</id>
-			<name>Dave Syer</name>
-			<email>dsyer@gopivotal.com</email>
-		</developer>
-		<developer>
-			<id>phillweb</id>
-			<name>Phillip Webb</name>
-			<email>pweb@gopivotal.com</email>
+			<id>spring</id>
+			<name>SpringSource</name>
+			<url>http://www.springsource.org</url>
 		</developer>
 	</developers>
-
-	<distributionManagement>
-		<!-- see 'staging' profile for dry-run deployment settings -->
-		<downloadUrl>http://www.springsource.com/download/community
-		</downloadUrl>
-		<site>
-			<id>spring-docs</id>
-			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-bootstrap/docs/${project.version}
-			</url>
-		</site>
-		<repository>
-			<id>spring-repo-release</id>
-			<name>Spring Release Repository</name>
-			<url>http://repo.springsource.org/libs-release-local</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-repo-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>http://repo.springsource.org/libs-snapshot-local</url>
-		</snapshotRepository>
-	</distributionManagement>
-
+	<modules>
+		<module>spring-zero-actuator</module>
+		<module>spring-zero-autoconfigure</module>
+		<module>spring-zero-cli</module>
+		<module>spring-zero-core</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>
 			<plugins>
@@ -82,7 +65,6 @@
 					<version>2.7</version>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
 					<version>2.6</version>
 				</plugin>
@@ -90,6 +72,10 @@
 					<artifactId>maven-eclipse-plugin</artifactId>
 					<version>2.9</version>
 				</plugin>
+				<plugin>
+					<artifactId>maven-exec-plugin</artifactId>
+					<version>1.2.1</version>
+				</plugin>
 				<plugin>
 					<artifactId>maven-failsafe-plugin</artifactId>
 					<version>2.13</version>
@@ -106,6 +92,10 @@
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>2.4</version>
 				</plugin>
+				<plugin>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>2.9</version>
+				</plugin>
 				<plugin>
 					<artifactId>maven-plugin-plugin</artifactId>
 					<version>3.2</version>
@@ -118,10 +108,6 @@
 					<artifactId>maven-shade-plugin</artifactId>
 					<version>2.0</version>
 				</plugin>
-				<plugin>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.13</version>
-				</plugin>
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
 					<version>3.2</version>
@@ -131,17 +117,18 @@
 					<version>2.2.1</version>
 				</plugin>
 				<plugin>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.9</version>
-				</plugin>
-				<plugin>
-					<artifactId>maven-exec-plugin</artifactId>
-					<version>1.2.1</version>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.13</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-war-plugin</artifactId>
 					<version>2.3</version>
 				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>versions-maven-plugin</artifactId>
+					<version>2.0</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -160,11 +147,11 @@
 					<additionalConfig>
 						<file>
 							<name>.settings/org.eclipse.jdt.ui.prefs</name>
-							<url>http://static.springsource.org/sts/jdtconfig/org.eclipse.jdt.ui.prefs</url>
+							<location>${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs</location>
 						</file>
 						<file>
 							<name>.settings/org.eclipse.jdt.core.prefs</name>
-							<url>http://static.springsource.org/sts/jdtconfig/org.eclipse.jdt.core.prefs</url>
+							<location>${main.basedir}/eclipse/org.eclipse.jdt.core.prefs</location>
 						</file>
 					</additionalConfig>
 				</configuration>
@@ -174,22 +161,17 @@
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
-						<phase>verify</phase>
 						<goals>
 							<goal>jar</goal>
 						</goals>
 					</execution>
 				</executions>
-				<configuration>
-					<!-- is using JDK 8 <additionalparam>-Xdoclint:none -quiet</additionalparam> -->
-				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
-						<phase>verify</phase>
 						<goals>
 							<goal>jar-no-fork</goal>
 						</goals>
@@ -206,16 +188,11 @@
 					<excludes>
 						<exclude>**/Abstract*.java</exclude>
 					</excludes>
-					<junitArtifactName>junit:junit</junitArtifactName>
-					<systemPropertyVariables>
-						<java.security.egd>file:/dev/./urandom</java.security.egd>
-					</systemPropertyVariables>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>versions-maven-plugin</artifactId>
-				<version>2.0</version>
 			</plugin>
 		</plugins>
 	</build>
@@ -224,7 +201,7 @@
 			<dependency>
 				<groupId>ch.qos.logback</groupId>
 				<artifactId>logback-classic</artifactId>
-				<version>1.0.7</version>
+				<version>1.0.10</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
@@ -286,6 +263,46 @@
 				<artifactId>ivy</artifactId>
 				<version>2.3.0</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-archiver</artifactId>
+				<version>2.5</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-artifact</artifactId>
+				<version>${maven.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-core</artifactId>
+				<version>${maven.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-model</artifactId>
+				<version>${maven.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-plugin-api</artifactId>
+				<version>${maven.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-settings</artifactId>
+				<version>${maven.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>1.6</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven.plugin-tools</groupId>
+				<artifactId>maven-plugin-annotations</artifactId>
+				<version>3.2</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.tomcat.embed</groupId>
 				<artifactId>tomcat-embed-core</artifactId>
@@ -326,6 +343,16 @@
 				<artifactId>groovy-templates</artifactId>
 				<version>2.1.3</version>
 			</dependency>
+			<dependency>
+				<groupId>org.codehaus.plexus</groupId>
+				<artifactId>plexus-archiver</artifactId>
+				<version>2.2</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.plexus</groupId>
+				<artifactId>plexus-utils</artifactId>
+				<version>3.0.10</version>
+			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-webapp</artifactId>
@@ -352,16 +379,16 @@
 				<artifactId>jetty-annotations</artifactId>
 				<version>${jetty.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>com.h2database</groupId>
-				<artifactId>h2</artifactId>
-				<version>1.3.171</version>
-			</dependency>
 			<dependency>
 				<groupId>org.hamcrest</groupId>
 				<artifactId>hamcrest-library</artifactId>
 				<version>1.3</version>
 			</dependency>
+			<dependency>
+				<groupId>com.h2database</groupId>
+				<artifactId>h2</artifactId>
+				<version>1.3.171</version>
+			</dependency>
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate-entitymanager</artifactId>
@@ -387,40 +414,30 @@
 				<artifactId>mockito-core</artifactId>
 				<version>1.9.5</version>
 			</dependency>
+			<dependency>
+				<groupId>org.ow2.asm</groupId>
+				<artifactId>asm</artifactId>
+				<version>4.0</version>
+			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>jcl-over-slf4j</artifactId>
-				<version>1.7.2</version>
+				<version>1.7.5</version>
 			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
-				<version>1.7.2</version>
+				<version>1.7.5</version>
 			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-log4j12</artifactId>
-				<version>1.7.2</version>
+				<version>1.7.5</version>
 			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-jdk14</artifactId>
-				<version>1.7.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.security</groupId>
-				<artifactId>spring-security-javaconfig</artifactId>
-				<version>${spring.security.javaconfig.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.security</groupId>
-				<artifactId>spring-security-web</artifactId>
-				<version>${spring.security.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.security</groupId>
-				<artifactId>spring-security-core</artifactId>
-				<version>${spring.security.version}</version>
+				<version>1.7.5</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
@@ -432,11 +449,6 @@
 				<artifactId>spring-beans</artifactId>
 				<version>${spring.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-expression</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-core</artifactId>
@@ -460,22 +472,17 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
-				<artifactId>spring-web</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-jms</artifactId>
+				<artifactId>spring-expression</artifactId>
 				<version>${spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
-				<artifactId>spring-webmvc</artifactId>
+				<artifactId>spring-jdbc</artifactId>
 				<version>${spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
-				<artifactId>spring-jdbc</artifactId>
+				<artifactId>spring-jms</artifactId>
 				<version>${spring.version}</version>
 			</dependency>
 			<dependency>
@@ -504,16 +511,21 @@
 				<artifactId>spring-tx</artifactId>
 				<version>${spring.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-web</artifactId>
+				<version>${spring.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-webmvc</artifactId>
+				<version>${spring.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.batch</groupId>
 				<artifactId>spring-batch-core</artifactId>
 				<version>${spring.batch.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.integration</groupId>
-				<artifactId>spring-integration-core</artifactId>
-				<version>${spring.integration.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-jpa</artifactId>
@@ -530,9 +542,49 @@
 				</exclusions>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework.hateoas</groupId>
-				<artifactId>spring-hateoas</artifactId>
-				<version>0.5.0.RELEASE</version>
+				<groupId>org.springframework.integration</groupId>
+				<artifactId>spring-integration-core</artifactId>
+				<version>${spring.integration.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.integration</groupId>
+				<artifactId>spring-integration-file</artifactId>
+				<version>${spring.integration.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.integration</groupId>
+				<artifactId>spring-integration-http</artifactId>
+				<version>${spring.integration.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.integration</groupId>
+				<artifactId>spring-integration-ip</artifactId>
+				<version>${spring.integration.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.integration</groupId>
+				<artifactId>spring-integration-stream</artifactId>
+				<version>${spring.integration.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.security</groupId>
+				<artifactId>spring-security-core</artifactId>
+				<version>${spring.security.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.security</groupId>
+				<artifactId>spring-security-javaconfig</artifactId>
+				<version>${spring.security.javaconfig.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.security</groupId>
+				<artifactId>spring-security-web</artifactId>
+				<version>${spring.security.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.thymeleaf</groupId>
+				<artifactId>thymeleaf</artifactId>
+				<version>2.0.16</version>
 			</dependency>
 			<dependency>
 				<groupId>org.thymeleaf</groupId>
@@ -563,92 +615,27 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-
+	<distributionManagement>
+		<downloadUrl>http://www.springsource.com/download/community</downloadUrl>
+		<site>
+			<id>spring-docs</id>
+			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-bootstrap/docs/${project.version}</url>
+		</site>
+		<repository>
+			<id>spring-repo-release</id>
+			<name>Spring Release Repository</name>
+			<url>http://repo.springsource.org/libs-release-local</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-repo-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>http://repo.springsource.org/libs-snapshot-local</url>
+		</snapshotRepository>
+	</distributionManagement>
 	<profiles>
 		<profile>
-			<id>setup</id>
-			<modules>
-				<module>spring-bootstrap-launcher</module>
-				<module>spring-bootstrap-maven-plugin</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>default</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<modules>
-				<module>spring-bootstrap</module>
-				<module>spring-bootstrap-actuator</module>
-				<module>spring-bootstrap-cli</module>
-				<module>spring-bootstrap-launcher</module>
-				<module>spring-bootstrap-maven-plugin</module>
-				<module>spring-bootstrap-samples</module>
-				<module>spring-bootstrap-starters</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>staging</id>
-			<distributionManagement>
-				<site>
-					<id>spring-site-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-bootstrap/docs</url>
-				</site>
-				<repository>
-					<id>spring-milestone-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-bootstrap/milestone</url>
-				</repository>
-				<snapshotRepository>
-					<id>spring-snapshot-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-bootstrap/snapshot</url>
-				</snapshotRepository>
-			</distributionManagement>
-		</profile>
-		<profile>
-			<id>milestone</id>
-			<distributionManagement>
-				<repository>
-					<id>spring-repo-milestone</id>
-					<name>Spring Milestone Repository</name>
-					<url>https://repo.springsource.org/libs-milestone-local</url>
-				</repository>
-			</distributionManagement>
-		</profile>
-		<profile>
-			<id>central</id>
-			<distributionManagement>
-				<snapshotRepository>
-					<id>sonatype-nexus-snapshots</id>
-					<name>Sonatype Nexus Snapshots</name>
-					<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-				</snapshotRepository>
-				<repository>
-					<id>sonatype-nexus-staging</id>
-					<name>Nexus Release Repository</name>
-					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-				</repository>
-			</distributionManagement>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>sign-artifacts</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>bootstrap</id>
-			<!-- deactivate when released -->
+			<!-- FIXME remove before release -->
+			<id>snapshot-repositories</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
@@ -671,6 +658,21 @@
 				</repository>
 			</repositories>
 		</profile>
+		<profile>
+			<id>jdk8</id>
+			<activation>
+				<jdk>1.8</jdk>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<configuration>
+							<additionalparam>-Xdoclint:none -quiet</additionalparam>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
-
 </project>
diff --git a/spring-bootstrap-samples/pom.xml b/spring-bootstrap-samples/pom.xml
deleted file mode 100644
index bdd0ce1233..0000000000
--- a/spring-bootstrap-samples/pom.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-parent</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-bootstrap-samples</artifactId>
-	<packaging>pom</packaging>
-	<modules>
-		<module>spring-bootstrap-sample</module>
-		<module>spring-bootstrap-actuator-sample</module>
-		<module>spring-bootstrap-actuator-ui-sample</module>
-		<module>spring-bootstrap-batch-sample</module>
-		<module>spring-bootstrap-data-sample</module>
-		<module>spring-bootstrap-integration-sample</module>
-		<module>spring-bootstrap-jetty-sample</module>
-		<module>spring-bootstrap-profile-sample</module>
-		<module>spring-bootstrap-simple-sample</module>
-		<module>spring-bootstrap-tomcat-sample</module>
-		<module>spring-bootstrap-trad-sample</module>
-		<module>spring-bootstrap-ui-sample</module>
-		<module>spring-bootstrap-xml-sample</module>
-	</modules>
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>exec-maven-plugin</artifactId>
-					<configuration>
-						<includePluginDependencies>true</includePluginDependencies>
-						<mainClass>${start-class}</mainClass>
-					</configuration>
-				</plugin>
-
-				<!-- Launcher Style -->
-
-				<plugin>
-					<!-- Copy dependencies before assembly -->
-					<artifactId>maven-dependency-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>unpack</id>
-							<phase>prepare-package</phase>
-							<inherited>true</inherited>
-							<goals>
-								<goal>unpack</goal>
-							</goals>
-							<configuration>
-								<artifactItems>
-									<artifactItem>
-										<groupId>${project.groupId}</groupId>
-										<artifactId>spring-bootstrap-launcher</artifactId>
-										<version>${project.version}</version>
-										<type>jar</type>
-									</artifactItem>
-								</artifactItems>
-								<outputDirectory>${project.build.directory}/assembly</outputDirectory>
-							</configuration>
-						</execution>
-						<execution>
-							<id>copy</id>
-							<phase>prepare-package</phase>
-							<inherited>true</inherited>
-							<goals>
-								<goal>copy-dependencies</goal>
-							</goals>
-							<configuration>
-								<outputDirectory>${project.build.directory}/assembly/lib</outputDirectory>
-								<scope>runtime</scope>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<!-- Assemble a complete JAR -->
-					<artifactId>maven-assembly-plugin</artifactId>
-					<configuration>
-						<descriptors>
-							<descriptor>${project.parent.basedir}/src/main/assembly/jar-with-dependencies.xml</descriptor>
-						</descriptors>
-						<archive>
-							<manifest>
-								<mainClass>org.springframework.bootstrap.launcher.JarLauncher</mainClass>
-							</manifest>
-							<manifestEntries>
-								<Start-Class>${start-class}</Start-Class>
-							</manifestEntries>
-						</archive>
-					</configuration>
-					<executions>
-						<execution>
-							<id>jar-with-dependencies</id>
-							<phase>package</phase>
-							<inherited>true</inherited>
-							<goals>
-								<goal>single</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-
-				<!-- Shade Style -->
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-shade-plugin</artifactId>
-					<dependencies>
-						<dependency>
-							<groupId>${project.groupId}</groupId>
-							<artifactId>spring-bootstrap</artifactId>
-							<version>${project.version}</version>
-						</dependency>
-					</dependencies>
-					<configuration>
-						<createDependencyReducedPom>true</createDependencyReducedPom>
-						<filters>
-							<filter>
-								<artifact>*:*</artifact>
-								<excludes>
-									<exclude>META-INF/*.SF</exclude>
-									<exclude>META-INF/*.DSA</exclude>
-									<exclude>META-INF/*.RSA</exclude>
-								</excludes>
-							</filter>
-						</filters>
-					</configuration>
-					<executions>
-						<execution>
-							<phase>package</phase>
-							<goals>
-								<goal>shade</goal>
-							</goals>
-							<configuration>
-								<transformers>
-									<transformer
-										implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-										<resource>META-INF/spring.handlers</resource>
-									</transformer>
-									<transformer
-										implementation="org.springframework.bootstrap.maven.PropertiesMergingResourceTransformer">
-										<resource>META-INF/spring.factories</resource>
-									</transformer>
-									<transformer
-										implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-										<resource>META-INF/spring.schemas</resource>
-									</transformer>
-									<transformer
-										implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-									<transformer
-										implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-										<mainClass>${start-class}</mainClass>
-									</transformer>
-								</transformers>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<!-- Support executable archives -->
-				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-bootstrap-maven-plugin</artifactId>
-				<version>${project.version}</version>
-				<extensions>true</extensions>
-				<inherited>true</inherited>
-			</plugin>
-			<plugin>
-				<!--skip deploy (these are just samples) -->
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-core</artifactId>
-				<version>${spring.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-	<dependencies>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/pom.xml
deleted file mode 100644
index b847540af5..0000000000
--- a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/pom.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-bootstrap-actuator-ui-sample</artifactId>
-	<properties>
-		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
-		<start-class>org.springframework.bootstrap.sample.ui.UiBootstrapApplication</start-class>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap-actuator</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.thymeleaf</groupId>
-			<artifactId>thymeleaf-spring3</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-logging-juli</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-javaconfig</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-web</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-shade-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-exec-plugin</artifactId>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.apache.maven.plugins
-										</groupId>
-										<artifactId>
-											maven-dependency-plugin
-										</artifactId>
-										<versionRange>
-											[2.6,)
-										</versionRange>
-										<goals>
-											<goal>
-												copy-dependencies
-											</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml
deleted file mode 100644
index 9e50bf22c4..0000000000
--- a/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-bootstrap-data-sample</artifactId>
-	<packaging>executable-jar</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-webapp</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aop</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/.springBeans b/spring-bootstrap-samples/spring-bootstrap-integration-sample/.springBeans
deleted file mode 100644
index 51f8f5d53e..0000000000
--- a/spring-bootstrap-samples/spring-bootstrap-integration-sample/.springBeans
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
-	<version>1</version>
-	<pluginVersion><![CDATA[3.2.0.201303060654-RELEASE]]></pluginVersion>
-	<configSuffixes>
-		<configSuffix><![CDATA[xml]]></configSuffix>
-	</configSuffixes>
-	<enableImports><![CDATA[false]]></enableImports>
-	<configs>
-		<config>src/main/resources/integration-context.xml</config>
-	</configs>
-	<configSets>
-	</configSets>
-</beansProjectDescription>
diff --git a/spring-bootstrap-samples/spring-bootstrap-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-sample/pom.xml
deleted file mode 100644
index 61f9f91b64..0000000000
--- a/spring-bootstrap-samples/spring-bootstrap-sample/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-bootstrap-sample</artifactId>
-	<packaging>pom</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap</artifactId>
-			<version>${project.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-core</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-logging-juli</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/README.txt b/spring-bootstrap-samples/spring-bootstrap-trad-sample/README.txt
deleted file mode 100644
index ebad46ee04..0000000000
--- a/spring-bootstrap-samples/spring-bootstrap-trad-sample/README.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-This is a simple template for creating issue reproduction projects per
-the README.markdown file in the root of this repository (and at
-https://github.com/cbeams/spring-framework-issues#readme).  Please read
-that document completely before starting.
-
-As described at the link above, copy this project to a new directory
-having the same name as the JIRA issue you're trying to reproduce and
-edit from there.
-
-Both Gradle (build.gradle) and Maven (pom.xml) build scripts are
-included for your convenience and choice.  Once you've created your
-copy of this directory, delete whichever build script you don't wish
-to use, and then edit the remaining one to suit your needs.
-
-Note that this project contains a log4j.properties file in
-src/test/resources that you may wish to configure to emit more detailed
-logging.  The log level for org.springframework is set to WARN by default.
diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml
deleted file mode 100644
index ff254ddd49..0000000000
--- a/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-bootstrap-trad-sample</artifactId>
-	<name>spring-bootstrap-trad-sample</name>
-	<packaging>war</packaging>
-
-	<properties>
-		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
-		<start-class>org.springframework.bootstrap.sample.trad.TradBootstrapApplication</start-class>
-	</properties>
-
-	<dependencies>
-		<!-- Spring Framework -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<exclusions>
-				<!-- Exclude Commons Logging in favor of SLF4j -->
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-		</dependency>
-
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-
-		<!-- Servlet API -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-core</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-logging-juli</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-jasper</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<configuration>
-					<includePluginDependencies>true</includePluginDependencies>
-					<mainClass>${start-class}</mainClass>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>${project.groupId}</groupId>
-						<artifactId>spring-bootstrap</artifactId>
-						<version>${project.version}</version>
-					</dependency>
-					<dependency>
-						<groupId>org.apache.tomcat.embed</groupId>
-						<artifactId>tomcat-embed-core</artifactId>
-						<version>${tomcat.version}</version>
-					</dependency>
-					<dependency>
-						<groupId>org.apache.tomcat.embed</groupId>
-						<artifactId>tomcat-embed-logging-juli</artifactId>
-						<version>${tomcat.version}</version>
-					</dependency>
-					<dependency>
-						<groupId>org.apache.tomcat.embed</groupId>
-						<artifactId>tomcat-embed-jasper</artifactId>
-						<version>${tomcat.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<mainClass>org.springframework.bootstrap.launcher.WarLauncher</mainClass>
-						</manifest>
-						<manifestEntries>
-							<Start-Class>org.springframework.bootstrap.sample.trad.TradBootstrapApplication</Start-Class>
-						</manifestEntries>
-					</archive>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>${project.groupId}</groupId>
-									<artifactId>spring-bootstrap-launcher</artifactId>
-									<version>${project.version}</version>
-									<type>jar</type>
-								</artifactItem>
-							</artifactItems>
-							<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<includeScope>provided</includeScope>
-							<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib-provided</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
-
diff --git a/spring-bootstrap-samples/src/main/assembly/jar-with-dependencies.xml b/spring-bootstrap-samples/src/main/assembly/jar-with-dependencies.xml
deleted file mode 100644
index 44626f91aa..0000000000
--- a/spring-bootstrap-samples/src/main/assembly/jar-with-dependencies.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-	<id>full</id>
-	<formats>
-		<format>jar</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<dependencySets>
-		<dependencySet>
-			<useProjectArtifact/>
-			<includes>
-				<include>${project.groupId}:${project.artifactId}</include>
-			</includes>
-			<unpack>true</unpack>
-		</dependencySet>
-	</dependencySets>
-	<fileSets>
-		<fileSet>
-			<directory>${project.build.directory}/assembly</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-	</fileSets>
-</assembly>
diff --git a/spring-bootstrap-starters/pom.xml b/spring-bootstrap-starters/pom.xml
deleted file mode 100644
index 5867cea47f..0000000000
--- a/spring-bootstrap-starters/pom.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-parent</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-bootstrap-starters</artifactId>
-	<packaging>pom</packaging>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<spring.bootstrap.version>0.5.0.BUILD-SNAPSHOT</spring.bootstrap.version>
-		<start-class>org.springframework.bootstrap.main.Spring</start-class>
-	</properties>
-	<modules>
-		<module>spring-bootstrap-starter</module>
-		<module>spring-bootstrap-actuator-starter</module>
-		<module>spring-bootstrap-batch-starter</module>
-		<module>spring-bootstrap-integration-starter</module>
-		<module>spring-bootstrap-jpa-starter</module>
-		<module>spring-bootstrap-security-starter</module>
-		<module>spring-bootstrap-tomcat-starter</module>
-		<module>spring-bootstrap-web-starter</module>
-	</modules>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.bootstrap</groupId>
-				<artifactId>spring-bootstrap</artifactId>
-				<version>${spring.bootstrap.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.bootstrap</groupId>
-				<artifactId>spring-bootstrap-actuator</artifactId>
-				<version>${spring.bootstrap.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.bootstrap</groupId>
-				<artifactId>spring-bootstrap-starter</artifactId>
-				<version>${spring.bootstrap.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.bootstrap</groupId>
-				<artifactId>spring-bootstrap-actuator-starter</artifactId>
-				<version>${spring.bootstrap.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.bootstrap</groupId>
-				<artifactId>spring-bootstrap-web-starter</artifactId>
-				<version>${spring.bootstrap.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.bootstrap</groupId>
-				<artifactId>spring-bootstrap-tomcat-starter</artifactId>
-				<version>${spring.bootstrap.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.bootstrap</groupId>
-				<artifactId>spring-bootstrap-jpa-starter</artifactId>
-				<version>${spring.bootstrap.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.bootstrap</groupId>
-				<artifactId>spring-bootstrap-batch-starter</artifactId>
-				<version>${spring.bootstrap.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.bootstrap</groupId>
-				<artifactId>spring-bootstrap-integration-starter</artifactId>
-				<version>${spring.bootstrap.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.bootstrap</groupId>
-				<artifactId>spring-bootstrap-security-starter</artifactId>
-				<version>${spring.bootstrap.version}</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<!-- Support bootstrap types -->
-			<plugin>
-				<groupId>org.springframework.bootstrap</groupId>
-				<artifactId>spring-bootstrap-maven-plugin</artifactId>
-				<version>${spring.bootstrap.version}</version>
-				<extensions>true</extensions>
-				<inherited>true</inherited>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<!-- Allow exec plugin to launch the application -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>exec-maven-plugin</artifactId>
-					<configuration>
-						<includePluginDependencies>true</includePluginDependencies>
-						<mainClass>${start-class}</mainClass>
-					</configuration>
-				</plugin>
-
-				<!-- Support shade packaging -->
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-shade-plugin</artifactId>
-					<dependencies>
-						<dependency>
-							<groupId>org.springframework.bootstrap</groupId>
-							<artifactId>spring-bootstrap</artifactId>
-							<version>${spring.bootstrap.version}</version>
-						</dependency>
-					</dependencies>
-					<configuration>
-						<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
-						<createDependencyReducedPom>true</createDependencyReducedPom>
-						<filters>
-							<filter>
-								<artifact>*:*</artifact>
-								<excludes>
-									<exclude>META-INF/*.SF</exclude>
-									<exclude>META-INF/*.DSA</exclude>
-									<exclude>META-INF/*.RSA</exclude>
-								</excludes>
-							</filter>
-						</filters>
-					</configuration>
-					<executions>
-						<execution>
-							<phase>package</phase>
-							<goals>
-								<goal>shade</goal>
-							</goals>
-							<configuration>
-								<transformers>
-									<transformer
-										implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-										<resource>META-INF/spring.handlers</resource>
-									</transformer>
-									<transformer
-										implementation="org.springframework.bootstrap.maven.PropertiesMergingResourceTransformer">
-										<resource>META-INF/spring.factories</resource>
-									</transformer>
-									<transformer
-										implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-										<resource>META-INF/spring.schemas</resource>
-									</transformer>
-									<transformer
-										implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-									<transformer
-										implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-										<mainClass>${start-class}</mainClass>
-									</transformer>
-								</transformers>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
diff --git a/spring-bootstrap-starters/spring-bootstrap-integration-starter/pom.xml b/spring-bootstrap-starters/spring-bootstrap-integration-starter/pom.xml
deleted file mode 100644
index ed1f279a4d..0000000000
--- a/spring-bootstrap-starters/spring-bootstrap-integration-starter/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-starters</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-bootstrap-integration-starter</artifactId>
-	<packaging>jar</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap-starter</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-core</artifactId>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/spring-bootstrap-starters/spring-bootstrap-tomcat-starter/pom.xml b/spring-bootstrap-starters/spring-bootstrap-tomcat-starter/pom.xml
deleted file mode 100644
index 25550156b8..0000000000
--- a/spring-bootstrap-starters/spring-bootstrap-tomcat-starter/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-starters</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-bootstrap-tomcat-starter</artifactId>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.bootstrap</groupId>
-			<artifactId>spring-bootstrap-starter</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-logging-juli</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/spring-bootstrap-actuator/README.md b/spring-zero-actuator/README.md
similarity index 100%
rename from spring-bootstrap-actuator/README.md
rename to spring-zero-actuator/README.md
diff --git a/spring-bootstrap-actuator/docs/Features.md b/spring-zero-actuator/docs/Features.md
similarity index 100%
rename from spring-bootstrap-actuator/docs/Features.md
rename to spring-zero-actuator/docs/Features.md
diff --git a/spring-bootstrap-actuator/pom.xml b/spring-zero-actuator/pom.xml
similarity index 80%
rename from spring-bootstrap-actuator/pom.xml
rename to spring-zero-actuator/pom.xml
index 884f836070..528da315bd 100644
--- a/spring-bootstrap-actuator/pom.xml
+++ b/spring-zero-actuator/pom.xml
@@ -3,47 +3,53 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-parent</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-actuator</artifactId>
+	<artifactId>spring-zero-actuator</artifactId>
 	<packaging>jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/..</main.basedir>
+	</properties>
 	<dependencies>
+		<!-- Compile -->
 		<dependency>
-			<groupId>org.springframework.bootstrap</groupId>
-			<artifactId>spring-bootstrap</artifactId>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-autoconfigure</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-expression</artifactId>
+			<artifactId>spring-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<scope>test</scope>
+			<artifactId>spring-context</artifactId>
 		</dependency>
+		<!-- Optional -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<scope>provided</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
@@ -60,6 +66,7 @@
 			<artifactId>tomcat-embed-core</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<!-- Test -->
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
 			<artifactId>tomcat-embed-logging-juli</artifactId>
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfiguration.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfiguration.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfiguration.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfiguration.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ErrorMvcAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ErrorMvcAutoConfiguration.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ErrorMvcAutoConfiguration.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfiguration.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfiguration.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfiguration.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfiguration.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpoint.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpoint.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpoint.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ActionEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ActionEndpoint.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ActionEndpoint.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ActionEndpoint.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpoint.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpoint.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpoint.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpoint.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpoint.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpoint.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/Endpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/Endpoint.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/Endpoint.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/Endpoint.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpoint.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpoint.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpoint.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpoint.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpoint.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpoint.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpoint.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpoint.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpoint.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpoint.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpoint.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpoint.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/PublicMetrics.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/PublicMetrics.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/PublicMetrics.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/PublicMetrics.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpoint.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpoint.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpoint.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpoint.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpoint.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpoint.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetrics.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetrics.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetrics.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetrics.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapter.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapter.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapter.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapter.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMapping.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMapping.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMapping.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMapping.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/fixme/ManagementServerConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/fixme/ManagementServerConfiguration.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/fixme/ManagementServerConfiguration.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/fixme/ManagementServerConfiguration.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/web/BasicErrorController.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/BasicErrorController.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/web/BasicErrorController.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/BasicErrorController.java
diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/web/ErrorController.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/ErrorController.java
similarity index 100%
rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/web/ErrorController.java
rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/ErrorController.java
diff --git a/spring-bootstrap-actuator/src/main/resources/META-INF/spring.factories b/spring-zero-actuator/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from spring-bootstrap-actuator/src/main/resources/META-INF/spring.factories
rename to spring-zero-actuator/src/main/resources/META-INF/spring.factories
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/TestUtils.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/TestUtils.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/TestUtils.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/TestUtils.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/listener/AuditListenerTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/listener/AuditListenerTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/listener/AuditListenerTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/listener/AuditListenerTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfigurationTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfigurationTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfigurationTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfigurationTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfigurationTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfigurationTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpointTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpointTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpointTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpointTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpointTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpointTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpointTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpointTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpointTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpointTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpointTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpointTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpointTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpointTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpointTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpointTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpointTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpointTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpointTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpointTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpointTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpointTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpointTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpointTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpointTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpointTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpointTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetricsTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetricsTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetricsTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetricsTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMappingTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMappingTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMappingTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMappingTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicatorTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicatorTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicatorTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicatorTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterServiceTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterServiceTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterServiceTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterServiceTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeServiceTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeServiceTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeServiceTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeServiceTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepositoryTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepositoryTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepositoryTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepositoryTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/SecurityPropertiesTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/SecurityPropertiesTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/SecurityPropertiesTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/SecurityPropertiesTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListenerTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListenerTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListenerTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListenerTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListenerTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListenerTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListenerTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListenerTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java
diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilterTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilterTests.java
similarity index 100%
rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilterTests.java
rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilterTests.java
diff --git a/spring-bootstrap-actuator/src/test/resources/git.properties b/spring-zero-actuator/src/test/resources/git.properties
similarity index 100%
rename from spring-bootstrap-actuator/src/test/resources/git.properties
rename to spring-zero-actuator/src/test/resources/git.properties
diff --git a/spring-bootstrap/pom.xml b/spring-zero-autoconfigure/pom.xml
similarity index 61%
rename from spring-bootstrap/pom.xml
rename to spring-zero-autoconfigure/pom.xml
index a1a7848fbf..2de900f63b 100644
--- a/spring-bootstrap/pom.xml
+++ b/spring-zero-autoconfigure/pom.xml
@@ -3,45 +3,31 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-parent</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap</artifactId>
+	<artifactId>spring-zero-autoconfigure</artifactId>
 	<packaging>jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/..</main.basedir>
+	</properties>
 	<dependencies>
+		<!-- Compile -->
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<!-- Optional -->
 		<dependency>
-			<groupId>org.hibernate.javax.persistence</groupId>
-			<artifactId>hibernate-jpa-2.0-api</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.yaml</groupId>
-			<artifactId>snakeyaml</artifactId>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<groupId>nz.net.ultraq.web.thymeleaf</groupId>
+			<artifactId>thymeleaf-layout-dialect</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -55,18 +41,18 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-webapp</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-webapp</artifactId>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
+			<groupId>org.hibernate.javax.persistence</groupId>
+			<artifactId>hibernate-jpa-2.0-api</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -94,35 +80,19 @@
 			<artifactId>spring-webmvc</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-jpa</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.hateoas</groupId>
-			<artifactId>spring-hateoas</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
 			<artifactId>spring-batch-core</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-jpa</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-shade-plugin</artifactId>
-			<version>1.6</version>
+			<groupId>org.thymeleaf</groupId>
+			<artifactId>thymeleaf</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -130,17 +100,14 @@
 			<artifactId>thymeleaf-spring3</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<!-- Test -->
 		<dependency>
-			<groupId>nz.net.ultraq.web.thymeleaf</groupId>
-			<artifactId>thymeleaf-layout-dialect</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-			<optional>true</optional>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-core</artifactId>
+			<version>${project.version}</version>
+			<classifier>tests</classifier>
+			<scope>test</scope>
 		</dependency>
-		<!-- Test -->
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
@@ -151,15 +118,5 @@
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-logging-juli</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/AutoConfigurationUtils.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/AutoConfigurationUtils.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/AutoConfigurationUtils.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/AutoConfigurationUtils.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/PropertyPlaceholderAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/PropertyPlaceholderAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/PropertyPlaceholderAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/PropertyPlaceholderAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchDatabaseInitializer.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchDatabaseInitializer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchDatabaseInitializer.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchDatabaseInitializer.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionEvent.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionEvent.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionEvent.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionEvent.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGenerator.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGenerator.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGenerator.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGenerator.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/AbstractDataSourceConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/AbstractDataSourceConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/AbstractDataSourceConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/AbstractDataSourceConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/JpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/JpaAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/JpaAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/JpaAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorter.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorter.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorter.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorter.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigureAfter.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigureAfter.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigureAfter.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigureAfter.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ComponentScanDetector.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/ComponentScanDetector.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ComponentScanDetector.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/ComponentScanDetector.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfiguration.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfigurationImportSelector.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfigurationImportSelector.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfigurationImportSelector.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfigurationImportSelector.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/main/Spring.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/main/Spring.java
similarity index 97%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/main/Spring.java
rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/main/Spring.java
index 5a1f2bb5a0..9122239abc 100644
--- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/main/Spring.java
+++ b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/main/Spring.java
@@ -41,6 +41,8 @@ import org.springframework.util.ClassUtils;
 @ComponentScan
 public class Spring {
 
+	// FIXME can we delete this? is it used? does it belong here
+
 	private static ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(
 			true);
 
diff --git a/spring-bootstrap/src/main/resources/META-INF/spring.factories b/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories
similarity index 66%
rename from spring-bootstrap/src/main/resources/META-INF/spring.factories
rename to spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories
index 7836cb266b..117934f292 100644
--- a/spring-bootstrap/src/main/resources/META-INF/spring.factories
+++ b/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -12,11 +12,3 @@ org.springframework.bootstrap.autoconfigure.web.EmbeddedServletContainerAutoConf
 org.springframework.bootstrap.autoconfigure.web.ServerPropertiesAutoConfiguration,\
 org.springframework.bootstrap.autoconfigure.web.MultipartAutoConfiguration,\
 org.springframework.bootstrap.autoconfigure.web.WebMvcAutoConfiguration
-
-# Application Context Initializers
-org.springframework.context.ApplicationContextInitializer=\
-org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer,\
-org.springframework.bootstrap.context.initializer.ContextIdApplicationContextInitializer,\
-org.springframework.bootstrap.context.initializer.EnvironmentDelegateApplicationContextInitializer,\
-org.springframework.bootstrap.context.initializer.LoggingApplicationContextInitializer,\
-org.springframework.bootstrap.context.initializer.VcapApplicationContextInitializer
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/AdhocTestSuite.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/AdhocTestSuite.java
similarity index 95%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/AdhocTestSuite.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/AdhocTestSuite.java
index 76562ed241..fbba0d8234 100644
--- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/AdhocTestSuite.java
+++ b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/AdhocTestSuite.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap;
+package org.springframework.bootstrap.autoconfigure;
 
 import org.junit.Ignore;
 import org.junit.runner.RunWith;
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringJUnitTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/SpringJUnitTests.java
similarity index 93%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringJUnitTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/SpringJUnitTests.java
index 4614dd944f..7b2b79b4fe 100644
--- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringJUnitTests.java
+++ b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/SpringJUnitTests.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.bootstrap;
+package org.springframework.bootstrap.autoconfigure;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.bootstrap.SpringJUnitTests.TestConfiguration;
 import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.bootstrap.autoconfigure.SpringJUnitTests.TestConfiguration;
 import org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/City.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/City.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/City.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/City.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/CityRepository.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/CityRepository.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/CityRepository.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/CityRepository.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/test/City.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/test/City.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/test/City.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/test/City.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfigurationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfigurationTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfigurationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorterTest.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorterTest.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorterTest.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorterTest.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/ComponentScanDetectorConfiguration.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/ComponentScanDetectorConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/ComponentScanDetectorConfiguration.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/ComponentScanDetectorConfiguration.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/main/SimpleMainTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/main/SimpleMainTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/main/SimpleMainTests.java
rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/main/SimpleMainTests.java
diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql
similarity index 100%
rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql
rename to spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql
diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/annotation/foo.xml b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/annotation/foo.xml
similarity index 100%
rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/annotation/foo.xml
rename to spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/annotation/foo.xml
diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/annotation/testProperties.xml b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/annotation/testProperties.xml
similarity index 100%
rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/annotation/testProperties.xml
rename to spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/annotation/testProperties.xml
diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/conf.properties
similarity index 100%
rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties
rename to spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/conf.properties
diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
similarity index 100%
rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
rename to spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/sample-beans.xml b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/sample-beans.xml
similarity index 100%
rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/sample-beans.xml
rename to spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/sample-beans.xml
diff --git a/spring-bootstrap/src/test/resources/static/css/style.css b/spring-zero-autoconfigure/src/test/resources/fixme/static/css/style.css
similarity index 100%
rename from spring-bootstrap/src/test/resources/static/css/style.css
rename to spring-zero-autoconfigure/src/test/resources/fixme/static/css/style.css
diff --git a/spring-zero-autoconfigure/src/test/resources/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql b/spring-zero-autoconfigure/src/test/resources/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql
new file mode 100644
index 0000000000..38de881057
--- /dev/null
+++ b/spring-zero-autoconfigure/src/test/resources/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql
@@ -0,0 +1,4 @@
+CREATE TABLE FOO (
+  id         INTEGER IDENTITY PRIMARY KEY,
+  name VARCHAR(30),
+);
\ No newline at end of file
diff --git a/spring-bootstrap/src/test/resources/templates/layout.html b/spring-zero-autoconfigure/src/test/resources/templates/layout.html
similarity index 100%
rename from spring-bootstrap/src/test/resources/templates/layout.html
rename to spring-zero-autoconfigure/src/test/resources/templates/layout.html
diff --git a/spring-bootstrap/src/test/resources/templates/template.txt b/spring-zero-autoconfigure/src/test/resources/templates/template.txt
similarity index 100%
rename from spring-bootstrap/src/test/resources/templates/template.txt
rename to spring-zero-autoconfigure/src/test/resources/templates/template.txt
diff --git a/spring-bootstrap/src/test/resources/templates/tiles.xml b/spring-zero-autoconfigure/src/test/resources/templates/tiles.xml
similarity index 100%
rename from spring-bootstrap/src/test/resources/templates/tiles.xml
rename to spring-zero-autoconfigure/src/test/resources/templates/tiles.xml
diff --git a/spring-bootstrap/src/test/resources/templates/view.html b/spring-zero-autoconfigure/src/test/resources/templates/view.html
similarity index 100%
rename from spring-bootstrap/src/test/resources/templates/view.html
rename to spring-zero-autoconfigure/src/test/resources/templates/view.html
diff --git a/spring-bootstrap/src/test/resources/test/messages.properties b/spring-zero-autoconfigure/src/test/resources/test/messages.properties
similarity index 100%
rename from spring-bootstrap/src/test/resources/test/messages.properties
rename to spring-zero-autoconfigure/src/test/resources/test/messages.properties
diff --git a/spring-bootstrap-cli/pom.xml b/spring-zero-cli/pom.xml
similarity index 70%
rename from spring-bootstrap-cli/pom.xml
rename to spring-zero-cli/pom.xml
index 6f7b0fc119..8dfb51468d 100644
--- a/spring-bootstrap-cli/pom.xml
+++ b/spring-zero-cli/pom.xml
@@ -3,28 +3,42 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-parent</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-cli</artifactId>
+	<artifactId>spring-zero-cli</artifactId>
 	<packaging>jar</packaging>
 	<properties>
+		<main.basedir>${basedir}/..</main.basedir>
 		<start-class>org.springframework.bootstrap.cli.SpringBootstrapCli</start-class>
 	</properties>
+	<dependencies>
+		<!-- Compile -->
+		<dependency>
+			<groupId>net.sf.jopt-simple</groupId>
+			<artifactId>jopt-simple</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.ivy</groupId>
+			<artifactId>ivy</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy</artifactId>
+		</dependency>
+		<!-- Optional -->
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-templates</artifactId>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
 				<artifactId>maven-shade-plugin</artifactId>
-				<dependencies>
-					<dependency>
-						<groupId>${project.groupId}</groupId>
-						<artifactId>spring-bootstrap</artifactId>
-						<version>${project.version}</version>
-					</dependency>
-				</dependencies>
 				<configuration>
-					<createDependencyReducedPom>true</createDependencyReducedPom>
 					<filters>
 						<filter>
 							<artifact>*:*</artifact>
@@ -44,18 +58,6 @@
 						</goals>
 						<configuration>
 							<transformers>
-								<transformer
-									implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-									<resource>META-INF/spring.handlers</resource>
-								</transformer>
-								<transformer
-									implementation="org.springframework.bootstrap.maven.PropertiesMergingResourceTransformer">
-									<resource>META-INF/spring.factories</resource>
-								</transformer>
-								<transformer
-									implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-									<resource>META-INF/spring.schemas</resource>
-								</transformer>
 								<transformer
 									implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
 								<transformer
@@ -87,23 +89,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-templates</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ivy</groupId>
-			<artifactId>ivy</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.jopt-simple</groupId>
-			<artifactId>jopt-simple</artifactId>
-		</dependency>
-	</dependencies>
 </project>
diff --git a/spring-bootstrap-cli/samples/actuator.groovy b/spring-zero-cli/samples/actuator.groovy
similarity index 100%
rename from spring-bootstrap-cli/samples/actuator.groovy
rename to spring-zero-cli/samples/actuator.groovy
diff --git a/spring-bootstrap-cli/samples/app.groovy b/spring-zero-cli/samples/app.groovy
similarity index 100%
rename from spring-bootstrap-cli/samples/app.groovy
rename to spring-zero-cli/samples/app.groovy
diff --git a/spring-bootstrap-cli/samples/integration.groovy b/spring-zero-cli/samples/integration.groovy
similarity index 100%
rename from spring-bootstrap-cli/samples/integration.groovy
rename to spring-zero-cli/samples/integration.groovy
diff --git a/spring-bootstrap-cli/samples/job.groovy b/spring-zero-cli/samples/job.groovy
similarity index 100%
rename from spring-bootstrap-cli/samples/job.groovy
rename to spring-zero-cli/samples/job.groovy
diff --git a/spring-bootstrap-cli/samples/runner.groovy b/spring-zero-cli/samples/runner.groovy
similarity index 100%
rename from spring-bootstrap-cli/samples/runner.groovy
rename to spring-zero-cli/samples/runner.groovy
diff --git a/spring-bootstrap-cli/samples/runner.xml b/spring-zero-cli/samples/runner.xml
similarity index 100%
rename from spring-bootstrap-cli/samples/runner.xml
rename to spring-zero-cli/samples/runner.xml
diff --git a/spring-bootstrap-cli/samples/template.groovy b/spring-zero-cli/samples/template.groovy
similarity index 100%
rename from spring-bootstrap-cli/samples/template.groovy
rename to spring-zero-cli/samples/template.groovy
diff --git a/spring-bootstrap-cli/samples/ui.groovy b/spring-zero-cli/samples/ui.groovy
similarity index 100%
rename from spring-bootstrap-cli/samples/ui.groovy
rename to spring-zero-cli/samples/ui.groovy
diff --git a/spring-bootstrap-cli/samples/web.groovy b/spring-zero-cli/samples/web.groovy
similarity index 100%
rename from spring-bootstrap-cli/samples/web.groovy
rename to spring-zero-cli/samples/web.groovy
diff --git a/spring-bootstrap-cli/src/main/assembly/descriptor.xml b/spring-zero-cli/src/main/assembly/descriptor.xml
similarity index 100%
rename from spring-bootstrap-cli/src/main/assembly/descriptor.xml
rename to spring-zero-cli/src/main/assembly/descriptor.xml
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/Command.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/Command.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/Command.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/Command.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/AbstractCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/AbstractCommand.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/AbstractCommand.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/AbstractCommand.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/CleanCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/CleanCommand.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/CleanCommand.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/CleanCommand.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/CreateCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/CreateCommand.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/CreateCommand.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/CreateCommand.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/DefaultCommandFactory.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/DefaultCommandFactory.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/DefaultCommandFactory.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/DefaultCommandFactory.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionHandler.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionHandler.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionHandler.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionHandler.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionParsingCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionParsingCommand.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionParsingCommand.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionParsingCommand.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/RunCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/RunCommand.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/RunCommand.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/RunCommand.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCommand.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCommand.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCommand.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCompilationCustomizer.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCompilationCustomizer.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCompilationCustomizer.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCompilationCustomizer.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/VersionCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/VersionCommand.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/VersionCommand.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/VersionCommand.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/AstUtils.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/AstUtils.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/AstUtils.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/AstUtils.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/CompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/CompilerAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/CompilerAutoConfiguration.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/CompilerAutoConfiguration.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/DependencyCustomizer.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/DependencyCustomizer.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/DependencyCustomizer.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/DependencyCustomizer.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/ExtendedGroovyClassLoader.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/ExtendedGroovyClassLoader.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/ExtendedGroovyClassLoader.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/ExtendedGroovyClassLoader.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompiler.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompiler.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompiler.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompiler.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompilerConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompilerConfiguration.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompilerConfiguration.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompilerConfiguration.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java
similarity index 98%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java
index 3ddb15c904..d52990b7f7 100644
--- a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java
+++ b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java
@@ -40,8 +40,8 @@ public class SpringBootstrapCompilerAutoConfiguration extends CompilerAutoConfig
 	public void applyDependencies(DependencyCustomizer dependencies) {
 		dependencies.ifAnyMissingClasses(
 				"org.springframework.bootstrap.SpringApplication").add(
-				"org.springframework.bootstrap", "spring-bootstrap",
-				"0.5.0.BUILD-SNAPSHOT");
+				"org.springframework.zero", "spring-zero-autoconfigure",
+				"0.0.1.BUILD-SNAPSHOT");
 		dependencies.ifAnyResourcesPresent("logback.xml").add("ch.qos.logback",
 				"logback-classic", "1.0.7");
 		dependencies.ifNotAdded("cg.qos.logback", "logback-classic")
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunner.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunner.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunner.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunner.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunnerConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunnerConfiguration.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunnerConfiguration.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunnerConfiguration.java
diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/template/GroovyTemplate.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/template/GroovyTemplate.java
similarity index 100%
rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/template/GroovyTemplate.java
rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/template/GroovyTemplate.java
diff --git a/spring-bootstrap-cli/src/main/resources/.gitignore b/spring-zero-cli/src/main/resources/.gitignore
similarity index 100%
rename from spring-bootstrap-cli/src/main/resources/.gitignore
rename to spring-zero-cli/src/main/resources/.gitignore
diff --git a/spring-bootstrap-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.CommandFactory b/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.CommandFactory
similarity index 100%
rename from spring-bootstrap-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.CommandFactory
rename to spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.CommandFactory
diff --git a/spring-bootstrap-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration b/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration
similarity index 100%
rename from spring-bootstrap-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration
rename to spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration
diff --git a/spring-bootstrap-cli/src/main/scripts/spring b/spring-zero-cli/src/main/scripts/spring
similarity index 100%
rename from spring-bootstrap-cli/src/main/scripts/spring
rename to spring-zero-cli/src/main/scripts/spring
diff --git a/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java b/spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java
similarity index 100%
rename from spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java
rename to spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java
diff --git a/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java b/spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java
similarity index 100%
rename from spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java
rename to spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java
diff --git a/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/command/ScriptCommandTests.java b/spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/command/ScriptCommandTests.java
similarity index 100%
rename from spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/command/ScriptCommandTests.java
rename to spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/command/ScriptCommandTests.java
diff --git a/spring-bootstrap-cli/src/test/resources/commands/closure.groovy b/spring-zero-cli/src/test/resources/commands/closure.groovy
similarity index 100%
rename from spring-bootstrap-cli/src/test/resources/commands/closure.groovy
rename to spring-zero-cli/src/test/resources/commands/closure.groovy
diff --git a/spring-bootstrap-cli/src/test/resources/commands/command.groovy b/spring-zero-cli/src/test/resources/commands/command.groovy
similarity index 100%
rename from spring-bootstrap-cli/src/test/resources/commands/command.groovy
rename to spring-zero-cli/src/test/resources/commands/command.groovy
diff --git a/spring-bootstrap-cli/src/test/resources/commands/handler.groovy b/spring-zero-cli/src/test/resources/commands/handler.groovy
similarity index 100%
rename from spring-bootstrap-cli/src/test/resources/commands/handler.groovy
rename to spring-zero-cli/src/test/resources/commands/handler.groovy
diff --git a/spring-bootstrap-cli/src/test/resources/commands/mixin.groovy b/spring-zero-cli/src/test/resources/commands/mixin.groovy
similarity index 100%
rename from spring-bootstrap-cli/src/test/resources/commands/mixin.groovy
rename to spring-zero-cli/src/test/resources/commands/mixin.groovy
diff --git a/spring-bootstrap-cli/src/test/resources/commands/runnable.groovy b/spring-zero-cli/src/test/resources/commands/runnable.groovy
similarity index 100%
rename from spring-bootstrap-cli/src/test/resources/commands/runnable.groovy
rename to spring-zero-cli/src/test/resources/commands/runnable.groovy
diff --git a/spring-bootstrap-cli/src/test/resources/commands/script.groovy b/spring-zero-cli/src/test/resources/commands/script.groovy
similarity index 100%
rename from spring-bootstrap-cli/src/test/resources/commands/script.groovy
rename to spring-zero-cli/src/test/resources/commands/script.groovy
diff --git a/spring-bootstrap-cli/src/test/resources/commands/test.groovy b/spring-zero-cli/src/test/resources/commands/test.groovy
similarity index 100%
rename from spring-bootstrap-cli/src/test/resources/commands/test.groovy
rename to spring-zero-cli/src/test/resources/commands/test.groovy
diff --git a/spring-bootstrap-cli/src/test/resources/css/bootstrap.min.css b/spring-zero-cli/src/test/resources/css/bootstrap.min.css
similarity index 100%
rename from spring-bootstrap-cli/src/test/resources/css/bootstrap.min.css
rename to spring-zero-cli/src/test/resources/css/bootstrap.min.css
diff --git a/spring-bootstrap-cli/src/test/resources/log4j.properties b/spring-zero-cli/src/test/resources/log4j.properties
similarity index 100%
rename from spring-bootstrap-cli/src/test/resources/log4j.properties
rename to spring-zero-cli/src/test/resources/log4j.properties
diff --git a/spring-bootstrap-cli/src/test/resources/templates/home.html b/spring-zero-cli/src/test/resources/templates/home.html
similarity index 100%
rename from spring-bootstrap-cli/src/test/resources/templates/home.html
rename to spring-zero-cli/src/test/resources/templates/home.html
diff --git a/spring-bootstrap-cli/src/test/resources/templates/test.txt b/spring-zero-cli/src/test/resources/templates/test.txt
similarity index 100%
rename from spring-bootstrap-cli/src/test/resources/templates/test.txt
rename to spring-zero-cli/src/test/resources/templates/test.txt
diff --git a/spring-zero-core/pom.xml b/spring-zero-core/pom.xml
new file mode 100644
index 0000000000..0eeb3c4ab6
--- /dev/null
+++ b/spring-zero-core/pom.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero</artifactId>
+		<version>0.5.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-zero-core</artifactId>
+	<packaging>jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/..</main.basedir>
+	</properties>
+	<dependencies>
+		<!-- Compile -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
+		<!-- Optional -->
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-webapp</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<!-- Test -->
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-logging-juli</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/Banner.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/Banner.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/CommandLineRunner.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/CommandLineRunner.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/SpringApplication.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/SpringApplication.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParser.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParser.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AbstractOnBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AbstractOnBeanCondition.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AbstractOnBeanCondition.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AbstractOnBeanCondition.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBean.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBean.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBean.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBeanCondition.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBeanCondition.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBeanCondition.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionLogUtils.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionLogUtils.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionLogUtils.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionLogUtils.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnBean.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnBean.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnBean.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnClass.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnClass.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnClass.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnClass.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnExpression.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnExpression.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnExpression.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnExpression.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingBean.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingBean.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingBean.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingClass.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingClass.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingClass.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingClass.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnNotWebApplication.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnNotWebApplication.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnNotWebApplication.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnNotWebApplication.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnResource.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnResource.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnResource.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnResource.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnWebApplication.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnWebApplication.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnWebApplication.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnWebApplication.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationProperties.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationProperties.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationProperties.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationProperties.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationProperties.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationProperties.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationProperties.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationProperties.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesImportSelector.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesImportSelector.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesImportSelector.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesImportSelector.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnBeanCondition.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnBeanCondition.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnBeanCondition.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnClassCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnClassCondition.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnClassCondition.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnClassCondition.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnExpressionCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnExpressionCondition.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnExpressionCondition.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnExpressionCondition.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingBeanCondition.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingBeanCondition.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingBeanCondition.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingClassCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingClassCondition.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingClassCondition.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingClassCondition.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnNotWebApplicationCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnNotWebApplicationCondition.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnNotWebApplicationCondition.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnNotWebApplicationCondition.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnWebApplicationCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnWebApplicationCondition.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnWebApplicationCondition.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnWebApplicationCondition.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/PropertySourcesBindingPostProcessor.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/PropertySourcesBindingPostProcessor.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/PropertySourcesBindingPostProcessor.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/PropertySourcesBindingPostProcessor.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/properties/ServerProperties.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/properties/ServerProperties.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/properties/ServerProperties.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/properties/ServerProperties.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java
rename to spring-zero-core/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java
diff --git a/spring-zero-core/src/main/resources/META-INF/spring.factories b/spring-zero-core/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000000..03db1ac821
--- /dev/null
+++ b/spring-zero-core/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,7 @@
+# Application Context Initializers
+org.springframework.context.ApplicationContextInitializer=\
+org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer,\
+org.springframework.bootstrap.context.initializer.ContextIdApplicationContextInitializer,\
+org.springframework.bootstrap.context.initializer.EnvironmentDelegateApplicationContextInitializer,\
+org.springframework.bootstrap.context.initializer.LoggingApplicationContextInitializer,\
+org.springframework.bootstrap.context.initializer.VcapApplicationContextInitializer
diff --git a/spring-bootstrap/src/main/resources/favicon.ico b/spring-zero-core/src/main/resources/favicon.ico
similarity index 100%
rename from spring-bootstrap/src/main/resources/favicon.ico
rename to spring-zero-core/src/main/resources/favicon.ico
diff --git a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/log4j.properties b/spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/log4j.properties
similarity index 97%
rename from spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/log4j.properties
rename to spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/log4j.properties
index 710dcac51b..6442a1edf7 100644
--- a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/log4j.properties
+++ b/spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/log4j.properties
@@ -1,18 +1,18 @@
-log4j.rootCategory=INFO, CONSOLE, FILE
-
-PID=????
-catalina.base=/tmp
-LOG_PATH=${catalina.base}/logs
-LOG_FILE=${LOG_PATH}/service.log
-LOG_PATTERN=[%d{yyyy-MM-dd HH:mm:ss.SSS}] service%X{context} - ${PID} %5p [%t] --- %c{1}: %m%n
-
-# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=${LOG_PATTERN}
-
-log4j.appender.FILE=org.apache.log4j.RollingFileAppender
-log4j.appender.FILE.File=${LOG_FILE}
-log4j.appender.FILE.MaxFileSize=10MB
-log4j.appender.FILE.layout = org.apache.log4j.PatternLayout
-log4j.appender.FILE.layout.ConversionPattern=${LOG_PATTERN}
+log4j.rootCategory=INFO, CONSOLE, FILE
+
+PID=????
+catalina.base=/tmp
+LOG_PATH=${catalina.base}/logs
+LOG_FILE=${LOG_PATH}/service.log
+LOG_PATTERN=[%d{yyyy-MM-dd HH:mm:ss.SSS}] service%X{context} - ${PID} %5p [%t] --- %c{1}: %m%n
+
+# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=${LOG_PATTERN}
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.File=${LOG_FILE}
+log4j.appender.FILE.MaxFileSize=10MB
+log4j.appender.FILE.layout = org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=${LOG_PATTERN}
diff --git a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logback.xml b/spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logback.xml
similarity index 100%
rename from spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logback.xml
rename to spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logback.xml
diff --git a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logging.properties b/spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logging.properties
similarity index 87%
rename from spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logging.properties
rename to spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logging.properties
index 28f690be39..4dc44e89ef 100644
--- a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logging.properties
+++ b/spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logging.properties
@@ -1,9 +1,9 @@
-handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler
-.level = INFO
-
-# File Logging
-java.util.logging.FileHandler.pattern = %t/service.log
-java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
-java.util.logging.FileHandler.level = INFO
-java.util.logging.FileHandler.limit = 10485760
+handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+.level = INFO
+
+# File Logging
+java.util.logging.FileHandler.pattern = %t/service.log
+java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
+java.util.logging.FileHandler.level = INFO
+java.util.logging.FileHandler.limit = 10485760
 java.util.logging.FileHandler.count = 10
\ No newline at end of file
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/TestUtils.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/TestUtils.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlParserTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlParserTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlParserTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlParserTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/NotWebApplicationConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/NotWebApplicationConditionTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/NotWebApplicationConditionTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/NotWebApplicationConditionTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnBeanConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnBeanConditionTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnBeanConditionTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnBeanConditionTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnClassConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnClassConditionTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnClassConditionTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnClassConditionTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnExpressionConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnExpressionConditionTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnExpressionConditionTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnExpressionConditionTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingBeanConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingBeanConditionTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingBeanConditionTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingBeanConditionTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingClassConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingClassConditionTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingClassConditionTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingClassConditionTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/WebApplicationConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/WebApplicationConditionTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/WebApplicationConditionTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/WebApplicationConditionTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java
similarity index 99%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java
index 90d475dfb6..e240f3ca37 100644
--- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java
+++ b/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java
@@ -39,11 +39,12 @@ public class LoggingInitializerTests {
 	private LoggingApplicationContextInitializer initializer = new LoggingApplicationContextInitializer();
 
 	private PrintStream savedOutput;
+
 	private ByteArrayOutputStream output;
 
 	@Before
 	public void init() {
-		this.savedOutput = System.out;
+		this.savedOutput = System.err;
 		this.output = new ByteArrayOutputStream();
 		System.setOut(new PrintStream(this.output));
 	}
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/properties/ServerPropertiesTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/properties/ServerPropertiesTests.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/properties/ServerPropertiesTests.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/properties/ServerPropertiesTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java
similarity index 100%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java
rename to spring-zero-core/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java
diff --git a/spring-bootstrap/src/test/resources/application.properties b/spring-zero-core/src/test/resources/application.properties
similarity index 100%
rename from spring-bootstrap/src/test/resources/application.properties
rename to spring-zero-core/src/test/resources/application.properties
diff --git a/spring-bootstrap/src/test/resources/enableprofile-myprofile.properties b/spring-zero-core/src/test/resources/enableprofile-myprofile.properties
similarity index 100%
rename from spring-bootstrap/src/test/resources/enableprofile-myprofile.properties
rename to spring-zero-core/src/test/resources/enableprofile-myprofile.properties
diff --git a/spring-bootstrap/src/test/resources/enableprofile.properties b/spring-zero-core/src/test/resources/enableprofile.properties
similarity index 100%
rename from spring-bootstrap/src/test/resources/enableprofile.properties
rename to spring-zero-core/src/test/resources/enableprofile.properties
diff --git a/spring-bootstrap/src/test/resources/logback-nondefault.xml b/spring-zero-core/src/test/resources/logback-nondefault.xml
similarity index 100%
rename from spring-bootstrap/src/test/resources/logback-nondefault.xml
rename to spring-zero-core/src/test/resources/logback-nondefault.xml
diff --git a/spring-bootstrap/src/test/resources/logback-test.xml b/spring-zero-core/src/test/resources/logback-test.xml
similarity index 100%
rename from spring-bootstrap/src/test/resources/logback-test.xml
rename to spring-zero-core/src/test/resources/logback-test.xml
diff --git a/spring-bootstrap/src/test/resources/logging-nondefault.properties b/spring-zero-core/src/test/resources/logging-nondefault.properties
similarity index 55%
rename from spring-bootstrap/src/test/resources/logging-nondefault.properties
rename to spring-zero-core/src/test/resources/logging-nondefault.properties
index ec997fde4d..7aba690145 100644
--- a/spring-bootstrap/src/test/resources/logging-nondefault.properties
+++ b/spring-zero-core/src/test/resources/logging-nondefault.properties
@@ -1,3 +1,3 @@
-handlers = java.util.logging.ConsoleHandler
-.level = INFO
+handlers = java.util.logging.ConsoleHandler
+.level = INFO
 java.util.logging.ConsoleHandler.formatter = 
\ No newline at end of file
diff --git a/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/foo.xml b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/foo.xml
new file mode 100644
index 0000000000..735b571fc7
--- /dev/null
+++ b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/foo.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<bean id="foo" class="java.lang.String">
+		<constructor-arg value="foo" />
+	</bean>
+
+</beans>
diff --git a/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/testProperties.xml b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/testProperties.xml
new file mode 100644
index 0000000000..c04d85080c
--- /dev/null
+++ b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/testProperties.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<bean
+		id="org.springframework.bootstrap.context.annotation.EnableConfigurationPropertiesTests$TestProperties"
+		class="org.springframework.bootstrap.context.annotation.EnableConfigurationPropertiesTests$TestProperties">
+		<property name="name" value="bar"/>
+	</bean>
+
+</beans>
diff --git a/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties
new file mode 100644
index 0000000000..eb99d1fa07
--- /dev/null
+++ b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties
@@ -0,0 +1 @@
+port=8081
diff --git a/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
new file mode 100644
index 0000000000..c4a4d1737a
--- /dev/null
+++ b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<bean name="servletContainerFactory"
+		class="org.springframework.bootstrap.context.embedded.MockEmbeddedServletContainerFactory" />
+
+	<bean name="servlet" class="org.springframework.bootstrap.context.embedded.MockServlet"/>
+
+</beans>
diff --git a/spring-zero-core/src/test/resources/org/springframework/bootstrap/sample-beans.xml b/spring-zero-core/src/test/resources/org/springframework/bootstrap/sample-beans.xml
new file mode 100644
index 0000000000..3658eb1274
--- /dev/null
+++ b/spring-zero-core/src/test/resources/org/springframework/bootstrap/sample-beans.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<bean id="myXmlComponent" class="org.springframework.bootstrap.sampleconfig.MyComponent"/>
+</beans>
diff --git a/spring-bootstrap/src/test/resources/specificfile-specificprofile.properties b/spring-zero-core/src/test/resources/specificfile-specificprofile.properties
similarity index 100%
rename from spring-bootstrap/src/test/resources/specificfile-specificprofile.properties
rename to spring-zero-core/src/test/resources/specificfile-specificprofile.properties
diff --git a/spring-bootstrap/src/test/resources/specificlocation.properties b/spring-zero-core/src/test/resources/specificlocation.properties
similarity index 100%
rename from spring-bootstrap/src/test/resources/specificlocation.properties
rename to spring-zero-core/src/test/resources/specificlocation.properties
diff --git a/spring-bootstrap/src/test/resources/testprofiles.yml b/spring-zero-core/src/test/resources/testprofiles.yml
similarity index 100%
rename from spring-bootstrap/src/test/resources/testprofiles.yml
rename to spring-zero-core/src/test/resources/testprofiles.yml
diff --git a/spring-bootstrap/src/test/resources/testproperties.properties b/spring-zero-core/src/test/resources/testproperties.properties
similarity index 100%
rename from spring-bootstrap/src/test/resources/testproperties.properties
rename to spring-zero-core/src/test/resources/testproperties.properties
diff --git a/spring-bootstrap/src/test/resources/testsetprofiles.yml b/spring-zero-core/src/test/resources/testsetprofiles.yml
similarity index 100%
rename from spring-bootstrap/src/test/resources/testsetprofiles.yml
rename to spring-zero-core/src/test/resources/testsetprofiles.yml
diff --git a/spring-bootstrap/src/test/resources/testyaml.yml b/spring-zero-core/src/test/resources/testyaml.yml
similarity index 100%
rename from spring-bootstrap/src/test/resources/testyaml.yml
rename to spring-zero-core/src/test/resources/testyaml.yml
diff --git a/spring-zero-intergration-tests/build.log b/spring-zero-intergration-tests/build.log
new file mode 100644
index 0000000000..1ca3e48a12
--- /dev/null
+++ b/spring-zero-intergration-tests/build.log
@@ -0,0 +1,495 @@
+[INFO] Scanning for projects...
+[INFO]                                                                         
+[INFO] ------------------------------------------------------------------------
+[INFO] Building spring-zero-integration-tests 0.0.1.BUILD-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.9/maven-javadoc-plugin-2.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.9/maven-javadoc-plugin-2.9.pom (16 KB at 1369.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-plugins/23/maven-plugins-23.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-plugins/23/maven-plugins-23.pom (9 KB at 2994.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/22/maven-parent-22.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/22/maven-parent-22.pom (30 KB at 4841.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/11/apache-11.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/11/apache-11.pom (15 KB at 3616.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.9/maven-javadoc-plugin-2.9.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.9/maven-javadoc-plugin-2.9.jar (354 KB at 8044.9 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-source-plugin/2.2.1/maven-source-plugin-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-source-plugin/2.2.1/maven-source-plugin-2.2.1.pom (7 KB at 2171.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-source-plugin/2.2.1/maven-source-plugin-2.2.1.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-source-plugin/2.2.1/maven-source-plugin-2.2.1.jar (30 KB at 5863.9 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-invoker-plugin/1.8/maven-invoker-plugin-1.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-invoker-plugin/1.8/maven-invoker-plugin-1.8.pom (13 KB at 4156.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-invoker-plugin/1.8/maven-invoker-plugin-1.8.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-invoker-plugin/1.8/maven-invoker-plugin-1.8.jar (103 KB at 7913.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.pom (3 KB at 941.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom (4 KB at 1969.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/sonatype/spice/spice-parent/16/spice-parent-16.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/sonatype/spice/spice-parent/16/spice-parent-16.pom (9 KB at 4081.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/sonatype/forge/forge-parent/5/forge-parent-5.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/sonatype/forge/forge-parent/5/forge-parent-5.pom (9 KB at 2722.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom (6 KB at 2513.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom (9 KB at 2919.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom (2 KB at 770.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.0.6/maven-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.0.6/maven-2.0.6.pom (9 KB at 4417.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/5/maven-parent-5.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/5/maven-parent-5.pom (15 KB at 4960.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/3/apache-3.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/3/apache-3.pom (4 KB at 1674.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom (2 KB at 1864.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom (3 KB at 1487.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom (7 KB at 6553.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom (2 KB at 977.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom (4 KB at 1928.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom (492 B at 480.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom (6 KB at 2801.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/junit/junit/4.11/junit-4.11.pom
+Downloaded: file:///Users/pwebb/.m2/repository/junit/junit/4.11/junit-4.11.pom (3 KB at 2289.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom (766 B at 748.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom (2 KB at 1925.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom (7 KB at 3347.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom (4 KB at 1527.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.pom (637 B at 311.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom (2 KB at 1734.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom (6 KB at 2872.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/4/maven-parent-4.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/4/maven-parent-4.pom (10 KB at 4880.9 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom (680 B at 664.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom (2 KB at 1866.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.pom (2 KB at 1334.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.pom (845 B at 412.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom
+Downloaded: file:///Users/pwebb/.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom (2 KB at 638.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom (3 KB at 1098.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom (2 KB at 1710.9 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom (2 KB at 1405.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom (424 B at 414.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom (4 KB at 1910.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom (2 KB at 1933.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom (2 KB at 1806.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom (2 KB at 832.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom (3 KB at 2575.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom (3 KB at 2560.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom (2 KB at 1900.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.pom (3 KB at 2055.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom (2 KB at 710.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.pom (2 KB at 1424.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.pom (851 B at 415.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom (7 KB at 6924.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-7/plexus-container-default-1.0-alpha-7.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-7/plexus-container-default-1.0-alpha-7.pom (2 KB at 1258.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/plexus/plexus-containers/1.0.2/plexus-containers-1.0.2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/plexus/plexus-containers/1.0.2/plexus-containers-1.0.2.pom (471 B at 230.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/plexus/plexus-root/1.0.3/plexus-root-1.0.3.pom
+Downloaded: file:///Users/pwebb/.m2/repository/plexus/plexus-root/1.0.3/plexus-root-1.0.3.pom (6 KB at 2939.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.pom (740 B at 361.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom (2 KB at 1970.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom (2 KB at 1224.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.pom (2 KB at 846.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom
+Downloaded: file:///Users/pwebb/.m2/repository/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom (965 B at 942.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/classworlds/classworlds/1.1/classworlds-1.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/classworlds/classworlds/1.1/classworlds-1.1.pom (4 KB at 3246.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom (3 KB at 2743.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom (4 KB at 3971.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom (2 KB at 1692.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom (1018 B at 994.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.7/plexus-utils-3.0.7.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.7/plexus-utils-3.0.7.pom (3 KB at 2453.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.pom (2 KB at 1417.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom (481 B at 469.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom (6 KB at 5739.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/objenesis/objenesis/1.0/objenesis-1.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/objenesis/objenesis/1.0/objenesis-1.0.pom (853 B at 833.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.pom (820 B at 800.8 KB/sec)
+[INFO] 
+[INFO] --- maven-javadoc-plugin:2.9:jar (attach-javadocs) @ spring-zero-integration-tests ---
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-core/2.2.1/maven-core-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-core/2.2.1/maven-core-2.2.1.pom (12 KB at 11360.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.2.1/maven-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.2.1/maven-2.2.1.pom (22 KB at 10941.9 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/11/maven-parent-11.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/11/maven-parent-11.pom (32 KB at 15824.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/5/apache-5.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/5/apache-5.pom (5 KB at 2000.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.pom (3 KB at 2127.9 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom (4 KB at 1582.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom (7 KB at 3344.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom (12 KB at 11337.9 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom (889 B at 868.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom (6 KB at 5705.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/junit/junit/3.8.1/junit-3.8.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/junit/junit/3.8.1/junit-3.8.1.pom (998 B at 974.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.2.1/maven-plugin-parameter-documenter-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.2.1/maven-plugin-parameter-documenter-2.2.1.pom (2 KB at 1911.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.pom (2 KB at 1853.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-parent/1.5.6/slf4j-parent-1.5.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-parent/1.5.6/slf4j-parent-1.5.6.pom (8 KB at 3867.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.pom (3 KB at 2914.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.pom (3 KB at 2118.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.2.1/maven-reporting-api-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.2.1/maven-reporting-api-2.2.1.pom (2 KB at 904.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting/2.2.1/maven-reporting-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting/2.2.1/maven-reporting-2.2.1.pom (2 KB at 1409.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.1/doxia-sink-api-1.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.1/doxia-sink-api-1.1.pom (2 KB at 995.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia/1.1/doxia-1.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia/1.1/doxia-1.1.pom (15 KB at 14822.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-logging-api/1.1/doxia-logging-api-1.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-logging-api/1.1/doxia-logging-api-1.1.pom (2 KB at 1538.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom (4 KB at 3395.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom (2 KB at 1849.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom (3 KB at 2211.9 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom (4 KB at 3147.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom (9 KB at 8056.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.pom (3 KB at 2120.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom (2 KB at 772.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.pom (2 KB at 1827.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.pom (2 KB at 1668.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.pom (3 KB at 1354.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.pom (4 KB at 1515.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom (880 B at 429.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.pom (2 KB at 1883.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.2/commons-cli-1.2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.2/commons-cli-1.2.pom (8 KB at 3896.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/11/commons-parent-11.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/11/commons-parent-11.pom (25 KB at 12035.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/4/apache-4.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/4/apache-4.pom (5 KB at 4389.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom (2 KB at 712.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1.pom (3 KB at 2015.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-monitor/2.2.1/maven-monitor-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-monitor/2.2.1/maven-monitor-2.2.1.pom (2 KB at 1227.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-toolchain/2.2.1/maven-toolchain-2.2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-toolchain/2.2.1/maven-toolchain-2.2.1.pom (4 KB at 3265.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom (3 KB at 2317.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom (10 KB at 9118.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/16/maven-parent-16.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/16/maven-parent-16.pom (23 KB at 22726.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/7/apache-7.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/7/apache-7.pom (15 KB at 14091.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom (2 KB at 1354.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom (10 KB at 9418.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/10/maven-parent-10.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/10/maven-parent-10.pom (31 KB at 15446.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom (6 KB at 5641.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom (4 KB at 3418.9 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/8/maven-parent-8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/8/maven-parent-8.pom (24 KB at 23567.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom (6 KB at 5177.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom (10 KB at 9570.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom (4 KB at 1807.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom (10 KB at 4559.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/13/maven-parent-13.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/13/maven-parent-13.pom (23 KB at 22103.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/6/apache-6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/6/apache-6.pom (13 KB at 12496.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom (2 KB at 1581.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.0.8/maven-2.0.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.0.8/maven-2.0.8.pom (12 KB at 11811.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/6/maven-parent-6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/6/maven-parent-6.pom (20 KB at 19576.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom (3 KB at 2211.9 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom (4 KB at 1533.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom (3 KB at 2646.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom (3 KB at 2009.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom (2 KB at 1989.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom (3 KB at 2636.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom (2 KB at 1856.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom (2 KB at 1952.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom (2 KB at 1459.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom (2 KB at 1207.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom (3 KB at 2242.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom (5 KB at 4323.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom (10 KB at 9361.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom (3 KB at 1169.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom (8 KB at 3937.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom (2 KB at 1034.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom (3 KB at 2932.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom (2 KB at 955.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom (3 KB at 1460.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom (2 KB at 263.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom (2 KB at 1009.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom (8 KB at 7060.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom (3 KB at 1158.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom (8 KB at 7500.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/velocity/velocity/1.5/velocity-1.5.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/velocity/velocity/1.5/velocity-1.5.pom (8 KB at 3791.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.pom (6 KB at 2970.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.pom (10 KB at 9695.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/oro/oro/2.0.8/oro-2.0.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/oro/oro/2.0.8/oro-2.0.8.pom (140 B at 136.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom (4 KB at 3080.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.pom (11 KB at 10775.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom (3 KB at 2200.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom (3 KB at 2337.9 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom (3 KB at 1314.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom (3 KB at 1094.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom (2 KB at 1561.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom (2 KB at 1718.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom (13 KB at 12095.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom (2 KB at 1913.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.pom
+Downloaded: file:///Users/pwebb/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.pom (14 KB at 13648.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/9/commons-parent-9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/9/commons-parent-9.pom (22 KB at 21416.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-io/commons-io/2.2/commons-io-2.2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/commons-io/commons-io/2.2/commons-io-2.2.pom (11 KB at 10775.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/24/commons-parent-24.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/24/commons-parent-24.pom (47 KB at 46157.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/9/apache-9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/9/apache-9.pom (15 KB at 7402.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom (8 KB at 3790.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom
+Downloaded: file:///Users/pwebb/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom (6 KB at 5140.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.pom (4 KB at 3735.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom (18 KB at 17934.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/5/commons-parent-5.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/5/commons-parent-5.pom (16 KB at 7832.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.pom
+Downloaded: file:///Users/pwebb/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.pom (3 KB at 1159.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom
+Downloaded: file:///Users/pwebb/.m2/repository/com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom (19 KB at 18120.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-archiver/2.1.2/plexus-archiver-2.1.2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-archiver/2.1.2/plexus-archiver-2.1.2.pom (4 KB at 17.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.2/plexus-utils-3.0.2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.2/plexus-utils-3.0.2.pom (3 KB at 817.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.5/plexus-utils-3.0.5.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.5/plexus-utils-3.0.5.pom (3 KB at 1226.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.jar
+Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar
+Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.jar
+Downloading: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.2/commons-cli-1.2.jar
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.jar (9 KB at 4304.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar (22 KB at 10907.2 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar (14 KB at 6546.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.jar (17 KB at 8165.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar
+Downloaded: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.2/commons-cli-1.2.jar (41 KB at 13386.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar (11 KB at 5341.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar (28 KB at 13809.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.jar (50 KB at 16580.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar (31 KB at 15165.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar (10 KB at 4918.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar (11 KB at 5131.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/velocity/velocity/1.5/velocity-1.5.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar (46 KB at 22713.4 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar (54 KB at 26831.1 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar (8 KB at 7488.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar
+Downloading: file:///Users/pwebb/.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar (48 KB at 11959.5 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar (64 KB at 15932.9 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar (324 KB at 35993.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar (19 KB at 18110.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar (28 KB at 13572.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar (46 KB at 15324.9 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-io/commons-io/2.2/commons-io-2.2.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar (22 KB at 10647.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/velocity/velocity/1.5/velocity-1.5.jar (383 KB at 34812.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.jar
+Downloaded: file:///Users/pwebb/.m2/repository/commons-io/commons-io/2.2/commons-io-2.2.jar (170 KB at 33903.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar
+Downloaded: file:///Users/pwebb/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.jar (30 KB at 9793.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar
+Downloaded: file:///Users/pwebb/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar (256 KB at 36524.7 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar
+Downloaded: file:///Users/pwebb/.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar (558 KB at 37191.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar
+Downloaded: file:///Users/pwebb/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar (60 KB at 9877.3 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar (298 KB at 29785.3 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-archiver/2.1.2/plexus-archiver-2.1.2.jar
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.5/plexus-utils-3.0.5.jar
+Downloaded: file:///Users/pwebb/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar (119 KB at 29558.1 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar (176 KB at 29251.5 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar (359 KB at 39870.2 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-archiver/2.1.2/plexus-archiver-2.1.2.jar (181 KB at 30087.2 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.5/plexus-utils-3.0.5.jar (226 KB at 32149.4 KB/sec)
+[INFO] Not executing Javadoc as the project is not a Java classpath-capable package
+[INFO] 
+[INFO] --- maven-source-plugin:2.2.1:jar-no-fork (attach-sources) @ spring-zero-integration-tests ---
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom (4 KB at 1533.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.0.9/maven-2.0.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.0.9/maven-2.0.9.pom (19 KB at 18463.9 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom (3 KB at 2242.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom (2 KB at 1581.1 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom (2 KB at 1459.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom (3 KB at 2646.5 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom (3 KB at 2009.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom (3 KB at 1001.0 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom (3 KB at 1318.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom (2 KB at 1856.4 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom (2 KB at 1924.8 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom (4 KB at 1534.2 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/3.2/plexus-3.2.pom
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/3.2/plexus-3.2.pom (19 KB at 18306.6 KB/sec)
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar
+Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar
+Downloading: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar
+Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.jar
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar (6 KB at 2898.4 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar (10 KB at 4854.0 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar (30 KB at 14705.6 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar (60 KB at 19685.5 KB/sec)
+Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.jar (227 KB at 37731.4 KB/sec)
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESS
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 2.704s
+[INFO] Finished at: Wed Jul 03 13:00:17 PDT 2013
+[INFO] Final Memory: 15M/355M
+[INFO] ------------------------------------------------------------------------
diff --git a/spring-zero-intergration-tests/pom.xml b/spring-zero-intergration-tests/pom.xml
new file mode 100644
index 0000000000..f58ee26e26
--- /dev/null
+++ b/spring-zero-intergration-tests/pom.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero</artifactId>
+		<version>0.5.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-zero-integration-tests</artifactId>
+	<packaging>pom</packaging>
+	<properties>
+		<main.basedir>${basedir}/..</main.basedir>
+	</properties>
+	<dependencies>
+		<!-- Ensure other reactor projects are build before running integration tests -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-actuator</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-autoconfigure</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-cli</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-launcher</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-maven-plugin</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-starter</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-starter-actuator</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-starter-batch</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-starter-data-jpa</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-starter-integration</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-starter-security</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-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 -->
+				<artifactId>maven-invoker-plugin</artifactId>
+				<configuration>
+					<settingsFile>src/it/settings.xml</settingsFile>
+					<projectsDirectory>${project.parent.basedir}/spring-zero-samples/</projectsDirectory>
+					<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+				</configuration>
+				<executions>
+					<execution>
+						<id>integration-test</id>
+						<phase>install</phase>
+						<goals>
+							<goal>install</goal>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/spring-bootstrap-maven-plugin/src/it/settings.xml b/spring-zero-intergration-tests/src/it/settings.xml
similarity index 100%
rename from spring-bootstrap-maven-plugin/src/it/settings.xml
rename to spring-zero-intergration-tests/src/it/settings.xml
diff --git a/spring-bootstrap-launcher/pom.xml b/spring-zero-launcher/pom.xml
similarity index 65%
rename from spring-bootstrap-launcher/pom.xml
rename to spring-zero-launcher/pom.xml
index 95891143ba..10651bba2a 100644
--- a/spring-bootstrap-launcher/pom.xml
+++ b/spring-zero-launcher/pom.xml
@@ -3,10 +3,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-parent</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-launcher</artifactId>
+	<artifactId>spring-zero-launcher</artifactId>
 	<packaging>jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/..</main.basedir>
+	</properties>
 </project>
diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/JarLauncher.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/JarLauncher.java
similarity index 100%
rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/JarLauncher.java
rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/JarLauncher.java
diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java
similarity index 100%
rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java
rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java
diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/MainMethodRunner.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/MainMethodRunner.java
similarity index 100%
rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/MainMethodRunner.java
rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/MainMethodRunner.java
diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/WarLauncher.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/WarLauncher.java
similarity index 100%
rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/WarLauncher.java
rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/WarLauncher.java
diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessData.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessData.java
similarity index 100%
rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessData.java
rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessData.java
diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFile.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFile.java
similarity index 100%
rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFile.java
rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFile.java
diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/data/package-info.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/package-info.java
similarity index 100%
rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/data/package-info.java
rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/package-info.java
diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/JarEntryFilter.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/JarEntryFilter.java
similarity index 100%
rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/JarEntryFilter.java
rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/JarEntryFilter.java
diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipEntry.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipEntry.java
similarity index 100%
rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipEntry.java
rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipEntry.java
diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStream.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStream.java
similarity index 100%
rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStream.java
rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStream.java
diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFile.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFile.java
similarity index 100%
rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFile.java
rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFile.java
diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/package-info.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/package-info.java
similarity index 100%
rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/package-info.java
rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/package-info.java
diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/package-info.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/package-info.java
similarity index 100%
rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/package-info.java
rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/package-info.java
diff --git a/spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/ByteArrayStartsWith.java b/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/ByteArrayStartsWith.java
similarity index 100%
rename from spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/ByteArrayStartsWith.java
rename to spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/ByteArrayStartsWith.java
diff --git a/spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFileTest.java b/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFileTest.java
similarity index 100%
rename from spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFileTest.java
rename to spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFileTest.java
diff --git a/spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStreamTest.java b/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStreamTest.java
similarity index 100%
rename from spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStreamTest.java
rename to spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStreamTest.java
diff --git a/spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java b/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java
similarity index 100%
rename from spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java
rename to spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java
diff --git a/spring-bootstrap-maven-plugin/pom.xml b/spring-zero-maven-plugin/pom.xml
similarity index 83%
rename from spring-bootstrap-maven-plugin/pom.xml
rename to spring-zero-maven-plugin/pom.xml
index 0b8b26b36f..e47d5de482 100644
--- a/spring-bootstrap-maven-plugin/pom.xml
+++ b/spring-zero-maven-plugin/pom.xml
@@ -3,15 +3,93 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-parent</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-maven-plugin</artifactId>
+	<artifactId>spring-zero-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
 	<properties>
-		<mavenVersion>3.0.5</mavenVersion>
+		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
+	<dependencies>
+		<!-- Compile -->
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-archiver</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-artifact</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-model</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-plugin-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-settings</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-archiver</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-container-default</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-component-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm</artifactId>
+		</dependency>
+		<!-- Optional -->
+		<dependency>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-shade-plugin</artifactId>
+			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<artifactId>asm</artifactId>
+					<groupId>asm</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>asm-commons</artifactId>
+					<groupId>asm</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- Provided -->
+		<dependency>
+			<groupId>org.apache.maven.plugin-tools</groupId>
+			<artifactId>maven-plugin-annotations</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<!-- Test -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-launcher</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
@@ -69,73 +147,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-plugin-api</artifactId>
-			<version>${mavenVersion}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-artifact</artifactId>
-			<version>${mavenVersion}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-model</artifactId>
-			<version>${mavenVersion}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-core</artifactId>
-			<version>${mavenVersion}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-settings</artifactId>
-			<version>${mavenVersion}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugin-tools</groupId>
-			<artifactId>maven-plugin-annotations</artifactId>
-			<version>3.2</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-archiver</artifactId>
-			<version>2.5</version>
-		</dependency>
-		<dependency>
-			<groupId>org.ow2.asm</groupId>
-			<artifactId>asm</artifactId>
-			<version>4.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-archiver</artifactId>
-			<version>2.2</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.codehaus.plexus</groupId>
-					<artifactId>plexus-container-default</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.codehaus.plexus</groupId>
-					<artifactId>plexus-component-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-utils</artifactId>
-			<version>3.0.10</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap-launcher</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
 </project>
diff --git a/spring-bootstrap-maven-plugin/src/it/executable-jar/pom.xml b/spring-zero-maven-plugin/src/it/executable-jar/pom.xml
similarity index 94%
rename from spring-bootstrap-maven-plugin/src/it/executable-jar/pom.xml
rename to spring-zero-maven-plugin/src/it/executable-jar/pom.xml
index 4e93230ef8..b3795bc817 100644
--- a/spring-bootstrap-maven-plugin/src/it/executable-jar/pom.xml
+++ b/spring-zero-maven-plugin/src/it/executable-jar/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.bootstrap.maven.it</groupId>
+	<groupId>org.springframework.zero.maven.it</groupId>
 	<artifactId>executable-jar</artifactId>
 	<version>0.0.1.BUILD-SNAPSHOT</version>
 	<packaging>executable-jar</packaging>
diff --git a/spring-bootstrap-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java b/spring-zero-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java
similarity index 100%
rename from spring-bootstrap-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java
rename to spring-zero-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java
diff --git a/spring-bootstrap-maven-plugin/src/it/executable-jar/verify.groovy b/spring-zero-maven-plugin/src/it/executable-jar/verify.groovy
similarity index 100%
rename from spring-bootstrap-maven-plugin/src/it/executable-jar/verify.groovy
rename to spring-zero-maven-plugin/src/it/executable-jar/verify.groovy
diff --git a/spring-bootstrap-maven-plugin/src/it/executable-war/pom.xml b/spring-zero-maven-plugin/src/it/executable-war/pom.xml
similarity index 94%
rename from spring-bootstrap-maven-plugin/src/it/executable-war/pom.xml
rename to spring-zero-maven-plugin/src/it/executable-war/pom.xml
index 99a9639a92..efc70508cd 100644
--- a/spring-bootstrap-maven-plugin/src/it/executable-war/pom.xml
+++ b/spring-zero-maven-plugin/src/it/executable-war/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.bootstrap.maven.it</groupId>
+	<groupId>org.springframework.zero.maven.it</groupId>
 	<artifactId>executable-war</artifactId>
 	<version>0.0.1.BUILD-SNAPSHOT</version>
 	<packaging>executable-war</packaging>
diff --git a/spring-bootstrap-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java b/spring-zero-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java
similarity index 100%
rename from spring-bootstrap-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java
rename to spring-zero-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java
diff --git a/spring-bootstrap-maven-plugin/src/it/executable-war/src/main/webapp/index.html b/spring-zero-maven-plugin/src/it/executable-war/src/main/webapp/index.html
similarity index 100%
rename from spring-bootstrap-maven-plugin/src/it/executable-war/src/main/webapp/index.html
rename to spring-zero-maven-plugin/src/it/executable-war/src/main/webapp/index.html
diff --git a/spring-bootstrap-maven-plugin/src/it/executable-war/verify.groovy b/spring-zero-maven-plugin/src/it/executable-war/verify.groovy
similarity index 100%
rename from spring-bootstrap-maven-plugin/src/it/executable-war/verify.groovy
rename to spring-zero-maven-plugin/src/it/executable-war/verify.groovy
diff --git a/spring-zero-maven-plugin/src/it/settings.xml b/spring-zero-maven-plugin/src/it/settings.xml
new file mode 100644
index 0000000000..e1e0ace341
--- /dev/null
+++ b/spring-zero-maven-plugin/src/it/settings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+	<profiles>
+		<profile>
+			<id>it-repo</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<repositories>
+				<repository>
+					<id>local.central</id>
+					<url>@localRepositoryUrl@</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+			<pluginRepositories>
+				<pluginRepository>
+					<id>local.central</id>
+					<url>@localRepositoryUrl@</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</pluginRepository>
+			</pluginRepositories>
+		</profile>
+	</profiles>
+</settings>
diff --git a/spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java b/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java
similarity index 99%
rename from spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java
rename to spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java
index 496850790e..2208db57bb 100644
--- a/spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java
+++ b/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java
@@ -289,7 +289,7 @@ public abstract class AbstractExecutableArchiveMojo extends AbstractMojo {
 
 			String version = getClass().getPackage().getImplementationVersion();
 			DefaultArtifact artifact = new DefaultArtifact(
-					"org.springframework.bootstrap:spring-bootstrap-launcher:" + version);
+					"org.springframework.zero:spring-zero-launcher:" + version);
 			ArtifactDescriptorRequest descriptorRequest = new ArtifactDescriptorRequest(
 					artifact, repositories, "plugin");
 			ArtifactDescriptorResult descriptorResult = this.repositorySystem
diff --git a/spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableJarMojo.java b/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableJarMojo.java
similarity index 100%
rename from spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableJarMojo.java
rename to spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableJarMojo.java
diff --git a/spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableWarMojo.java b/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableWarMojo.java
similarity index 100%
rename from spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableWarMojo.java
rename to spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableWarMojo.java
diff --git a/spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/MainClassFinder.java b/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/MainClassFinder.java
similarity index 100%
rename from spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/MainClassFinder.java
rename to spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/MainClassFinder.java
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformer.java b/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformer.java
similarity index 100%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformer.java
rename to spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformer.java
diff --git a/spring-bootstrap-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/spring-zero-maven-plugin/src/main/resources/META-INF/plexus/components.xml
similarity index 93%
rename from spring-bootstrap-maven-plugin/src/main/resources/META-INF/plexus/components.xml
rename to spring-zero-maven-plugin/src/main/resources/META-INF/plexus/components.xml
index 8ed12cc6f9..f24d528037 100644
--- a/spring-bootstrap-maven-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/spring-zero-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.bootstrap:spring-bootstrap-maven-plugin:executable-jar</package>
+							<package>org.springframework.zero:spring-zero-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.bootstrap:spring-bootstrap-maven-plugin:executable-war</package>
+							<package>org.springframework.zero:spring-zero-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-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/MainClassFinderTests.java b/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/MainClassFinderTests.java
similarity index 100%
rename from spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/MainClassFinderTests.java
rename to spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/MainClassFinderTests.java
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java b/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java
similarity index 84%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java
rename to spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java
index abbdf82bb1..f72ea7e4ce 100644
--- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java
+++ b/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java
@@ -16,11 +16,11 @@
 
 package org.springframework.bootstrap.maven;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.jar.JarOutputStream;
 
 import org.junit.Test;
-import org.springframework.core.io.ByteArrayResource;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -38,16 +38,16 @@ public class PropertiesMergingResourceTransformerTests {
 	public void testProcess() throws Exception {
 		assertFalse(this.transformer.hasTransformedResource());
 		this.transformer.processResource("foo",
-				new ByteArrayResource("foo=bar".getBytes()).getInputStream(), null);
+				new ByteArrayInputStream("foo=bar".getBytes()), null);
 		assertTrue(this.transformer.hasTransformedResource());
 	}
 
 	@Test
 	public void testMerge() throws Exception {
 		this.transformer.processResource("foo",
-				new ByteArrayResource("foo=bar".getBytes()).getInputStream(), null);
+				new ByteArrayInputStream("foo=bar".getBytes()), null);
 		this.transformer.processResource("bar",
-				new ByteArrayResource("foo=spam".getBytes()).getInputStream(), null);
+				new ByteArrayInputStream("foo=spam".getBytes()), null);
 		assertEquals("bar,spam", this.transformer.getData().getProperty("foo"));
 	}
 
@@ -55,7 +55,7 @@ public class PropertiesMergingResourceTransformerTests {
 	public void testOutput() throws Exception {
 		this.transformer.resource = "foo";
 		this.transformer.processResource("foo",
-				new ByteArrayResource("foo=bar".getBytes()).getInputStream(), null);
+				new ByteArrayInputStream("foo=bar".getBytes()), null);
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		JarOutputStream os = new JarOutputStream(out);
 		this.transformer.modifyOutputStream(os);
diff --git a/spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/Verify.java b/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/Verify.java
similarity index 100%
rename from spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/Verify.java
rename to spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/Verify.java
diff --git a/spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithMainMethod.java b/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithMainMethod.java
similarity index 100%
rename from spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithMainMethod.java
rename to spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithMainMethod.java
diff --git a/spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithoutMainMethod.java b/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithoutMainMethod.java
similarity index 100%
rename from spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithoutMainMethod.java
rename to spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithoutMainMethod.java
diff --git a/spring-zero-samples/pom.xml b/spring-zero-samples/pom.xml
new file mode 100644
index 0000000000..ca7263fd8b
--- /dev/null
+++ b/spring-zero-samples/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero</artifactId>
+		<version>0.5.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-zero-samples</artifactId>
+	<packaging>pom</packaging>
+	<properties>
+		<main.basedir>${basedir}/..</main.basedir>
+	</properties>
+	<modules>
+		<module>spring-zero-sample-actuator</module>
+		<module>spring-zero-sample-actuator-ui</module>
+		<module>spring-zero-sample-batch</module>
+		<module>spring-zero-sample-data-jpa</module>
+		<module>spring-zero-sample-integration</module>
+		<module>spring-zero-sample-jetty</module>
+		<module>spring-zero-sample-profile</module>
+		<module>spring-zero-sample-simple</module>
+		<module>spring-zero-sample-tomcat</module>
+		<module>spring-zero-sample-traditional</module>
+		<module>spring-zero-sample-web-ui</module>
+		<module>spring-zero-sample-xml</module>
+	</modules>
+</project>
diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml b/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml
new file mode 100644
index 0000000000..bfe4f4bf05
--- /dev/null
+++ b/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-samples</artifactId>
+		<version>0.5.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-zero-sample-actuator-ui</artifactId>
+	<packaging>executable-jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-starter-actuator</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-starter-web</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-javaconfig</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.thymeleaf</groupId>
+			<artifactId>thymeleaf-spring3</artifactId>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>spring-zero-maven-plugin</artifactId>
+				<version>${project.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplication.java
rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/resources/css/bootstrap.min.css b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/css/bootstrap.min.css
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/resources/css/bootstrap.min.css
rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/css/bootstrap.min.css
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/resources/templates/error.html b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/templates/error.html
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/resources/templates/error.html
rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/templates/error.html
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/resources/templates/home.html b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/templates/home.html
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/resources/templates/home.html
rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/templates/home.html
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/test/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/test/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/test/java/org/springframework/bootstrap/sample/ui/ManagementServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/bootstrap/sample/ui/ManagementServiceBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/test/java/org/springframework/bootstrap/sample/ui/ManagementServiceBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/bootstrap/sample/ui/ManagementServiceBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/test/resources/logging.properties b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/resources/logging.properties
similarity index 97%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/test/resources/logging.properties
rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/test/resources/logging.properties
index 5fc37e6974..a9c2c37837 100644
--- a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/test/resources/logging.properties
+++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/resources/logging.properties
@@ -1,7 +1,7 @@
-handlers = java.util.logging.ConsoleHandler
-.level = INFO
-
-java.util.logging.ConsoleHandler.level = FINE
-sun.net.www.protocol.http.HttpURLConnection.level = ALL
-org.springframework.bootstrap.context.annotation.level = ALL
-org.springframework.bootstrap.actuate.autoconfigure.level = ALL
+handlers = java.util.logging.ConsoleHandler
+.level = INFO
+
+java.util.logging.ConsoleHandler.level = FINE
+sun.net.www.protocol.http.HttpURLConnection.level = ALL
+org.springframework.bootstrap.context.annotation.level = ALL
+org.springframework.bootstrap.actuate.autoconfigure.level = ALL
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/pom.xml b/spring-zero-samples/spring-zero-sample-actuator/pom.xml
similarity index 77%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/pom.xml
rename to spring-zero-samples/spring-zero-sample-actuator/pom.xml
index 4c52dca7b6..84d62b3a20 100644
--- a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-actuator/pom.xml
@@ -3,15 +3,52 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-samples</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-samples</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-actuator-sample</artifactId>
-	<packaging>jar</packaging>
+	<artifactId>spring-zero-sample-actuator</artifactId>
+	<packaging>executable-jar</packaging>
 	<properties>
-		<start-class>org.springframework.bootstrap.sample.service.ServiceBootstrapApplication</start-class>
+		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-starter-actuator</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-javaconfig</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>spring-zero-maven-plugin</artifactId>
+				<version>${project.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 	<profiles>
 		<profile>
 			<id>tomcat</id>
@@ -86,27 +123,4 @@
 			</dependencies>
 		</profile>
 	</profiles>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap-actuator</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-javaconfig</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-web</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java
rename to spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java
rename to spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java
rename to spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java
rename to spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/resources/application.properties b/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/application.properties
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/resources/application.properties
rename to spring-zero-samples/spring-zero-sample-actuator/src/main/resources/application.properties
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/resources/logging.properties b/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logging.properties
similarity index 97%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/resources/logging.properties
rename to spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logging.properties
index a494d4cad7..3f4cf00025 100644
--- a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/resources/logging.properties
+++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logging.properties
@@ -1,7 +1,7 @@
-handlers = java.util.logging.ConsoleHandler
-.level = INFO
-
-#java.util.logging.ConsoleHandler.level = FINE
-#sun.net.www.protocol.http.HttpURLConnection.level = ALL
-#org.springframework.bootstrap.level = ALL
-#org.springframework.security.level = ALL
+handlers = java.util.logging.ConsoleHandler
+.level = INFO
+
+#java.util.logging.ConsoleHandler.level = FINE
+#sun.net.www.protocol.http.HttpURLConnection.level = ALL
+#org.springframework.bootstrap.level = ALL
+#org.springframework.security.level = ALL
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/EndpointsPropertiesServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/EndpointsPropertiesServiceBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/EndpointsPropertiesServiceBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/EndpointsPropertiesServiceBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ManagementAddressServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementAddressServiceBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ManagementAddressServiceBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementAddressServiceBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ManagementServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementServiceBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ManagementServiceBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementServiceBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/NoManagementServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/NoManagementServiceBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/NoManagementServiceBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/NoManagementServiceBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ServiceBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ServiceBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ServiceBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ShutdownServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ShutdownServiceBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ShutdownServiceBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ShutdownServiceBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/UnsecureServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/UnsecureServiceBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/UnsecureServiceBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/UnsecureServiceBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/start.groovy b/spring-zero-samples/spring-zero-sample-actuator/start.groovy
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/start.groovy
rename to spring-zero-samples/spring-zero-sample-actuator/start.groovy
diff --git a/spring-zero-samples/spring-zero-sample-batch/pom.xml b/spring-zero-samples/spring-zero-sample-batch/pom.xml
new file mode 100644
index 0000000000..b8baffbbdf
--- /dev/null
+++ b/spring-zero-samples/spring-zero-sample-batch/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-samples</artifactId>
+		<version>0.5.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-zero-sample-batch</artifactId>
+	<packaging>executable-jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-starter-batch</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>spring-zero-maven-plugin</artifactId>
+				<version>${project.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-batch-sample/src/main/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-batch-sample/src/main/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplication.java
rename to spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-batch-sample/src/test/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-batch-sample/src/test/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml b/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml
similarity index 51%
rename from spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml
rename to spring-zero-samples/spring-zero-sample-data-jpa/pom.xml
index 5fe21aa70a..af1f1fe468 100644
--- a/spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml
@@ -3,34 +3,40 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-samples</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-samples</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-batch-sample</artifactId>
+	<artifactId>spring-zero-sample-data-jpa</artifactId>
 	<packaging>executable-jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap</artifactId>
+			<artifactId>spring-zero-starter-data-jpa</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.batch</groupId>
-			<artifactId>spring-batch-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-starter-web</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>spring-zero-maven-plugin</artifactId>
+				<version>${project.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/DataBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/DataBootstrapApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/DataBootstrapApplication.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/DataBootstrapApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/City.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/City.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/City.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/City.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/Hotel.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Hotel.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/Hotel.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Hotel.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/HotelSummary.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/HotelSummary.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/HotelSummary.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/HotelSummary.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/Rating.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Rating.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/Rating.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Rating.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/RatingCount.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/RatingCount.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/RatingCount.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/RatingCount.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/Review.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Review.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/Review.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Review.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/ReviewDetails.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/ReviewDetails.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/ReviewDetails.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/ReviewDetails.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/TripType.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/TripType.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/TripType.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/TripType.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/CityRepository.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/CityRepository.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/CityRepository.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/CityRepository.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelRepository.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelRepository.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelRepository.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelRepository.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelSummaryRepository.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelSummaryRepository.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelSummaryRepository.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelSummaryRepository.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/ReviewRepository.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/ReviewRepository.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/ReviewRepository.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/ReviewRepository.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/service/CitySearchCriteria.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/CitySearchCriteria.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/service/CitySearchCriteria.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/CitySearchCriteria.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/service/CityService.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/CityService.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/service/CityService.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/CityService.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/service/HotelService.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/HotelService.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/service/HotelService.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/HotelService.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/service/ReviewsSummary.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/ReviewsSummary.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/service/ReviewsSummary.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/ReviewsSummary.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/service/impl/CityServiceImpl.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/impl/CityServiceImpl.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/service/impl/CityServiceImpl.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/impl/CityServiceImpl.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/service/impl/HotelServiceImpl.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/impl/HotelServiceImpl.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/service/impl/HotelServiceImpl.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/impl/HotelServiceImpl.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/web/SampleController.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/web/SampleController.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/web/SampleController.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/web/SampleController.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/resources/application.properties b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/application.properties
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/resources/application.properties
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/application.properties
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/resources/import.sql b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/import.sql
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/resources/import.sql
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/import.sql
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/test/java/org/springframework/bootstrap/sample/data/DataBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/bootstrap/sample/data/DataBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/test/java/org/springframework/bootstrap/sample/data/DataBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/bootstrap/sample/data/DataBootstrapApplicationTests.java
diff --git a/spring-zero-samples/spring-zero-sample-integration/pom.xml b/spring-zero-samples/spring-zero-sample-integration/pom.xml
new file mode 100644
index 0000000000..44b43bd46f
--- /dev/null
+++ b/spring-zero-samples/spring-zero-sample-integration/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-samples</artifactId>
+		<version>0.5.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-zero-sample-integration</artifactId>
+	<packaging>executable-jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.zero</groupId>
+			<artifactId>spring-zero-starter-integration</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>spring-zero-maven-plugin</artifactId>
+				<version>${project.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/HelloWorldService.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/HelloWorldService.java
rename to spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/HelloWorldService.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplication.java
rename to spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/SampleEndpoint.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/SampleEndpoint.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/SampleEndpoint.java
rename to spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/SampleEndpoint.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/ServiceProperties.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/ServiceProperties.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/ServiceProperties.java
rename to spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/ServiceProperties.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/resources/application.properties b/spring-zero-samples/spring-zero-sample-integration/src/main/resources/application.properties
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/resources/application.properties
rename to spring-zero-samples/spring-zero-sample-integration/src/main/resources/application.properties
diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/resources/integration-context.xml b/spring-zero-samples/spring-zero-sample-integration/src/main/resources/integration-context.xml
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/resources/integration-context.xml
rename to spring-zero-samples/spring-zero-sample-integration/src/main/resources/integration-context.xml
diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/resources/logback.xml b/spring-zero-samples/spring-zero-sample-integration/src/main/resources/logback.xml
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/resources/logback.xml
rename to spring-zero-samples/spring-zero-sample-integration/src/main/resources/logback.xml
diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/test/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/test/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/test/java/org/springframework/bootstrap/sample/producer/ProducerApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/producer/ProducerApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/test/java/org/springframework/bootstrap/sample/producer/ProducerApplication.java
rename to spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/producer/ProducerApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml b/spring-zero-samples/spring-zero-sample-jetty/pom.xml
similarity index 67%
rename from spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml
rename to spring-zero-samples/spring-zero-sample-jetty/pom.xml
index 07713f3bd0..eccf6b857e 100644
--- a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-jetty/pom.xml
@@ -3,22 +3,24 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-samples</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-samples</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-jetty-sample</artifactId>
+	<artifactId>spring-zero-sample-jetty</artifactId>
 	<packaging>executable-jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap</artifactId>
+			<artifactId>spring-zero-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<scope>runtime</scope>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
@@ -30,14 +32,20 @@
 			<artifactId>jetty-util</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>spring-zero-maven-plugin</artifactId>
+				<version>${project.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/main/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/main/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplication.java
rename to spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/main/java/org/springframework/bootstrap/sample/jetty/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/service/HelloWorldService.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/main/java/org/springframework/bootstrap/sample/jetty/service/HelloWorldService.java
rename to spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/service/HelloWorldService.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/main/java/org/springframework/bootstrap/sample/jetty/web/SampleController.java b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/web/SampleController.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/main/java/org/springframework/bootstrap/sample/jetty/web/SampleController.java
rename to spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/web/SampleController.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/test/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/test/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml b/spring-zero-samples/spring-zero-sample-profile/pom.xml
similarity index 56%
rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml
rename to spring-zero-samples/spring-zero-sample-profile/pom.xml
index 9ef9724ed5..46b40d65b5 100644
--- a/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-profile/pom.xml
@@ -3,27 +3,35 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-samples</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-samples</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-profile-sample</artifactId>
+	<artifactId>spring-zero-sample-profile</artifactId>
 	<packaging>executable-jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap</artifactId>
+			<artifactId>spring-zero-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>spring-zero-maven-plugin</artifactId>
+				<version>${project.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplication.java
rename to spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/java/org/springframework/bootstrap/sample/simple/service/GoodbyeWorldService.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/GoodbyeWorldService.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/java/org/springframework/bootstrap/sample/simple/service/GoodbyeWorldService.java
rename to spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/GoodbyeWorldService.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java
rename to spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/java/org/springframework/bootstrap/sample/simple/service/MessageService.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/MessageService.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/java/org/springframework/bootstrap/sample/simple/service/MessageService.java
rename to spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/MessageService.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/resources/application.yml b/spring-zero-samples/spring-zero-sample-profile/src/main/resources/application.yml
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/resources/application.yml
rename to spring-zero-samples/spring-zero-sample-profile/src/main/resources/application.yml
diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/src/test/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/src/test/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml b/spring-zero-samples/spring-zero-sample-simple/pom.xml
similarity index 51%
rename from spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml
rename to spring-zero-samples/spring-zero-sample-simple/pom.xml
index b9c5b9ece2..1457432890 100644
--- a/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-simple/pom.xml
@@ -3,22 +3,30 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-samples</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-samples</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-simple-sample</artifactId>
+	<artifactId>spring-zero-sample-simple</artifactId>
 	<packaging>executable-jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap</artifactId>
+			<artifactId>spring-zero-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>spring-zero-maven-plugin</artifactId>
+				<version>${project.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-simple-sample/src/main/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-simple-sample/src/main/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplication.java
rename to spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-simple-sample/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-simple-sample/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java
rename to spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-simple-sample/src/main/resources/application.properties b/spring-zero-samples/spring-zero-sample-simple/src/main/resources/application.properties
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-simple-sample/src/main/resources/application.properties
rename to spring-zero-samples/spring-zero-sample-simple/src/main/resources/application.properties
diff --git a/spring-bootstrap-samples/spring-bootstrap-simple-sample/src/test/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-simple-sample/src/test/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplicationTests.java
diff --git a/spring-bootstrap-starters/spring-bootstrap-web-starter/pom.xml b/spring-zero-samples/spring-zero-sample-tomcat/pom.xml
similarity index 58%
rename from spring-bootstrap-starters/spring-bootstrap-web-starter/pom.xml
rename to spring-zero-samples/spring-zero-sample-tomcat/pom.xml
index 93d3ac6e35..04935bf2bc 100644
--- a/spring-bootstrap-starters/spring-bootstrap-web-starter/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-tomcat/pom.xml
@@ -3,16 +3,19 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-starters</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-samples</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-web-starter</artifactId>
-	<packaging>jar</packaging>
+	<artifactId>spring-zero-sample-tomcat</artifactId>
+	<packaging>executable-jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap-starter</artifactId>
+			<artifactId>spring-zero-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -26,20 +29,16 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>spring-zero-maven-plugin</artifactId>
+				<version>${project.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/main/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/main/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplication.java
rename to spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/main/java/org/springframework/bootstrap/sample/tomcat/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/service/HelloWorldService.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/main/java/org/springframework/bootstrap/sample/tomcat/service/HelloWorldService.java
rename to spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/service/HelloWorldService.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/main/java/org/springframework/bootstrap/sample/tomcat/web/SampleController.java b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/web/SampleController.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/main/java/org/springframework/bootstrap/sample/tomcat/web/SampleController.java
rename to spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/web/SampleController.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/test/java/org/springframework/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/test/java/org/springframework/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/test/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/test/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/.gitignore b/spring-zero-samples/spring-zero-sample-traditional/.gitignore
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/.gitignore
rename to spring-zero-samples/spring-zero-sample-traditional/.gitignore
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/pom.xml b/spring-zero-samples/spring-zero-sample-traditional/pom.xml
similarity index 50%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/pom.xml
rename to spring-zero-samples/spring-zero-sample-traditional/pom.xml
index 00a471ae06..4095d6612f 100644
--- a/spring-bootstrap-samples/spring-bootstrap-ui-sample/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-traditional/pom.xml
@@ -1,64 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-samples</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-samples</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-ui-sample</artifactId>
+	<artifactId>spring-zero-sample-traditional</artifactId>
+	<packaging>executable-war</packaging>
 	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
-		<start-class>org.springframework.bootstrap.sample.ui.UiBootstrapApplication</start-class>
 	</properties>
 	<dependencies>
+		<!-- Compile -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap</artifactId>
+			<artifactId>spring-zero-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.thymeleaf</groupId>
-			<artifactId>thymeleaf-spring3</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>nz.net.ultraq.web.thymeleaf</groupId>
-			<artifactId>thymeleaf-layout-dialect</artifactId>
-		</dependency>
+		<!-- Provided (for embedded war support) -->
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
 			<artifactId>tomcat-embed-core</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
 			<artifactId>tomcat-embed-logging-juli</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<scope>runtime</scope>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-jasper</artifactId>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-shade-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-exec-plugin</artifactId>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>spring-zero-maven-plugin</artifactId>
+				<version>${project.version}</version>
+				<extensions>true</extensions>
 			</plugin>
 		</plugins>
 	</build>
 </project>
+
diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplication.java
rename to spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/java/org/springframework/bootstrap/sample/trad/config/WebConfig.java b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/config/WebConfig.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/java/org/springframework/bootstrap/sample/trad/config/WebConfig.java
rename to spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/config/WebConfig.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/resources/log4j.properties b/spring-zero-samples/spring-zero-sample-traditional/src/main/resources/log4j.properties
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/resources/log4j.properties
rename to spring-zero-samples/spring-zero-sample-traditional/src/main/resources/log4j.properties
diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/webapp/WEB-INF/views/home.jsp b/spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/WEB-INF/views/home.jsp
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/webapp/WEB-INF/views/home.jsp
rename to spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/WEB-INF/views/home.jsp
diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/webapp/WEB-INF/web.xml b/spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/webapp/WEB-INF/web.xml
rename to spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/WEB-INF/web.xml
diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/webapp/index.html b/spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/index.html
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/webapp/index.html
rename to spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/index.html
diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/test/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/test/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/test/resources/log4j.properties b/spring-zero-samples/spring-zero-sample-traditional/src/test/resources/log4j.properties
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/test/resources/log4j.properties
rename to spring-zero-samples/spring-zero-sample-traditional/src/test/resources/log4j.properties
diff --git a/spring-zero-samples/spring-zero-sample-web-ui/pom.xml b/spring-zero-samples/spring-zero-sample-web-ui/pom.xml
new file mode 100644
index 0000000000..a790637251
--- /dev/null
+++ b/spring-zero-samples/spring-zero-sample-web-ui/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-samples</artifactId>
+		<version>0.5.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-zero-sample-web-ui</artifactId>
+	<packaging>executable-jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-starter-web</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.thymeleaf</groupId>
+			<artifactId>thymeleaf-spring3</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>nz.net.ultraq.web.thymeleaf</groupId>
+			<artifactId>thymeleaf-layout-dialect</artifactId>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>spring-zero-maven-plugin</artifactId>
+				<version>${project.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/InMemoryMessageRespository.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/InMemoryMessageRespository.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/InMemoryMessageRespository.java
rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/InMemoryMessageRespository.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/Message.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/Message.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/Message.java
rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/Message.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/MessageRepository.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/MessageRepository.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/MessageRepository.java
rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/MessageRepository.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplication.java
rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/mvc/MessageController.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/mvc/MessageController.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/mvc/MessageController.java
rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/mvc/MessageController.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/css/bootstrap.min.css b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/css/bootstrap.min.css
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/css/bootstrap.min.css
rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/css/bootstrap.min.css
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/favicon.ico b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/favicon.ico
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/favicon.ico
rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/favicon.ico
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/js/jquery-1.7.2.js b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/js/jquery-1.7.2.js
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/js/jquery-1.7.2.js
rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/js/jquery-1.7.2.js
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/js/jquery.validate.js b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/js/jquery.validate.js
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/js/jquery.validate.js
rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/js/jquery.validate.js
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/layout.html b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/layout.html
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/layout.html
rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/layout.html
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/messages/form.html b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/form.html
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/messages/form.html
rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/form.html
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/messages/list.html b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/list.html
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/messages/list.html
rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/list.html
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/messages/view.html b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/view.html
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/messages/view.html
rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/view.html
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/test/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/test/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/test/resources/logging.properties b/spring-zero-samples/spring-zero-sample-web-ui/src/test/resources/logging.properties
similarity index 97%
rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/test/resources/logging.properties
rename to spring-zero-samples/spring-zero-sample-web-ui/src/test/resources/logging.properties
index 4c989d9a9b..a86ad1a298 100644
--- a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/test/resources/logging.properties
+++ b/spring-zero-samples/spring-zero-sample-web-ui/src/test/resources/logging.properties
@@ -1,6 +1,6 @@
-handlers = java.util.logging.ConsoleHandler
-.level = INFO
-
-java.util.logging.ConsoleHandler.level = FINE
-sun.net.www.protocol.http.HttpURLConnection.level = ALL
-org.springframework.bootstrap.context.annotation.level = ALL
+handlers = java.util.logging.ConsoleHandler
+.level = INFO
+
+java.util.logging.ConsoleHandler.level = FINE
+sun.net.www.protocol.http.HttpURLConnection.level = ALL
+org.springframework.bootstrap.context.annotation.level = ALL
diff --git a/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml b/spring-zero-samples/spring-zero-sample-xml/pom.xml
similarity index 51%
rename from spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml
rename to spring-zero-samples/spring-zero-sample-xml/pom.xml
index 8bf8a520f7..e987c69895 100644
--- a/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml
+++ b/spring-zero-samples/spring-zero-sample-xml/pom.xml
@@ -3,22 +3,30 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-samples</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-samples</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-xml-sample</artifactId>
+	<artifactId>spring-zero-sample-xml</artifactId>
 	<packaging>executable-jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap</artifactId>
+			<artifactId>spring-zero-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>spring-zero-maven-plugin</artifactId>
+				<version>${project.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-xml-sample/src/main/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-xml-sample/src/main/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplication.java
rename to spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-xml-sample/src/main/java/org/springframework/bootstrap/sample/xml/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/service/HelloWorldService.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-xml-sample/src/main/java/org/springframework/bootstrap/sample/xml/service/HelloWorldService.java
rename to spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/service/HelloWorldService.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-xml-sample/src/main/resources/META-INF/application-context.xml b/spring-zero-samples/spring-zero-sample-xml/src/main/resources/META-INF/application-context.xml
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-xml-sample/src/main/resources/META-INF/application-context.xml
rename to spring-zero-samples/spring-zero-sample-xml/src/main/resources/META-INF/application-context.xml
diff --git a/spring-bootstrap-samples/spring-bootstrap-xml-sample/src/test/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-xml-sample/src/test/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplicationTests.java
rename to spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplicationTests.java
diff --git a/spring-zero-starters/pom.xml b/spring-zero-starters/pom.xml
new file mode 100644
index 0000000000..e82942c123
--- /dev/null
+++ b/spring-zero-starters/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero</artifactId>
+		<version>0.5.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-zero-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>
+	</modules>
+</project>
diff --git a/spring-bootstrap-starters/spring-bootstrap-actuator-starter/pom.xml b/spring-zero-starters/spring-zero-starter-actuator/pom.xml
similarity index 66%
rename from spring-bootstrap-starters/spring-bootstrap-actuator-starter/pom.xml
rename to spring-zero-starters/spring-zero-starter-actuator/pom.xml
index 47e350e814..0d31c5c529 100644
--- a/spring-bootstrap-starters/spring-bootstrap-actuator-starter/pom.xml
+++ b/spring-zero-starters/spring-zero-starter-actuator/pom.xml
@@ -3,21 +3,24 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-starters</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-actuator-starter</artifactId>
+	<artifactId>spring-zero-starter-actuator</artifactId>
 	<packaging>jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap-starter</artifactId>
+			<artifactId>spring-zero-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap-actuator</artifactId>
+			<artifactId>spring-zero-actuator</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/spring-bootstrap-starters/spring-bootstrap-batch-starter/pom.xml b/spring-zero-starters/spring-zero-starter-batch/pom.xml
similarity index 76%
rename from spring-bootstrap-starters/spring-bootstrap-batch-starter/pom.xml
rename to spring-zero-starters/spring-zero-starter-batch/pom.xml
index 1c38bf119e..d5ffc46428 100644
--- a/spring-bootstrap-starters/spring-bootstrap-batch-starter/pom.xml
+++ b/spring-zero-starters/spring-zero-starter-batch/pom.xml
@@ -3,29 +3,32 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-starters</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-batch-starter</artifactId>
+	<artifactId>spring-zero-starter-batch</artifactId>
 	<packaging>jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap-starter</artifactId>
+			<artifactId>spring-zero-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.batch</groupId>
-			<artifactId>spring-batch-core</artifactId>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
+			<groupId>org.springframework.batch</groupId>
+			<artifactId>spring-batch-core</artifactId>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-bootstrap-starters/spring-bootstrap-jpa-starter/pom.xml b/spring-zero-starters/spring-zero-starter-data-jpa/pom.xml
similarity index 74%
rename from spring-bootstrap-starters/spring-bootstrap-jpa-starter/pom.xml
rename to spring-zero-starters/spring-zero-starter-data-jpa/pom.xml
index 26b1cbdba4..9174bd195f 100644
--- a/spring-bootstrap-starters/spring-bootstrap-jpa-starter/pom.xml
+++ b/spring-zero-starters/spring-zero-starter-data-jpa/pom.xml
@@ -3,18 +3,25 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-starters</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-jpa-starter</artifactId>
+	<artifactId>spring-zero-starter-data-jpa</artifactId>
 	<packaging>jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap-starter</artifactId>
+			<artifactId>spring-zero-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
@@ -23,18 +30,9 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-jpa</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml b/spring-zero-starters/spring-zero-starter-integration/pom.xml
similarity index 54%
rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml
rename to spring-zero-starters/spring-zero-starter-integration/pom.xml
index 3ba4e36455..88dc4b4140 100644
--- a/spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml
+++ b/spring-zero-starters/spring-zero-starter-integration/pom.xml
@@ -3,19 +3,19 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-samples</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-integration-sample</artifactId>
+	<artifactId>spring-zero-starter-integration</artifactId>
 	<packaging>jar</packaging>
 	<properties>
-		<start-class>org.springframework.bootstrap.sample.service.IntegrationBootstrapApplication</start-class>
+		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.bootstrap</groupId>
-			<artifactId>spring-bootstrap-actuator</artifactId>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -25,19 +25,18 @@
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-file</artifactId>
-			<version>${spring.integration.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-http</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-ip</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-stream</artifactId>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/spring-bootstrap-starters/spring-bootstrap-security-starter/pom.xml b/spring-zero-starters/spring-zero-starter-security/pom.xml
similarity index 70%
rename from spring-bootstrap-starters/spring-bootstrap-security-starter/pom.xml
rename to spring-zero-starters/spring-zero-starter-security/pom.xml
index 34fb7bc0cb..97532d0e2f 100644
--- a/spring-bootstrap-starters/spring-bootstrap-security-starter/pom.xml
+++ b/spring-zero-starters/spring-zero-starter-security/pom.xml
@@ -3,16 +3,19 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-starters</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-security-starter</artifactId>
+	<artifactId>spring-zero-starter-security</artifactId>
 	<packaging>jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap-starter</artifactId>
+			<artifactId>spring-zero-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml b/spring-zero-starters/spring-zero-starter-web/pom.xml
similarity index 70%
rename from spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml
rename to spring-zero-starters/spring-zero-starter-web/pom.xml
index cbe9ced5be..c5eaa47897 100644
--- a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml
+++ b/spring-zero-starters/spring-zero-starter-web/pom.xml
@@ -3,21 +3,24 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-samples</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-tomcat-sample</artifactId>
-	<packaging>executable-jar</packaging>
+	<artifactId>spring-zero-starter-web</artifactId>
+	<packaging>jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap</artifactId>
+			<artifactId>spring-zero-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
@@ -28,9 +31,8 @@
 			<artifactId>tomcat-embed-logging-juli</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<scope>runtime</scope>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-bootstrap-starters/spring-bootstrap-starter/pom.xml b/spring-zero-starters/spring-zero-starter/pom.xml
similarity index 68%
rename from spring-bootstrap-starters/spring-bootstrap-starter/pom.xml
rename to spring-zero-starters/spring-zero-starter/pom.xml
index 13d31e6a94..e418b39597 100644
--- a/spring-bootstrap-starters/spring-bootstrap-starter/pom.xml
+++ b/spring-zero-starters/spring-zero-starter/pom.xml
@@ -3,18 +3,47 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.bootstrap</groupId>
-		<artifactId>spring-bootstrap-starters</artifactId>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-zero-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-starter</artifactId>
+	<artifactId>spring-zero-starter</artifactId>
 	<packaging>jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap</artifactId>
+			<artifactId>spring-zero-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-zero-autoconfigure</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-jdk14</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
@@ -25,10 +54,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
@@ -37,19 +62,5 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aop</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 	</dependencies>
 </project>