Further maven module restructure

pom.xml

@@ -36,14 +36,14 @@
 		</developer>
 	</developers>
 	<modules>
-		<module>spring-zero-actuator</module>
-		<module>spring-zero-autoconfigure</module>
-		<module>spring-zero-cli</module>
-		<module>spring-zero-core</module>
+		<module>spring-bootstrap</module>
+		<module>spring-autoconfigure</module>
+		<module>spring-starters</module>
+		<module>spring-actuator</module>
+		<module>spring-launcher</module>
+		<module>spring-package-maven-plugin</module>
+		<module>spring-cli</module>
 		<module>spring-zero-intergration-tests</module>
-		<module>spring-zero-launcher</module>
-		<module>spring-zero-maven-plugin</module>
-		<module>spring-zero-starters</module>
 	</modules>
 	<build>
 		<pluginManagement>

spring-actuator/pom.xml

@@ -7,7 +7,7 @@
 		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-actuator</artifactId>
+	<artifactId>spring-actuator</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
@@ -16,7 +16,7 @@
 		<!-- Compile -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-autoconfigure</artifactId>
+			<artifactId>spring-autoconfigure</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -69,7 +69,7 @@
 		<!-- Test -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-core</artifactId>
+			<artifactId>spring-bootstrap</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>

spring-autoconfigure/pom.xml

@@ -7,7 +7,7 @@
 		<artifactId>spring-zero</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-zero-autoconfigure</artifactId>
+	<artifactId>spring-autoconfigure</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
@@ -16,7 +16,7 @@
 		<!-- Compile -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-core</artifactId>
+			<artifactId>spring-bootstrap</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<!-- Optional -->
@@ -103,7 +103,7 @@
 		<!-- Test -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-zero-core</artifactId>
+			<artifactId>spring-bootstrap</artifactId>
 			<version>${project.version}</version>
 			<classifier>tests</classifier>
 			<scope>test</scope>