diff --git a/pom.xml b/pom.xml
index ce82983..a02ce68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,6 @@
 	</properties>
 
 	<modules>
-		<module>spring-cloud-starter-build</module>
 		<module>spring-cloud-starter-parent</module>
 		<module>spring-cloud-starter</module>
 		<module>spring-cloud-starter-config</module>
diff --git a/spring-cloud-starter-aws-jdbc/pom.xml b/spring-cloud-starter-aws-jdbc/pom.xml
index 82d8e7e..4734371 100644
--- a/spring-cloud-starter-aws-jdbc/pom.xml
+++ b/spring-cloud-starter-aws-jdbc/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<artifactId>spring-cloud-aws</artifactId>
+		<version>1.0.2.BUILD-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-aws-jdbc</artifactId>
+	<version>1.0.3.BUILD-SNAPSHOT</version>
 	<name>spring-cloud-starter-aws-jdbc</name>
 	<description>Spring Cloud Starter AWS JDBC</description>
 	<url>http://projects.spring.io/spring-cloud</url>
diff --git a/spring-cloud-starter-aws-messaging/pom.xml b/spring-cloud-starter-aws-messaging/pom.xml
index ee3b6d6..a4e9ed7 100644
--- a/spring-cloud-starter-aws-messaging/pom.xml
+++ b/spring-cloud-starter-aws-messaging/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<artifactId>spring-cloud-aws</artifactId>
+		<version>1.0.2.BUILD-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-aws-messaging</artifactId>
+	<version>1.0.3.BUILD-SNAPSHOT</version>
 	<name>spring-cloud-starter-aws-messaging</name>
 	<description>Spring Cloud Starter AWS Messaging</description>
 	<url>http://projects.spring.io/spring-cloud</url>
diff --git a/spring-cloud-starter-aws/pom.xml b/spring-cloud-starter-aws/pom.xml
index a93e995..1f4ed85 100644
--- a/spring-cloud-starter-aws/pom.xml
+++ b/spring-cloud-starter-aws/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<artifactId>spring-cloud-aws</artifactId>
+		<version>1.0.2.BUILD-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-aws</artifactId>
+	<version>1.0.3.BUILD-SNAPSHOT</version>
 	<name>spring-cloud-starter-aws</name>
 	<description>Spring Cloud Starter AWS</description>
 	<url>http://projects.spring.io/spring-cloud</url>
