diff --git a/README.md b/README.md
index 4974916..3f82c78 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,6 @@ The core concepts used in this project are:
 
 The project comprises of three subprojects:
 
-1. **spring-cloud-core**: Core library that is cloud agnostic and Spring-agnostic. Provides entry point for application developers that choose to programmatically access cloud services and application information. It also provides an extension mechanism to contribute cloud connectors and service connector creators.
-2. **spring-cloud-service-connector**: Library that provides service connectors creators for java.sql.DataSource and various connection factories spring-data projects.
-3. **spring-cloudfoundry-connector**: Cloud connector for [Cloud Foundry](http://www.cloudfoundry.com).
+1. **core**: Core library that is cloud agnostic and Spring-agnostic. Provides entry point for application developers that choose to programmatically access cloud services and application information. It also provides an extension mechanism to contribute cloud connectors and service connector creators.
+2. **spring-service-connector**: Library that provides service connectors creators for javax.sql.DataSource and various connection factories spring-data projects.
+3. **cloudfoundry-connector**: Cloud connector for [Cloud Foundry](http://www.cloudfoundry.com).
diff --git a/spring-cloudfoundry-connector/README.md b/cloudfoundry-connector/README.md
similarity index 100%
rename from spring-cloudfoundry-connector/README.md
rename to cloudfoundry-connector/README.md
diff --git a/spring-cloudfoundry-connector/pom.xml b/cloudfoundry-connector/pom.xml
similarity index 88%
rename from spring-cloudfoundry-connector/pom.xml
rename to cloudfoundry-connector/pom.xml
index 54fd0d5..79124e1 100644
--- a/spring-cloudfoundry-connector/pom.xml
+++ b/cloudfoundry-connector/pom.xml
@@ -3,8 +3,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-cloudfoundry-connector</artifactId>
+	<groupId>org.springframework.cloud</groupId>
+	<artifactId>cloudfoundry-connector</artifactId>
 	<version>1.0.0.CI-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Spring-Cloud CloudFoundry Connector</name>
@@ -21,8 +21,8 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-cloud-service-connector</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-service-connector</artifactId>
 			<version>1.0.0.CI-SNAPSHOT</version>
 		</dependency>
 		<dependency>
diff --git a/spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/ApplicationInstanceInfoCreator.java b/cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/ApplicationInstanceInfoCreator.java
similarity index 100%
rename from spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/ApplicationInstanceInfoCreator.java
rename to cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/ApplicationInstanceInfoCreator.java
diff --git a/spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/CloudFoundryApplicationInstanceInfo.java b/cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/CloudFoundryApplicationInstanceInfo.java
similarity index 100%
rename from spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/CloudFoundryApplicationInstanceInfo.java
rename to cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/CloudFoundryApplicationInstanceInfo.java
diff --git a/spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/CloudFoundryConnector.java b/cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/CloudFoundryConnector.java
similarity index 100%
rename from spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/CloudFoundryConnector.java
rename to cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/CloudFoundryConnector.java
diff --git a/spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/CloudFoundryServiceInfoCreator.java b/cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/CloudFoundryServiceInfoCreator.java
similarity index 100%
rename from spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/CloudFoundryServiceInfoCreator.java
rename to cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/CloudFoundryServiceInfoCreator.java
diff --git a/spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/MongoServiceInfoCreator.java b/cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/MongoServiceInfoCreator.java
similarity index 100%
rename from spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/MongoServiceInfoCreator.java
rename to cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/MongoServiceInfoCreator.java
diff --git a/spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/MysqlServiceInfoCreator.java b/cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/MysqlServiceInfoCreator.java
similarity index 100%
rename from spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/MysqlServiceInfoCreator.java
rename to cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/MysqlServiceInfoCreator.java
diff --git a/spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/PostgresqlServiceInfoCreator.java b/cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/PostgresqlServiceInfoCreator.java
similarity index 100%
rename from spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/PostgresqlServiceInfoCreator.java
rename to cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/PostgresqlServiceInfoCreator.java
diff --git a/spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/RabbitServiceInfoCreator.java b/cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/RabbitServiceInfoCreator.java
similarity index 100%
rename from spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/RabbitServiceInfoCreator.java
rename to cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/RabbitServiceInfoCreator.java
diff --git a/spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/RedisServiceInfoCreator.java b/cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/RedisServiceInfoCreator.java
similarity index 100%
rename from spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/RedisServiceInfoCreator.java
rename to cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/RedisServiceInfoCreator.java
diff --git a/spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/RelationalServiceInfoCreator.java b/cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/RelationalServiceInfoCreator.java
similarity index 100%
rename from spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/RelationalServiceInfoCreator.java
rename to cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/RelationalServiceInfoCreator.java
diff --git a/spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/ServiceInfoCreator.java b/cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/ServiceInfoCreator.java
similarity index 100%
rename from spring-cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/ServiceInfoCreator.java
rename to cloudfoundry-connector/src/main/java/org/springframework/cloudfoundry/ServiceInfoCreator.java
diff --git a/spring-cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.CloudConnector b/cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.CloudConnector
similarity index 100%
rename from spring-cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.CloudConnector
rename to cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.CloudConnector
diff --git a/spring-cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloudfoundry.CloudFoundryServiceInfoCreator b/cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloudfoundry.CloudFoundryServiceInfoCreator
similarity index 100%
rename from spring-cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloudfoundry.CloudFoundryServiceInfoCreator
rename to cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloudfoundry.CloudFoundryServiceInfoCreator
diff --git a/spring-cloudfoundry-connector/src/test/java/org/springframework/cloudfoundry/CloudCoundryConnectorTest.java b/cloudfoundry-connector/src/test/java/org/springframework/cloudfoundry/CloudCoundryConnectorTest.java
similarity index 100%
rename from spring-cloudfoundry-connector/src/test/java/org/springframework/cloudfoundry/CloudCoundryConnectorTest.java
rename to cloudfoundry-connector/src/test/java/org/springframework/cloudfoundry/CloudCoundryConnectorTest.java
diff --git a/spring-cloudfoundry-connector/src/test/java/org/springframework/cloudfoundry/CloudFoundryConnectorTestHelper.java b/cloudfoundry-connector/src/test/java/org/springframework/cloudfoundry/CloudFoundryConnectorTestHelper.java
similarity index 100%
rename from spring-cloudfoundry-connector/src/test/java/org/springframework/cloudfoundry/CloudFoundryConnectorTestHelper.java
rename to cloudfoundry-connector/src/test/java/org/springframework/cloudfoundry/CloudFoundryConnectorTestHelper.java
diff --git a/spring-cloud-core/src/test/resources/log4j.properties b/cloudfoundry-connector/src/test/resources/log4j.properties
similarity index 100%
rename from spring-cloud-core/src/test/resources/log4j.properties
rename to cloudfoundry-connector/src/test/resources/log4j.properties
diff --git a/spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-application-info.json b/cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-application-info.json
similarity index 100%
rename from spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-application-info.json
rename to cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-application-info.json
diff --git a/spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-mongodb-info.json b/cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-mongodb-info.json
similarity index 100%
rename from spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-mongodb-info.json
rename to cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-mongodb-info.json
diff --git a/spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-mysql-info.json b/cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-mysql-info.json
similarity index 100%
rename from spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-mysql-info.json
rename to cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-mysql-info.json
diff --git a/spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-postgresql-info.json b/cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-postgresql-info.json
similarity index 100%
rename from spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-postgresql-info.json
rename to cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-postgresql-info.json
diff --git a/spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-rabbit-info.json b/cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-rabbit-info.json
similarity index 100%
rename from spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-rabbit-info.json
rename to cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-rabbit-info.json
diff --git a/spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-rabbit-srs-info.json b/cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-rabbit-srs-info.json
similarity index 100%
rename from spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-rabbit-srs-info.json
rename to cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-rabbit-srs-info.json
diff --git a/spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-redis-info.json b/cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-redis-info.json
similarity index 100%
rename from spring-cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-redis-info.json
rename to cloudfoundry-connector/src/test/resources/org/springframework/cloudfoundry/test-redis-info.json
diff --git a/spring-cloud-core/README.md b/core/README.md
similarity index 100%
rename from spring-cloud-core/README.md
rename to core/README.md
diff --git a/spring-cloud-core/pom.xml b/core/pom.xml
similarity index 87%
rename from spring-cloud-core/pom.xml
rename to core/pom.xml
index 0fdd666..d26deb2 100644
--- a/spring-cloud-core/pom.xml
+++ b/core/pom.xml
@@ -3,11 +3,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-cloud-core</artifactId>
+	<groupId>org.springframework.cloud</groupId>
+	<artifactId>core</artifactId>
 	<version>1.0.0.CI-SNAPSHOT</version>
 	<packaging>jar</packaging>
-	<name>Spring Cloud Core</name>
+	<name>Cloud Core</name>
 	<url>http://www.springframework.org</url>
 	<description>
 		<![CDATA[
@@ -23,7 +23,7 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>${junit.version}</version>
-			<scope>test</scope>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/Cloud.java b/core/src/main/java/org/springframework/cloud/Cloud.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/Cloud.java
rename to core/src/main/java/org/springframework/cloud/Cloud.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/CloudConnector.java b/core/src/main/java/org/springframework/cloud/CloudConnector.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/CloudConnector.java
rename to core/src/main/java/org/springframework/cloud/CloudConnector.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/CloudException.java b/core/src/main/java/org/springframework/cloud/CloudException.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/CloudException.java
rename to core/src/main/java/org/springframework/cloud/CloudException.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/CloudFactory.java b/core/src/main/java/org/springframework/cloud/CloudFactory.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/CloudFactory.java
rename to core/src/main/java/org/springframework/cloud/CloudFactory.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/app/ApplicationInstanceInfo.java b/core/src/main/java/org/springframework/cloud/app/ApplicationInstanceInfo.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/app/ApplicationInstanceInfo.java
rename to core/src/main/java/org/springframework/cloud/app/ApplicationInstanceInfo.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/AbstractServiceConnectorCreator.java b/core/src/main/java/org/springframework/cloud/service/AbstractServiceConnectorCreator.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/service/AbstractServiceConnectorCreator.java
rename to core/src/main/java/org/springframework/cloud/service/AbstractServiceConnectorCreator.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/BaseServiceInfo.java b/core/src/main/java/org/springframework/cloud/service/BaseServiceInfo.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/service/BaseServiceInfo.java
rename to core/src/main/java/org/springframework/cloud/service/BaseServiceInfo.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/CloudServiceConnectorFactory.java b/core/src/main/java/org/springframework/cloud/service/CloudServiceConnectorFactory.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/service/CloudServiceConnectorFactory.java
rename to core/src/main/java/org/springframework/cloud/service/CloudServiceConnectorFactory.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfig.java b/core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfig.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfig.java
rename to core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfig.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfigurer.java b/core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfigurer.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfigurer.java
rename to core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfigurer.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreationException.java b/core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreationException.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreationException.java
rename to core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreationException.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreator.java b/core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreator.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreator.java
rename to core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreator.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceInfo.java b/core/src/main/java/org/springframework/cloud/service/ServiceInfo.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceInfo.java
rename to core/src/main/java/org/springframework/cloud/service/ServiceInfo.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/test/CloudTestUtil.java b/core/src/main/java/org/springframework/cloud/test/CloudTestUtil.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/test/CloudTestUtil.java
rename to core/src/main/java/org/springframework/cloud/test/CloudTestUtil.java
diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/util/ServiceLoaderWithExceptionControl.java b/core/src/main/java/org/springframework/cloud/util/ServiceLoaderWithExceptionControl.java
similarity index 100%
rename from spring-cloud-core/src/main/java/org/springframework/cloud/util/ServiceLoaderWithExceptionControl.java
rename to core/src/main/java/org/springframework/cloud/util/ServiceLoaderWithExceptionControl.java
diff --git a/spring-cloud-core/src/test/java/org/springframework/cloud/CloudFactoryTest.java b/core/src/test/java/org/springframework/cloud/CloudFactoryTest.java
similarity index 100%
rename from spring-cloud-core/src/test/java/org/springframework/cloud/CloudFactoryTest.java
rename to core/src/test/java/org/springframework/cloud/CloudFactoryTest.java
diff --git a/spring-cloud-core/src/test/java/org/springframework/cloud/CloudTest.java b/core/src/test/java/org/springframework/cloud/CloudTest.java
similarity index 100%
rename from spring-cloud-core/src/test/java/org/springframework/cloud/CloudTest.java
rename to core/src/test/java/org/springframework/cloud/CloudTest.java
diff --git a/spring-cloud-core/src/test/java/org/springframework/cloud/NonParameterizedStubServiceConnectorCreator.java b/core/src/test/java/org/springframework/cloud/NonParameterizedStubServiceConnectorCreator.java
similarity index 100%
rename from spring-cloud-core/src/test/java/org/springframework/cloud/NonParameterizedStubServiceConnectorCreator.java
rename to core/src/test/java/org/springframework/cloud/NonParameterizedStubServiceConnectorCreator.java
diff --git a/spring-cloud-core/src/test/java/org/springframework/cloud/StubServiceConnector.java b/core/src/test/java/org/springframework/cloud/StubServiceConnector.java
similarity index 100%
rename from spring-cloud-core/src/test/java/org/springframework/cloud/StubServiceConnector.java
rename to core/src/test/java/org/springframework/cloud/StubServiceConnector.java
diff --git a/spring-cloud-core/src/test/java/org/springframework/cloud/StubServiceConnectorCreator.java b/core/src/test/java/org/springframework/cloud/StubServiceConnectorCreator.java
similarity index 100%
rename from spring-cloud-core/src/test/java/org/springframework/cloud/StubServiceConnectorCreator.java
rename to core/src/test/java/org/springframework/cloud/StubServiceConnectorCreator.java
diff --git a/spring-cloud-core/src/test/java/org/springframework/cloud/StubServiceInfo.java b/core/src/test/java/org/springframework/cloud/StubServiceInfo.java
similarity index 100%
rename from spring-cloud-core/src/test/java/org/springframework/cloud/StubServiceInfo.java
rename to core/src/test/java/org/springframework/cloud/StubServiceInfo.java
diff --git a/spring-cloud-core/src/test/resources/META-INF/services/org.springframework.cloud.CloudConnector b/core/src/test/resources/META-INF/services/org.springframework.cloud.CloudConnector
similarity index 100%
rename from spring-cloud-core/src/test/resources/META-INF/services/org.springframework.cloud.CloudConnector
rename to core/src/test/resources/META-INF/services/org.springframework.cloud.CloudConnector
diff --git a/spring-cloud-core/src/test/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator b/core/src/test/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator
similarity index 100%
rename from spring-cloud-core/src/test/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator
rename to core/src/test/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator
diff --git a/spring-cloud-service-connector/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/log4j.properties
rename to core/src/test/resources/log4j.properties
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..f3921dc
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,16 @@
+<?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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework.cloud</groupId>
+	<artifactId>cloud</artifactId>
+	<packaging>pom</packaging>
+	<name>Spring Cloud</name>
+	<version>0.1.0-BUILD-SNAPSHOT</version>
+
+	<modules>
+		<module>core</module>
+		<module>spring-service-connector</module>
+		<module>cloudfoundry-connector</module>
+	</modules>
+</project>
diff --git a/spring-cloud-service-connector/README.md b/spring-service-connector/README.md
similarity index 100%
rename from spring-cloud-service-connector/README.md
rename to spring-service-connector/README.md
diff --git a/spring-cloud-service-connector/pom.xml b/spring-service-connector/pom.xml
similarity index 95%
rename from spring-cloud-service-connector/pom.xml
rename to spring-service-connector/pom.xml
index 5e311fc..d403360 100644
--- a/spring-cloud-service-connector/pom.xml
+++ b/spring-service-connector/pom.xml
@@ -3,15 +3,15 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-cloud-service-connector</artifactId>
+	<groupId>org.springframework.cloud</groupId>
+	<artifactId>spring-service-connector</artifactId>
 	<version>1.0.0.CI-SNAPSHOT</version>
 	<packaging>jar</packaging>
-	<name>Spring Cloud</name>
+	<name>Service Connectors</name>
 	<url>http://www.springframework.org</url>
 	<description>
 		<![CDATA[
-      This project is a minimal jar utility with Spring configuration.
+	Service Connectors for DataSource and spring-data connector factories
     ]]>
 	</description>
 	<properties>
@@ -36,8 +36,8 @@
 	
 	<dependencies>
 	    <dependency>
-	        	<groupId>org.springframework</groupId>
-			<artifactId>spring-cloud-core</artifactId>
+	        	<groupId>org.springframework.cloud</groupId>
+			<artifactId>core</artifactId>
 			<version>1.0.0.CI-SNAPSHOT</version>
 	    </dependency>
 		<dependency>
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractCloudServiceFactoryParser.java b/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractCloudServiceFactoryParser.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractCloudServiceFactoryParser.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractCloudServiceFactoryParser.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractNestedElementCloudServiceFactoryParser.java b/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractNestedElementCloudServiceFactoryParser.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractNestedElementCloudServiceFactoryParser.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractNestedElementCloudServiceFactoryParser.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractPoolingCloudServiceFactoryParser.java b/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractPoolingCloudServiceFactoryParser.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractPoolingCloudServiceFactoryParser.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractPoolingCloudServiceFactoryParser.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParser.java b/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParser.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParser.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParser.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudMongoDbFactoryParser.java b/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudMongoDbFactoryParser.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudMongoDbFactoryParser.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudMongoDbFactoryParser.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudNamespaceHandler.java b/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudNamespaceHandler.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudNamespaceHandler.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudNamespaceHandler.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudPropertiesFactoryBean.java b/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudPropertiesFactoryBean.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudPropertiesFactoryBean.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudPropertiesFactoryBean.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRabbitConnectionFactoryParser.java b/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRabbitConnectionFactoryParser.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRabbitConnectionFactoryParser.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRabbitConnectionFactoryParser.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRedisConnectionFactoryParser.java b/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRedisConnectionFactoryParser.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRedisConnectionFactoryParser.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRedisConnectionFactoryParser.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudServicesScanner.java b/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudServicesScanner.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudServicesScanner.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudServicesScanner.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/GenericCloudServiceFactoryParser.java b/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/GenericCloudServiceFactoryParser.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/config/xml/GenericCloudServiceFactoryParser.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/config/xml/GenericCloudServiceFactoryParser.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactory.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactory.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactory.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactory.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactory.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactory.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactory.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactory.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfig.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfig.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfig.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfig.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfigurer.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfigurer.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfigurer.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfigurer.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/Util.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/Util.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/Util.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/Util.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryConfig.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryConfig.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryConfig.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryConfig.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryCreator.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryCreator.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryCreator.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryCreator.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryFactory.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryFactory.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryFactory.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryFactory.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/document/MongoServiceInfo.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoServiceInfo.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/document/MongoServiceInfo.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoServiceInfo.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryConfigurer.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryConfigurer.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryConfigurer.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryConfigurer.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryCreator.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryCreator.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryCreator.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryCreator.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryFactory.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryFactory.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryFactory.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryFactory.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisServiceInfo.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisServiceInfo.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisServiceInfo.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisServiceInfo.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryConfig.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryConfig.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryConfig.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryConfig.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryCreator.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryCreator.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryCreator.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryCreator.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryFactory.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryFactory.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryFactory.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryFactory.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitServiceInfo.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitServiceInfo.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitServiceInfo.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitServiceInfo.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/CloudDataSourceFactory.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/CloudDataSourceFactory.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/CloudDataSourceFactory.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/relational/CloudDataSourceFactory.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfig.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfig.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfig.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfig.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfigurer.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfigurer.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfigurer.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfigurer.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceCreator.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceCreator.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceCreator.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceCreator.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/MysqlDataSourceCreator.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/MysqlDataSourceCreator.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/MysqlDataSourceCreator.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/relational/MysqlDataSourceCreator.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/MysqlServiceInfo.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/MysqlServiceInfo.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/MysqlServiceInfo.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/relational/MysqlServiceInfo.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/PostgresqlDataSourceCreator.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/PostgresqlDataSourceCreator.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/PostgresqlDataSourceCreator.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/relational/PostgresqlDataSourceCreator.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/PostgresqlServiceInfo.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/PostgresqlServiceInfo.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/PostgresqlServiceInfo.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/relational/PostgresqlServiceInfo.java
diff --git a/spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/RelationalServiceInfo.java b/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/RelationalServiceInfo.java
similarity index 100%
rename from spring-cloud-service-connector/src/main/java/org/springframework/cloud/service/relational/RelationalServiceInfo.java
rename to spring-service-connector/src/main/java/org/springframework/cloud/service/relational/RelationalServiceInfo.java
diff --git a/spring-cloud-service-connector/src/main/resources/META-INF/cloud/cloud-services b/spring-service-connector/src/main/resources/META-INF/cloud/cloud-services
similarity index 100%
rename from spring-cloud-service-connector/src/main/resources/META-INF/cloud/cloud-services
rename to spring-service-connector/src/main/resources/META-INF/cloud/cloud-services
diff --git a/spring-cloud-service-connector/src/main/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator b/spring-service-connector/src/main/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator
similarity index 100%
rename from spring-cloud-service-connector/src/main/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator
rename to spring-service-connector/src/main/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator
diff --git a/spring-cloud-service-connector/src/main/resources/META-INF/spring.handlers b/spring-service-connector/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from spring-cloud-service-connector/src/main/resources/META-INF/spring.handlers
rename to spring-service-connector/src/main/resources/META-INF/spring.handlers
diff --git a/spring-cloud-service-connector/src/main/resources/META-INF/spring.schemas b/spring-service-connector/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from spring-cloud-service-connector/src/main/resources/META-INF/spring.schemas
rename to spring-service-connector/src/main/resources/META-INF/spring.schemas
diff --git a/spring-cloud-service-connector/src/main/resources/META-INF/spring.tooling b/spring-service-connector/src/main/resources/META-INF/spring.tooling
similarity index 100%
rename from spring-cloud-service-connector/src/main/resources/META-INF/spring.tooling
rename to spring-service-connector/src/main/resources/META-INF/spring.tooling
diff --git a/spring-cloud-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.gif b/spring-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.gif
similarity index 100%
rename from spring-cloud-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.gif
rename to spring-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.gif
diff --git a/spring-cloud-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.xsd b/spring-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.xsd
similarity index 100%
rename from spring-cloud-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.xsd
rename to spring-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.xsd
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/CloudTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/CloudTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/CloudTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/CloudTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/StubCloudConnectorTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/StubCloudConnectorTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/StubCloudConnectorTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/StubCloudConnectorTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/AbstractCloudServiceConnectorFactoryParserTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/AbstractCloudServiceConnectorFactoryParserTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/AbstractCloudServiceConnectorFactoryParserTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/config/xml/AbstractCloudServiceConnectorFactoryParserTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudAllServicesTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudAllServicesTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudAllServicesTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudAllServicesTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParserMysqlTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParserMysqlTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParserMysqlTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParserMysqlTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParserPostgresqlTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParserPostgresqlTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParserPostgresqlTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParserPostgresqlTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParserTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParserTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParserTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParserTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudMongoDbFactoryParserTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudMongoDbFactoryParserTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudMongoDbFactoryParserTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudMongoDbFactoryParserTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudPropertiesTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudPropertiesTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudPropertiesTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudPropertiesTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudRabbitConnectionFactoryParserTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudRabbitConnectionFactoryParserTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudRabbitConnectionFactoryParserTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudRabbitConnectionFactoryParserTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudRedisConnectionFactoryParserTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudRedisConnectionFactoryParserTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudRedisConnectionFactoryParserTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudRedisConnectionFactoryParserTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudScanTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudScanTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudScanTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudScanTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/GenericCloudServiceFactoryParserTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/GenericCloudServiceFactoryParserTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/config/xml/GenericCloudServiceFactoryParserTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/config/xml/GenericCloudServiceFactoryParserTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactoryTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactoryTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactoryTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactoryTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactoryTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactoryTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactoryTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactoryTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoDbFactoryFactoryTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoDbFactoryFactoryTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoDbFactoryFactoryTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoDbFactoryFactoryTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoServiceConnectorCreatorTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoServiceConnectorCreatorTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoServiceConnectorCreatorTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoServiceConnectorCreatorTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryCreatorTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryCreatorTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryCreatorTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryCreatorTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryFactoryTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryFactoryTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryFactoryTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryFactoryTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitServiceInfoTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitServiceInfoTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitServiceInfoTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitServiceInfoTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisConnectionFactoryFactoryTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisConnectionFactoryFactoryTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisConnectionFactoryFactoryTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisConnectionFactoryFactoryTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisServiceConnectorCreatorTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisServiceConnectorCreatorTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisServiceConnectorCreatorTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisServiceConnectorCreatorTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceCreatorTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceCreatorTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceCreatorTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceCreatorTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceFactoryTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceFactoryTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceFactoryTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceFactoryTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlDataSourceFactoryTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlDataSourceFactoryTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlDataSourceFactoryTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlDataSourceFactoryTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlDataSourceFactoryTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlDataSourceFactoryTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlDataSourceFactoryTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlDataSourceFactoryTest.java
diff --git a/spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlServiceCreatorTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlServiceCreatorTest.java
similarity index 100%
rename from spring-cloud-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlServiceCreatorTest.java
rename to spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlServiceCreatorTest.java
diff --git a/spring-cloudfoundry-connector/src/test/resources/log4j.properties b/spring-service-connector/src/test/resources/log4j.properties
similarity index 100%
rename from spring-cloudfoundry-connector/src/test/resources/log4j.properties
rename to spring-service-connector/src/test/resources/log4j.properties
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-all-services.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-all-services.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-all-services.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-all-services.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-config.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-config.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-config.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-config.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-service-id.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-service-id.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-service-id.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-service-id.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-without-service-id.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-without-service-id.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-without-service-id.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-without-service-id.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-with-service-id.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-with-service-id.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-with-service-id.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-with-service-id.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-without-service-id.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-without-service-id.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-without-service-id.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-without-service-id.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-config.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-config.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-config.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-config.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-service-id.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-service-id.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-service-id.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-service-id.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-without-service-id.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-without-service-id.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-without-service-id.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-without-service-id.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-properties.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-properties.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-properties.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-properties.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-config.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-config.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-config.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-config.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-service-id.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-service-id.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-service-id.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-service-id.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-without-service-id.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-without-service-id.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-without-service-id.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-without-service-id.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-config.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-config.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-config.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-config.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-service-id.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-service-id.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-service-id.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-service-id.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-without-service-id.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-without-service-id.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-without-service-id.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-without-service-id.xml
diff --git a/spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-scan.xml b/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-scan.xml
similarity index 100%
rename from spring-cloud-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-scan.xml
rename to spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-scan.xml