diff --git a/spring-cloud-starter-build/pom.xml b/spring-cloud-starter-build/pom.xml
deleted file mode 100644
index 4223ae7..0000000
--- a/spring-cloud-starter-build/pom.xml
+++ /dev/null
@@ -1,358 +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.cloud</groupId>
-		<artifactId>spring-cloud-parent</artifactId>
-		<version>1.0.2.BUILD-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-cloud-starter-build</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
-	<name>spring-cloud-starter-build</name>
-	<description>Spring Cloud Starter Build - a temporary shim for the Angel service releases (in Brixton we plan to split the starters out into their "natural" homes with the things they activate, e.g. eureka part of netflix)</description>
-	<packaging>pom</packaging>
-	<url>http://projects.spring.io/spring-cloud</url>
-	<organization>
-		<name>Pivotal Software, Inc.</name>
-		<url>http://www.spring.io</url>
-	</organization>
-	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
-		<spring-cloud-aws.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-aws.version>
-		<spring-cloud-bus.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-bus.version>
-		<spring-cloud-commons.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-config.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-netflix.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-netflix.version>
-		<spring-cloud-security.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-security.version>
-	</properties>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-config</artifactId>
-				<version>${spring-cloud-config.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix</artifactId>
-				<version>${spring-cloud-netflix.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-commons</artifactId>
-				<version>${spring-cloud-commons.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-context</artifactId>
-				<version>${spring-cloud-commons.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-security</artifactId>
-				<version>${spring-cloud-security.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-bus</artifactId>
-				<version>${spring-cloud-bus.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-bus-hystrix</artifactId>
-				<version>${spring-cloud-netflix.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-aws-context</artifactId>
-				<version>${spring-cloud-aws.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-aws-autoconfigure</artifactId>
-				<version>${spring-cloud-aws.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-aws-jdbc</artifactId>
-				<version>${spring-cloud-aws.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-aws-messaging</artifactId>
-				<version>${spring-cloud-aws.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-cloudfoundry</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-bus-amqp</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-config</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-turbine-amqp</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-eureka</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.inject.extensions</groupId>
-						<artifactId>guice-grapher</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.inject.extensions</groupId>
-						<artifactId>guice-assistedinject</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.codehaus.jsr166-mirror</groupId>
-						<artifactId>jsr166y</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.apache.xbean</groupId>
-						<artifactId>xbean-finder</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>asm</groupId>
-						<artifactId>asm-all</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.inject.extensions</groupId>
-						<artifactId>guice-multibindings</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.apache.xbean</groupId>
-						<artifactId>xbean-bundleutils</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.apache.commons</groupId>
-						<artifactId>commons-math</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.netflix.netflix-commons</groupId>
-						<artifactId>netflix-infix</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>joda-time</groupId>
-						<artifactId>joda-time</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>commons-jxpath</groupId>
-						<artifactId>commons-jxpath</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.antlr</groupId>
-						<artifactId>antlr-runtime</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.antlr</groupId>
-						<artifactId>stringtemplate</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>antlr</groupId>
-						<artifactId>antlr</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.code.gson</groupId>
-						<artifactId>gson</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.squareup.dagger</groupId>
-						<artifactId>dagger</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.netflix.blitz4j</groupId>
-						<artifactId>blitz4j</artifactId>
-					</exclusion>
-					<exclusion>
-						<artifactId>hibernate-validator</artifactId>
-						<groupId>org.hibernate</groupId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-eureka-server</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.inject.extensions</groupId>
-						<artifactId>guice-grapher</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.inject.extensions</groupId>
-						<artifactId>guice-assistedinject</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.codehaus.jsr166-mirror</groupId>
-						<artifactId>jsr166y</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.apache.xbean</groupId>
-						<artifactId>xbean-finder</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>asm</groupId>
-						<artifactId>asm-all</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.inject.extensions</groupId>
-						<artifactId>guice-multibindings</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.apache.xbean</groupId>
-						<artifactId>xbean-bundleutils</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.apache.commons</groupId>
-						<artifactId>commons-math</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.netflix.netflix-commons</groupId>
-						<artifactId>netflix-infix</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>joda-time</groupId>
-						<artifactId>joda-time</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>commons-jxpath</groupId>
-						<artifactId>commons-jxpath</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.antlr</groupId>
-						<artifactId>antlr-runtime</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.antlr</groupId>
-						<artifactId>stringtemplate</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>antlr</groupId>
-						<artifactId>antlr</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.code.gson</groupId>
-						<artifactId>gson</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.squareup.dagger</groupId>
-						<artifactId>dagger</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-feign</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-hystrix</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-oauth2</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-ribbon</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-security</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-turbine</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-zuul</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-zuul-server</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-aws</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-aws-jdbc</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-aws-messaging</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-maven-plugin</artifactId>
-					<configuration>
-						<requiresUnpack>
-							<dependency>
-								<groupId>com.netflix.eureka</groupId>
-								<artifactId>eureka-core</artifactId>
-							</dependency>
-							<dependency>
-								<groupId>com.netflix.eureka</groupId>
-								<artifactId>eureka-client</artifactId>
-							</dependency>
-						</requiresUnpack>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
diff --git a/spring-cloud-starter-build/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-build/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index 3628be6..0000000
--- a/spring-cloud-starter-build/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1 +0,0 @@
-provides: spring-cloud-config-client
\ No newline at end of file
diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml
index 84dcc81..9b9f4a1 100644
--- a/spring-cloud-starter-bus-amqp/pom.xml
+++ b/spring-cloud-starter-bus-amqp/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<artifactId>spring-cloud-bus-parent</artifactId>
+		<version>1.0.2.BUILD-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-bus-amqp</artifactId>
+	<version>1.0.3.BUILD-SNAPSHOT</version>
 	<name>spring-cloud-starter-bus-amqp</name>
 	<description>Spring Cloud Starter</description>
 	<url>http://projects.spring.io/spring-cloud</url>
@@ -19,17 +20,6 @@
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-bus-parent</artifactId>
-				<version>${spring-cloud-bus.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml
index 9b92f7e..e81cdc9 100644
--- a/spring-cloud-starter-cloudfoundry/pom.xml
+++ b/spring-cloud-starter-cloudfoundry/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<artifactId>spring-cloud-commons-parent</artifactId>
+		<version>1.0.2.BUILD-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-cloudfoundry</artifactId>
+	<version>1.0.3.BUILD-SNAPSHOT</version>
 	<name>spring-cloud-starter-cloudfoundry</name>
 	<description>Spring Cloud Starter</description>
 	<url>http://projects.spring.io/spring-cloud</url>
diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml
index e9d9465..fcebd73 100644
--- a/spring-cloud-starter-config/pom.xml
+++ b/spring-cloud-starter-config/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<artifactId>spring-cloud-config</artifactId>
+		<version>1.0.2.BUILD-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-config</artifactId>
+	<version>1.0.3.BUILD-SNAPSHOT</version>
 	<name>spring-cloud-starter-config</name>
 	<description>Spring Cloud Starter</description>
 	<url>http://projects.spring.io/spring-cloud</url>
diff --git a/spring-cloud-starter-eureka-server/pom.xml b/spring-cloud-starter-eureka-server/pom.xml
index ca185f7..8838615 100644
--- a/spring-cloud-starter-eureka-server/pom.xml
+++ b/spring-cloud-starter-eureka-server/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
+		<artifactId>spring-cloud-netflix</artifactId>
 		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-eureka-server</artifactId>
 	<name>spring-cloud-starter-eureka-server</name>
diff --git a/spring-cloud-starter-eureka/pom.xml b/spring-cloud-starter-eureka/pom.xml
index fc4f9d6..d52c984 100644
--- a/spring-cloud-starter-eureka/pom.xml
+++ b/spring-cloud-starter-eureka/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
+		<artifactId>spring-cloud-netflix</artifactId>
 		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-eureka</artifactId>
 	<name>spring-cloud-starter-eureka</name>
diff --git a/spring-cloud-starter-feign/pom.xml b/spring-cloud-starter-feign/pom.xml
index 05a4453..6ce4370 100644
--- a/spring-cloud-starter-feign/pom.xml
+++ b/spring-cloud-starter-feign/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
+		<artifactId>spring-cloud-netflix</artifactId>
 		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-feign</artifactId>
 	<name>spring-cloud-starter-feign</name>
diff --git a/spring-cloud-starter-hystrix-dashboard/pom.xml b/spring-cloud-starter-hystrix-dashboard/pom.xml
index ebf2da0..3d4c39d 100644
--- a/spring-cloud-starter-hystrix-dashboard/pom.xml
+++ b/spring-cloud-starter-hystrix-dashboard/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
+		<artifactId>spring-cloud-netflix</artifactId>
 		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>
 	<name>spring-cloud-starter-hystrix-dashboard</name>
diff --git a/spring-cloud-starter-hystrix/pom.xml b/spring-cloud-starter-hystrix/pom.xml
index c9c30c2..680eea6 100644
--- a/spring-cloud-starter-hystrix/pom.xml
+++ b/spring-cloud-starter-hystrix/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
+		<artifactId>spring-cloud-netflix</artifactId>
 		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-hystrix</artifactId>
 	<name>spring-cloud-starter-hystrix</name>
diff --git a/spring-cloud-starter-oauth2/pom.xml b/spring-cloud-starter-oauth2/pom.xml
index cb11d3a..bb8c479 100644
--- a/spring-cloud-starter-oauth2/pom.xml
+++ b/spring-cloud-starter-oauth2/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<artifactId>spring-cloud-security-parent</artifactId>
+		<version>1.0.2.BUILD-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-oauth2</artifactId>
+	<version>1.0.3.BUILD-SNAPSHOT</version>
 	<name>spring-cloud-starter-oauth2</name>
 	<description>Spring Cloud Starter</description>
 	<url>http://projects.spring.io/spring-cloud</url>
diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml
index bd917e4..9652a59 100644
--- a/spring-cloud-starter-parent/pom.xml
+++ b/spring-cloud-starter-parent/pom.xml
@@ -90,12 +90,22 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-cloudfoundry</artifactId>
+				<artifactId>spring-cloud-starter</artifactId>
 				<version>1.0.3.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter</artifactId>
+				<artifactId>spring-cloud-starter-aws</artifactId>
+				<version>1.0.3.BUILD-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-aws-jdbc</artifactId>
+				<version>1.0.3.BUILD-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-aws-messaging</artifactId>
 				<version>1.0.3.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
@@ -105,12 +115,12 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-config</artifactId>
+				<artifactId>spring-cloud-starter-cloudfoundry</artifactId>
 				<version>1.0.3.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-turbine-amqp</artifactId>
+				<artifactId>spring-cloud-starter-config</artifactId>
 				<version>1.0.3.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
@@ -306,6 +316,11 @@
 				<artifactId>spring-cloud-starter-turbine</artifactId>
 				<version>1.0.3.BUILD-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-turbine-amqp</artifactId>
+				<version>1.0.3.BUILD-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-zuul</artifactId>
@@ -316,21 +331,6 @@
 				<artifactId>spring-cloud-starter-zuul-server</artifactId>
 				<version>1.0.3.BUILD-SNAPSHOT</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-aws</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-aws-jdbc</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-aws-messaging</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<build>
diff --git a/spring-cloud-starter-ribbon/pom.xml b/spring-cloud-starter-ribbon/pom.xml
index aa795eb..b97ff91 100644
--- a/spring-cloud-starter-ribbon/pom.xml
+++ b/spring-cloud-starter-ribbon/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
+		<artifactId>spring-cloud-netflix</artifactId>
 		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-ribbon</artifactId>
 	<name>spring-cloud-starter-ribbon</name>
diff --git a/spring-cloud-starter-security/pom.xml b/spring-cloud-starter-security/pom.xml
index 8102229..bfd94d5 100644
--- a/spring-cloud-starter-security/pom.xml
+++ b/spring-cloud-starter-security/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<artifactId>spring-cloud-security-parent</artifactId>
+		<version>1.0.2.BUILD-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-security</artifactId>
+	<version>1.0.3.BUILD-SNAPSHOT</version>
 	<name>spring-cloud-starter-security</name>
 	<description>Spring Cloud Starter</description>
 	<url>http://projects.spring.io/spring-cloud</url>
diff --git a/spring-cloud-starter-turbine-amqp/pom.xml b/spring-cloud-starter-turbine-amqp/pom.xml
index 669eb32..7dbc027 100644
--- a/spring-cloud-starter-turbine-amqp/pom.xml
+++ b/spring-cloud-starter-turbine-amqp/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
+		<artifactId>spring-cloud-netflix</artifactId>
 		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-turbine-amqp</artifactId>
 	<name>spring-cloud-starter-turbine-amqp</name>
@@ -20,17 +20,6 @@
 		<main.basedir>${basedir}/../..</main.basedir>
 		<turbine.version>2.0.0-DP.2</turbine.version>
 	</properties>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-turbine-amqp</artifactId>
-				<version>${project.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-starter-turbine/pom.xml b/spring-cloud-starter-turbine/pom.xml
index 03fc43e..d2ec6e1 100644
--- a/spring-cloud-starter-turbine/pom.xml
+++ b/spring-cloud-starter-turbine/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
+		<artifactId>spring-cloud-netflix</artifactId>
 		<version>1.0.3.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-cloud-starter-build</relativePath>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-starter-turbine</artifactId>
 	<name>spring-cloud-starter-turbine</name>
diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml
index a6e6edd..3886604 100644
--- a/spring-cloud-starter/pom.xml
+++ b/spring-cloud-starter/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-build</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<artifactId>spring-cloud-commons-parent</artifactId>
+		<version>1.0.2.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-cloud-starter-build</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter</artifactId>
+	<version>1.0.3.BUILD-SNAPSHOT</version>
 	<name>spring-cloud-starter</name>
 	<description>Spring Cloud Starter</description>
 	<url>http://projects.spring.io/spring-cloud</url>