diff --git a/README.md b/README.md
index 7e838cf..7dfdc79 100644
--- a/README.md
+++ b/README.md
@@ -9,10 +9,10 @@ The core concepts used in this project are:
 
 The project comprises of four subprojects:
 
-1. **[core](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](spring-service-connector)**: Library that provides service connectors creators for javax.sql.DataSource and various connection factories spring-data projects.
-3. **[cloudfoundry-connector](cloudfoundry-connector)**: Cloud connector for [Cloud Foundry](http://www.cloudfoundry.com).
-4. **[heroku-connector](heroku-connector)**: Cloud connector for [Heroku](http://www.heroku.com).
+1. **[core](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-service-connector](spring-cloud-spring-service-connector)**: Library that provides service connectors creators for javax.sql.DataSource and various connection factories spring-data projects.
+3. **[cloudfoundry-connector](spring-cloud-cloudfoundry-connector)**: Cloud connector for [Cloud Foundry](http://www.cloudfoundry.com).
+4. **[heroku-connector](spring-cloud-heroku-connector)**: Cloud connector for [Heroku](http://www.heroku.com).
 
 Getting Started
 ===============
@@ -30,7 +30,7 @@ Add the Spring Maven repository to your pom.xml
 Spring apps
 -----------
 
-Add the [`spring-service-connector`](spring-service-connector) and one or more cloud connectors dependencies (it is okay to add more that one cloud connectors):
+Add the [`spring-service-connector`](spring-cloud-spring-service-connector) and one or more cloud connectors dependencies (it is okay to add more that one cloud connectors):
 
     <dependency>
     	<groupId>org.springframework.cloud</groupId>
@@ -50,7 +50,7 @@ Add the [`spring-service-connector`](spring-service-connector) and one or more c
     	<version>0.9.2</version>
     </dependency>
 
-Then follow instructions on [how you use the Java config and `<cloud>` namespace](spring-service-connector). You can also follow the [instructions](core) on using the core API directly.
+Then follow instructions on [how you use the Java config and `<cloud>` namespace](spring-cloud-spring-service-connector). You can also follow the [instructions](spring-cloud-core) on using the core API directly.
 
 Non-spring apps
 ---------------
@@ -74,4 +74,4 @@ Add the [`core`](core) and one or more cloud connectors dependencies (it is okay
     	<version>0.9.2</version>
     </dependency>
 
-Then follow the [instructions](core) on using spring-cloud API.
+Then follow the [instructions](spring-cloud-core) on using spring-cloud API.
diff --git a/cloudfoundry-ups-connector/build.gradle b/cloudfoundry-ups-connector/build.gradle
deleted file mode 100644
index 95e7c50..0000000
--- a/cloudfoundry-ups-connector/build.gradle
+++ /dev/null
@@ -1,7 +0,0 @@
-description = 'Spring-Cloud Cloud Foundry User-provided Connector'
-
-dependencies {
-    compile project(':cloudfoundry-connector')
-    testCompile project(path: ':cloudfoundry-connector', configuration: 'tests')
-}
-
diff --git a/gradle.properties b/gradle.properties
index 28c25e3..04a0e61 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-version=0.9.11.BUILD-SNAPSHOT
+version=0.9.12.BUILD-SNAPSHOT
 group=org.springframework.cloud
diff --git a/settings.gradle b/settings.gradle
index f2347b0..59143b4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,7 @@
 rootProject.name = "spring-cloud"
 
-include 'core'
-include 'cloudfoundry-connector'
-include 'cloudfoundry-ups-connector'
-include 'spring-service-connector'
-include 'heroku-connector'
\ No newline at end of file
+include "${rootProject.name}-core"
+include "${rootProject.name}-cloudfoundry-connector"
+include "${rootProject.name}-cloudfoundry-ups-connector"
+include "${rootProject.name}-spring-service-connector"
+include "${rootProject.name}-heroku-connector"
\ No newline at end of file
diff --git a/cloudfoundry-connector/.gitignore b/spring-cloud-cloudfoundry-connector/.gitignore
similarity index 100%
rename from cloudfoundry-connector/.gitignore
rename to spring-cloud-cloudfoundry-connector/.gitignore
diff --git a/cloudfoundry-connector/README.md b/spring-cloud-cloudfoundry-connector/README.md
similarity index 89%
rename from cloudfoundry-connector/README.md
rename to spring-cloud-cloudfoundry-connector/README.md
index 86b9c22..b7fc703 100644
--- a/cloudfoundry-connector/README.md
+++ b/spring-cloud-cloudfoundry-connector/README.md
@@ -7,11 +7,11 @@ Supporting additional services
 ------------------------------
 The cloudfoundry-connector offers extending support for additional services 
 through the same [`ServiceLoader`](http://docs.oracle.com/javase/7/docs/api/java/util/ServiceLoader.html) 
-mechanism used in the [core](../core) project. 
-It allows extending to new services without modifying the [cloudfoundry-connector](../cloudfoundry-connector)
+mechanism used in the [core](../spring-cloud-core) project. 
+It allows extending to new services without modifying the [cloudfoundry-connector](../spring-cloud-cloudfoundry-connector)
 itself. All you need to do is:
 
-1. Create a new project declaring dependency of [cloudfoundry-connector](../cloudfoundry-connector).
+1. Create a new project declaring dependency of [cloudfoundry-connector](../spring-cloud-cloudfoundry-connector).
 2. Add one implementation of [`CloudFoundryServiceInfoCreator`](src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java) 
    for each service type you wish to extend. 
    Along the way, you will, of course, add an implementation of [`ServiceInfo`](../core/main/java/org/springframework/cloud/service/ServiceInfo.java) 
diff --git a/cloudfoundry-connector/build.gradle b/spring-cloud-cloudfoundry-connector/build.gradle
similarity index 96%
rename from cloudfoundry-connector/build.gradle
rename to spring-cloud-cloudfoundry-connector/build.gradle
index b9b2c06..7d8d955 100644
--- a/cloudfoundry-connector/build.gradle
+++ b/spring-cloud-cloudfoundry-connector/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'shadow'
 apply from: "publish-maven.gradle"
 
 dependencies {
-  compile project(':core')
+  compile project(':spring-cloud-core')
   compile("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
   compile("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
 }
diff --git a/cloudfoundry-connector/publish-maven.gradle b/spring-cloud-cloudfoundry-connector/publish-maven.gradle
similarity index 100%
rename from cloudfoundry-connector/publish-maven.gradle
rename to spring-cloud-cloudfoundry-connector/publish-maven.gradle
diff --git a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/AmqpServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/AmqpServiceInfoCreator.java
similarity index 100%
rename from cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/AmqpServiceInfoCreator.java
rename to spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/AmqpServiceInfoCreator.java
diff --git a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/ApplicationInstanceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/ApplicationInstanceInfoCreator.java
similarity index 100%
rename from cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/ApplicationInstanceInfoCreator.java
rename to spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/ApplicationInstanceInfoCreator.java
diff --git a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnector.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnector.java
similarity index 100%
rename from cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnector.java
rename to spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnector.java
diff --git a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java
similarity index 100%
rename from cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java
rename to spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java
diff --git a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java
similarity index 100%
rename from cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java
rename to spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java
diff --git a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MonitoringServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MonitoringServiceInfoCreator.java
similarity index 100%
rename from cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MonitoringServiceInfoCreator.java
rename to spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MonitoringServiceInfoCreator.java
diff --git a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MysqlServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MysqlServiceInfoCreator.java
similarity index 100%
rename from cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MysqlServiceInfoCreator.java
rename to spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MysqlServiceInfoCreator.java
diff --git a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/PostgresqlServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/PostgresqlServiceInfoCreator.java
similarity index 100%
rename from cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/PostgresqlServiceInfoCreator.java
rename to spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/PostgresqlServiceInfoCreator.java
diff --git a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RedisServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RedisServiceInfoCreator.java
similarity index 100%
rename from cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RedisServiceInfoCreator.java
rename to spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RedisServiceInfoCreator.java
diff --git a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RelationalServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RelationalServiceInfoCreator.java
similarity index 100%
rename from cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RelationalServiceInfoCreator.java
rename to spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/RelationalServiceInfoCreator.java
diff --git a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/SmtpServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/SmtpServiceInfoCreator.java
similarity index 100%
rename from cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/SmtpServiceInfoCreator.java
rename to spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/SmtpServiceInfoCreator.java
diff --git a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/Tags.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/Tags.java
similarity index 100%
rename from cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/Tags.java
rename to spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/Tags.java
diff --git a/cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.CloudConnector b/spring-cloud-cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.CloudConnector
similarity index 100%
rename from cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.CloudConnector
rename to spring-cloud-cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.CloudConnector
diff --git a/cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator b/spring-cloud-cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator
similarity index 100%
rename from cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator
rename to spring-cloud-cloudfoundry-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator
diff --git a/cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractCloudFoundryConnectorRelationalServiceTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractCloudFoundryConnectorRelationalServiceTest.java
similarity index 100%
rename from cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractCloudFoundryConnectorRelationalServiceTest.java
rename to spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractCloudFoundryConnectorRelationalServiceTest.java
diff --git a/cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractCloudFoundryConnectorTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractCloudFoundryConnectorTest.java
similarity index 100%
rename from cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractCloudFoundryConnectorTest.java
rename to spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractCloudFoundryConnectorTest.java
diff --git a/cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorAmqpServiceTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorAmqpServiceTest.java
similarity index 100%
rename from cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorAmqpServiceTest.java
rename to spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorAmqpServiceTest.java
diff --git a/cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorApplicationTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorApplicationTest.java
similarity index 100%
rename from cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorApplicationTest.java
rename to spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorApplicationTest.java
diff --git a/cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorMongodbServiceTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorMongodbServiceTest.java
similarity index 100%
rename from cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorMongodbServiceTest.java
rename to spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorMongodbServiceTest.java
diff --git a/cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorMonitoringServiceTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorMonitoringServiceTest.java
similarity index 100%
rename from cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorMonitoringServiceTest.java
rename to spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorMonitoringServiceTest.java
diff --git a/cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorMysqlServiceTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorMysqlServiceTest.java
similarity index 100%
rename from cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorMysqlServiceTest.java
rename to spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorMysqlServiceTest.java
diff --git a/cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorPostgresqlServiceTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorPostgresqlServiceTest.java
similarity index 100%
rename from cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorPostgresqlServiceTest.java
rename to spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorPostgresqlServiceTest.java
diff --git a/cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorRedisServiceTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorRedisServiceTest.java
similarity index 100%
rename from cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorRedisServiceTest.java
rename to spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorRedisServiceTest.java
diff --git a/cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorSmtpServiceTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorSmtpServiceTest.java
similarity index 100%
rename from cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorSmtpServiceTest.java
rename to spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/CloudFoundryConnectorSmtpServiceTest.java
diff --git a/cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/TagsTest.java b/spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/TagsTest.java
similarity index 100%
rename from cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/TagsTest.java
rename to spring-cloud-cloudfoundry-connector/src/test/java/org/springframework/cloud/cloudfoundry/TagsTest.java
diff --git a/cloudfoundry-connector/src/test/resources/log4j.properties b/spring-cloud-cloudfoundry-connector/src/test/resources/log4j.properties
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/log4j.properties
rename to spring-cloud-cloudfoundry-connector/src/test/resources/log4j.properties
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-application-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-application-info.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-application-info.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-application-info.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info-no-label-no-tags.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info-no-label-no-tags.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info-no-label-no-tags.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info-no-label-no-tags.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-monitoring-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-monitoring-info.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-monitoring-info.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-monitoring-info.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-no-label-no-tags.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-no-label-no-tags.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-no-label-no-tags.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-no-label-no-tags.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-tags.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-tags.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-tags.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-tags.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-uri.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-uri.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-uri.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-uri.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info-no-label-no-tags.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info-no-label-no-tags.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info-no-label-no-tags.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info-no-label-no-tags.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-rabbit-info-no-label-no-tags.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-rabbit-info-no-label-no-tags.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-rabbit-info-no-label-no-tags.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-rabbit-info-no-label-no-tags.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-rabbit-info-with-label-no-tags.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-rabbit-info-with-label-no-tags.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-rabbit-info-with-label-no-tags.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-rabbit-info-with-label-no-tags.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-rabbit-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-rabbit-info.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-rabbit-info.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-rabbit-info.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info-no-label-no-tags.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info-no-label-no-tags.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info-no-label-no-tags.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info-no-label-no-tags.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info.json
diff --git a/cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-smtp-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-smtp-info.json
similarity index 100%
rename from cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-smtp-info.json
rename to spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-smtp-info.json
diff --git a/cloudfoundry-ups-connector/.gitignore b/spring-cloud-cloudfoundry-ups-connector/.gitignore
similarity index 100%
rename from cloudfoundry-ups-connector/.gitignore
rename to spring-cloud-cloudfoundry-ups-connector/.gitignore
diff --git a/cloudfoundry-ups-connector/README.md b/spring-cloud-cloudfoundry-ups-connector/README.md
similarity index 100%
rename from cloudfoundry-ups-connector/README.md
rename to spring-cloud-cloudfoundry-ups-connector/README.md
diff --git a/spring-cloud-cloudfoundry-ups-connector/build.gradle b/spring-cloud-cloudfoundry-ups-connector/build.gradle
new file mode 100644
index 0000000..51b11c7
--- /dev/null
+++ b/spring-cloud-cloudfoundry-ups-connector/build.gradle
@@ -0,0 +1,7 @@
+description = 'Spring-Cloud Cloud Foundry User-provided Connector'
+
+dependencies {
+    compile project(':spring-cloud-cloudfoundry-connector')
+    testCompile project(path: ':spring-cloud-cloudfoundry-connector', configuration: 'tests')
+}
+
diff --git a/cloudfoundry-ups-connector/src/main/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreator.java b/spring-cloud-cloudfoundry-ups-connector/src/main/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreator.java
similarity index 100%
rename from cloudfoundry-ups-connector/src/main/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreator.java
rename to spring-cloud-cloudfoundry-ups-connector/src/main/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreator.java
diff --git a/cloudfoundry-ups-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator b/spring-cloud-cloudfoundry-ups-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator
similarity index 100%
rename from cloudfoundry-ups-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator
rename to spring-cloud-cloudfoundry-ups-connector/src/main/resources/META-INF/services/org.springframework.cloud.cloudfoundry.CloudFoundryServiceInfoCreator
diff --git a/cloudfoundry-ups-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractUserProvidedServiceInfoCreatorTest.java b/spring-cloud-cloudfoundry-ups-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractUserProvidedServiceInfoCreatorTest.java
similarity index 100%
rename from cloudfoundry-ups-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractUserProvidedServiceInfoCreatorTest.java
rename to spring-cloud-cloudfoundry-ups-connector/src/test/java/org/springframework/cloud/cloudfoundry/AbstractUserProvidedServiceInfoCreatorTest.java
diff --git a/cloudfoundry-ups-connector/src/test/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreatorTest.java b/spring-cloud-cloudfoundry-ups-connector/src/test/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreatorTest.java
similarity index 100%
rename from cloudfoundry-ups-connector/src/test/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreatorTest.java
rename to spring-cloud-cloudfoundry-ups-connector/src/test/java/org/springframework/cloud/cloudfoundry/UserProvidedOracleServiceInfoCreatorTest.java
diff --git a/cloudfoundry-ups-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info-no-uri.json b/spring-cloud-cloudfoundry-ups-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info-no-uri.json
similarity index 100%
rename from cloudfoundry-ups-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info-no-uri.json
rename to spring-cloud-cloudfoundry-ups-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info-no-uri.json
diff --git a/cloudfoundry-ups-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info.json b/spring-cloud-cloudfoundry-ups-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info.json
similarity index 100%
rename from cloudfoundry-ups-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info.json
rename to spring-cloud-cloudfoundry-ups-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info.json
diff --git a/core/.gitignore b/spring-cloud-core/.gitignore
similarity index 100%
rename from core/.gitignore
rename to spring-cloud-core/.gitignore
diff --git a/core/README.md b/spring-cloud-core/README.md
similarity index 85%
rename from core/README.md
rename to spring-cloud-core/README.md
index 355e78e..52c4d45 100644
--- a/core/README.md
+++ b/spring-cloud-core/README.md
@@ -14,8 +14,8 @@ Usage pattern: Application Developers
 =====================================
 
 > **Note:** If you are using spring-cloud in a Spring application, you should consider using the 
-[Java config](../spring-service-connector#the-java-config) or the 
-[XML namespace support](../spring-service-connector#the-cloud-namespace) instead.
+[Java config](../spring-cloud-spring-service-connector#the-java-config) or the 
+[XML namespace support](../spring-cloud-spring-service-connector#the-cloud-namespace) instead.
 
 * Create a [`CloudFactory`](src/main/java/org/springframework/cloud/CloudFactory.java) instance. 
   Creation of a `CloudFactory` instance is a bit expensive, so caching such an instance is recommended.
@@ -33,7 +33,7 @@ Usage pattern: Application Developers
     ```
   Note that you must have a `CloudConnector` implementation suitable
   for the environment in which the application is being deployed in your classpath. For example, if you are
-  deploying the application in Cloud Foundry, you must add [cloudfoundry-connector](../cloudfoundry-connector) 
+  deploying the application in Cloud Foundry, you must add [cloudfoundry-connector](../spring-cloud-cloudfoundry-connector) 
   in your classpath. If no suitable `CloudConnctor` is found, the `getCloud()` method will throw a `CloudException`.
 * Use the `Cloud` instance to get access to application info, service infos, and create service 
   connectors.
@@ -54,15 +54,15 @@ A cloud provider may extends the functionality in two ways:
 
 1. Add new [`CloudConnector`](src/main/java/org/springframework/cloud/CloudConnector.java)s to make 
    spring-cloud related libraries work with a new cloud. 
-   See [cloudfoundry-connector](../cloudfoundry-connector) 
-   or [heroku-connector](../heroku-connector) for an example. 
+   See [cloudfoundry-connector](../spring-cloud-cloudfoundry-connector) 
+   or [heroku-connector](../spring-cloud-heroku-connector) for an example. 
    This is done declaratively by adding connector classes to:
     ```
     META-INF/services/org.springframework.cloud.CloudConnector
     ```
 2. Add new [`ServiceConnectorCreator`](src/main/java/org/springframework/cloud/service/ServiceConnectorCreator.java)s 
    to allow creation of service connector objects.	
-   See [spring-service-connector](../spring-service-connector) for an example. 
+   See [spring-service-connector](../spring-cloud-spring-service-connector) for an example. 
    This is done declaratively by adding creator classes to: 
    ```
     META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator
diff --git a/core/build.gradle b/spring-cloud-core/build.gradle
similarity index 100%
rename from core/build.gradle
rename to spring-cloud-core/build.gradle
diff --git a/core/src/main/java/org/springframework/cloud/AbstractCloudConnector.java b/spring-cloud-core/src/main/java/org/springframework/cloud/AbstractCloudConnector.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/AbstractCloudConnector.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/AbstractCloudConnector.java
diff --git a/core/src/main/java/org/springframework/cloud/Cloud.java b/spring-cloud-core/src/main/java/org/springframework/cloud/Cloud.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/Cloud.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/Cloud.java
diff --git a/core/src/main/java/org/springframework/cloud/CloudConnector.java b/spring-cloud-core/src/main/java/org/springframework/cloud/CloudConnector.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/CloudConnector.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/CloudConnector.java
diff --git a/core/src/main/java/org/springframework/cloud/CloudException.java b/spring-cloud-core/src/main/java/org/springframework/cloud/CloudException.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/CloudException.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/CloudException.java
diff --git a/core/src/main/java/org/springframework/cloud/CloudFactory.java b/spring-cloud-core/src/main/java/org/springframework/cloud/CloudFactory.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/CloudFactory.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/CloudFactory.java
diff --git a/core/src/main/java/org/springframework/cloud/FallbackServiceInfoCreator.java b/spring-cloud-core/src/main/java/org/springframework/cloud/FallbackServiceInfoCreator.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/FallbackServiceInfoCreator.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/FallbackServiceInfoCreator.java
diff --git a/core/src/main/java/org/springframework/cloud/ServiceInfoCreator.java b/spring-cloud-core/src/main/java/org/springframework/cloud/ServiceInfoCreator.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/ServiceInfoCreator.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/ServiceInfoCreator.java
diff --git a/core/src/main/java/org/springframework/cloud/app/ApplicationInstanceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/app/ApplicationInstanceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/app/ApplicationInstanceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/app/ApplicationInstanceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/app/BasicApplicationInstanceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/app/BasicApplicationInstanceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/app/BasicApplicationInstanceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/app/BasicApplicationInstanceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/service/AbstractServiceConnectorCreator.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/AbstractServiceConnectorCreator.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/AbstractServiceConnectorCreator.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/AbstractServiceConnectorCreator.java
diff --git a/core/src/main/java/org/springframework/cloud/service/BaseServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/BaseServiceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/BaseServiceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/BaseServiceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/service/CloudServiceConnectorFactory.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/CloudServiceConnectorFactory.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/CloudServiceConnectorFactory.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/CloudServiceConnectorFactory.java
diff --git a/core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfig.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfig.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfig.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfig.java
diff --git a/core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfigurer.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfigurer.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfigurer.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorConfigurer.java
diff --git a/core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreationException.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreationException.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreationException.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreationException.java
diff --git a/core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreator.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreator.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreator.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceConnectorCreator.java
diff --git a/core/src/main/java/org/springframework/cloud/service/ServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/ServiceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/ServiceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/service/UriBasedServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/UriBasedServiceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/UriBasedServiceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/UriBasedServiceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/service/common/AmqpServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/AmqpServiceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/common/AmqpServiceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/common/AmqpServiceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/service/common/MongoServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/MongoServiceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/common/MongoServiceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/common/MongoServiceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/service/common/MonitoringServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/MonitoringServiceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/common/MonitoringServiceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/common/MonitoringServiceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/service/common/MysqlServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/MysqlServiceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/common/MysqlServiceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/common/MysqlServiceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/service/common/OracleServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/OracleServiceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/common/OracleServiceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/common/OracleServiceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/service/common/PostgresqlServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/PostgresqlServiceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/common/PostgresqlServiceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/common/PostgresqlServiceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/service/common/RedisServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/RedisServiceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/common/RedisServiceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/common/RedisServiceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/service/common/RelationalServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/RelationalServiceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/common/RelationalServiceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/common/RelationalServiceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/service/common/SmtpServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/SmtpServiceInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/service/common/SmtpServiceInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/service/common/SmtpServiceInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/util/EnvironmentAccessor.java b/spring-cloud-core/src/main/java/org/springframework/cloud/util/EnvironmentAccessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/util/EnvironmentAccessor.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/util/EnvironmentAccessor.java
diff --git a/core/src/main/java/org/springframework/cloud/util/ServiceLoaderWithExceptionControl.java b/spring-cloud-core/src/main/java/org/springframework/cloud/util/ServiceLoaderWithExceptionControl.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/util/ServiceLoaderWithExceptionControl.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/util/ServiceLoaderWithExceptionControl.java
diff --git a/core/src/main/java/org/springframework/cloud/util/StandardUriInfoFactory.java b/spring-cloud-core/src/main/java/org/springframework/cloud/util/StandardUriInfoFactory.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/util/StandardUriInfoFactory.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/util/StandardUriInfoFactory.java
diff --git a/core/src/main/java/org/springframework/cloud/util/UriInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/util/UriInfo.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/util/UriInfo.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/util/UriInfo.java
diff --git a/core/src/main/java/org/springframework/cloud/util/UriInfoFactory.java b/spring-cloud-core/src/main/java/org/springframework/cloud/util/UriInfoFactory.java
similarity index 100%
rename from core/src/main/java/org/springframework/cloud/util/UriInfoFactory.java
rename to spring-cloud-core/src/main/java/org/springframework/cloud/util/UriInfoFactory.java
diff --git a/core/src/test/java/org/springframework/cloud/AbstractCloudConnectorTest.java b/spring-cloud-core/src/test/java/org/springframework/cloud/AbstractCloudConnectorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/cloud/AbstractCloudConnectorTest.java
rename to spring-cloud-core/src/test/java/org/springframework/cloud/AbstractCloudConnectorTest.java
diff --git a/core/src/test/java/org/springframework/cloud/CloudFactoryTest.java b/spring-cloud-core/src/test/java/org/springframework/cloud/CloudFactoryTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/cloud/CloudFactoryTest.java
rename to spring-cloud-core/src/test/java/org/springframework/cloud/CloudFactoryTest.java
diff --git a/core/src/test/java/org/springframework/cloud/CloudTest.java b/spring-cloud-core/src/test/java/org/springframework/cloud/CloudTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/cloud/CloudTest.java
rename to spring-cloud-core/src/test/java/org/springframework/cloud/CloudTest.java
diff --git a/core/src/test/java/org/springframework/cloud/CloudTestUtil.java b/spring-cloud-core/src/test/java/org/springframework/cloud/CloudTestUtil.java
similarity index 100%
rename from core/src/test/java/org/springframework/cloud/CloudTestUtil.java
rename to spring-cloud-core/src/test/java/org/springframework/cloud/CloudTestUtil.java
diff --git a/core/src/test/java/org/springframework/cloud/NonParameterizedStubServiceConnectorCreator.java b/spring-cloud-core/src/test/java/org/springframework/cloud/NonParameterizedStubServiceConnectorCreator.java
similarity index 100%
rename from core/src/test/java/org/springframework/cloud/NonParameterizedStubServiceConnectorCreator.java
rename to spring-cloud-core/src/test/java/org/springframework/cloud/NonParameterizedStubServiceConnectorCreator.java
diff --git a/core/src/test/java/org/springframework/cloud/StandardUriInfoFactoryTest.java b/spring-cloud-core/src/test/java/org/springframework/cloud/StandardUriInfoFactoryTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/cloud/StandardUriInfoFactoryTest.java
rename to spring-cloud-core/src/test/java/org/springframework/cloud/StandardUriInfoFactoryTest.java
diff --git a/core/src/test/java/org/springframework/cloud/StubServiceConnector.java b/spring-cloud-core/src/test/java/org/springframework/cloud/StubServiceConnector.java
similarity index 100%
rename from core/src/test/java/org/springframework/cloud/StubServiceConnector.java
rename to spring-cloud-core/src/test/java/org/springframework/cloud/StubServiceConnector.java
diff --git a/core/src/test/java/org/springframework/cloud/StubServiceConnectorCreator.java b/spring-cloud-core/src/test/java/org/springframework/cloud/StubServiceConnectorCreator.java
similarity index 100%
rename from core/src/test/java/org/springframework/cloud/StubServiceConnectorCreator.java
rename to spring-cloud-core/src/test/java/org/springframework/cloud/StubServiceConnectorCreator.java
diff --git a/core/src/test/java/org/springframework/cloud/TestServiceInfoCreator.java b/spring-cloud-core/src/test/java/org/springframework/cloud/TestServiceInfoCreator.java
similarity index 100%
rename from core/src/test/java/org/springframework/cloud/TestServiceInfoCreator.java
rename to spring-cloud-core/src/test/java/org/springframework/cloud/TestServiceInfoCreator.java
diff --git a/core/src/test/java/org/springframework/cloud/service/common/RelationalServiceInfoTest.java b/spring-cloud-core/src/test/java/org/springframework/cloud/service/common/RelationalServiceInfoTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/cloud/service/common/RelationalServiceInfoTest.java
rename to spring-cloud-core/src/test/java/org/springframework/cloud/service/common/RelationalServiceInfoTest.java
diff --git a/core/src/test/resources/META-INF/services/org.springframework.cloud.CloudConnector b/spring-cloud-core/src/test/resources/META-INF/services/org.springframework.cloud.CloudConnector
similarity index 100%
rename from core/src/test/resources/META-INF/services/org.springframework.cloud.CloudConnector
rename to spring-cloud-core/src/test/resources/META-INF/services/org.springframework.cloud.CloudConnector
diff --git a/core/src/test/resources/META-INF/services/org.springframework.cloud.TestServiceInfoCreator b/spring-cloud-core/src/test/resources/META-INF/services/org.springframework.cloud.TestServiceInfoCreator
similarity index 100%
rename from core/src/test/resources/META-INF/services/org.springframework.cloud.TestServiceInfoCreator
rename to spring-cloud-core/src/test/resources/META-INF/services/org.springframework.cloud.TestServiceInfoCreator
diff --git a/core/src/test/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator b/spring-cloud-core/src/test/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator
similarity index 100%
rename from core/src/test/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator
rename to spring-cloud-core/src/test/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator
diff --git a/core/src/test/resources/log4j.properties b/spring-cloud-core/src/test/resources/log4j.properties
similarity index 100%
rename from core/src/test/resources/log4j.properties
rename to spring-cloud-core/src/test/resources/log4j.properties
diff --git a/heroku-connector/.gitignore b/spring-cloud-heroku-connector/.gitignore
similarity index 100%
rename from heroku-connector/.gitignore
rename to spring-cloud-heroku-connector/.gitignore
diff --git a/heroku-connector/README.md b/spring-cloud-heroku-connector/README.md
similarity index 89%
rename from heroku-connector/README.md
rename to spring-cloud-heroku-connector/README.md
index 35f27cd..2ad1b06 100644
--- a/heroku-connector/README.md
+++ b/spring-cloud-heroku-connector/README.md
@@ -6,7 +6,7 @@ coming soon; PR requests welcome).
 
 Supporting additional services
 ------------------------------
-Please see the documentation for [cloudfoundry-connector](../cloudfoundry-connector), since the same 
+Please see the documentation for [cloudfoundry-connector](../spring-cloud-cloudfoundry-connector), since the same 
 mechanism applies to any cloud connector.
 
 Limitations
diff --git a/heroku-connector/build.gradle b/spring-cloud-heroku-connector/build.gradle
similarity index 61%
rename from heroku-connector/build.gradle
rename to spring-cloud-heroku-connector/build.gradle
index 62eceac..5d49b06 100644
--- a/heroku-connector/build.gradle
+++ b/spring-cloud-heroku-connector/build.gradle
@@ -1,5 +1,5 @@
 description = 'Spring-Cloud Heroku Connector'
 
 dependencies {
-  compile project(':core')
+  compile project(':spring-cloud-core')
 }
diff --git a/heroku-connector/src/main/java/org/springframework/cloud/heroku/AmqpServiceInfoCreator.java b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/AmqpServiceInfoCreator.java
similarity index 100%
rename from heroku-connector/src/main/java/org/springframework/cloud/heroku/AmqpServiceInfoCreator.java
rename to spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/AmqpServiceInfoCreator.java
diff --git a/heroku-connector/src/main/java/org/springframework/cloud/heroku/ApplicationInstanceInfoCreator.java b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/ApplicationInstanceInfoCreator.java
similarity index 100%
rename from heroku-connector/src/main/java/org/springframework/cloud/heroku/ApplicationInstanceInfoCreator.java
rename to spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/ApplicationInstanceInfoCreator.java
diff --git a/heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuConnector.java b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuConnector.java
similarity index 100%
rename from heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuConnector.java
rename to spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuConnector.java
diff --git a/heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuServiceInfoCreator.java b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuServiceInfoCreator.java
similarity index 100%
rename from heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuServiceInfoCreator.java
rename to spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuServiceInfoCreator.java
diff --git a/heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuUtil.java b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuUtil.java
similarity index 100%
rename from heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuUtil.java
rename to spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuUtil.java
diff --git a/heroku-connector/src/main/java/org/springframework/cloud/heroku/MongoServiceInfoCreator.java b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/MongoServiceInfoCreator.java
similarity index 100%
rename from heroku-connector/src/main/java/org/springframework/cloud/heroku/MongoServiceInfoCreator.java
rename to spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/MongoServiceInfoCreator.java
diff --git a/heroku-connector/src/main/java/org/springframework/cloud/heroku/MysqlServiceInfoCreator.java b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/MysqlServiceInfoCreator.java
similarity index 100%
rename from heroku-connector/src/main/java/org/springframework/cloud/heroku/MysqlServiceInfoCreator.java
rename to spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/MysqlServiceInfoCreator.java
diff --git a/heroku-connector/src/main/java/org/springframework/cloud/heroku/PostgresqlServiceInfoCreator.java b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/PostgresqlServiceInfoCreator.java
similarity index 100%
rename from heroku-connector/src/main/java/org/springframework/cloud/heroku/PostgresqlServiceInfoCreator.java
rename to spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/PostgresqlServiceInfoCreator.java
diff --git a/heroku-connector/src/main/java/org/springframework/cloud/heroku/RedisServiceInfoCreator.java b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/RedisServiceInfoCreator.java
similarity index 100%
rename from heroku-connector/src/main/java/org/springframework/cloud/heroku/RedisServiceInfoCreator.java
rename to spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/RedisServiceInfoCreator.java
diff --git a/heroku-connector/src/main/java/org/springframework/cloud/heroku/RelationalServiceInfoCreator.java b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/RelationalServiceInfoCreator.java
similarity index 100%
rename from heroku-connector/src/main/java/org/springframework/cloud/heroku/RelationalServiceInfoCreator.java
rename to spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/RelationalServiceInfoCreator.java
diff --git a/heroku-connector/src/main/resources/META-INF/services/org.springframework.cloud.CloudConnector b/spring-cloud-heroku-connector/src/main/resources/META-INF/services/org.springframework.cloud.CloudConnector
similarity index 100%
rename from heroku-connector/src/main/resources/META-INF/services/org.springframework.cloud.CloudConnector
rename to spring-cloud-heroku-connector/src/main/resources/META-INF/services/org.springframework.cloud.CloudConnector
diff --git a/heroku-connector/src/main/resources/META-INF/services/org.springframework.cloud.heroku.HerokuServiceInfoCreator b/spring-cloud-heroku-connector/src/main/resources/META-INF/services/org.springframework.cloud.heroku.HerokuServiceInfoCreator
similarity index 100%
rename from heroku-connector/src/main/resources/META-INF/services/org.springframework.cloud.heroku.HerokuServiceInfoCreator
rename to spring-cloud-heroku-connector/src/main/resources/META-INF/services/org.springframework.cloud.heroku.HerokuServiceInfoCreator
diff --git a/heroku-connector/src/test/java/org/springframework/cloud/heroku/AbstractHerokuConnectorRelationalServiceTest.java b/spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/AbstractHerokuConnectorRelationalServiceTest.java
similarity index 100%
rename from heroku-connector/src/test/java/org/springframework/cloud/heroku/AbstractHerokuConnectorRelationalServiceTest.java
rename to spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/AbstractHerokuConnectorRelationalServiceTest.java
diff --git a/heroku-connector/src/test/java/org/springframework/cloud/heroku/AbstractHerokuConnectorTest.java b/spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/AbstractHerokuConnectorTest.java
similarity index 100%
rename from heroku-connector/src/test/java/org/springframework/cloud/heroku/AbstractHerokuConnectorTest.java
rename to spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/AbstractHerokuConnectorTest.java
diff --git a/heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorAmqpServiceTest.java b/spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorAmqpServiceTest.java
similarity index 100%
rename from heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorAmqpServiceTest.java
rename to spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorAmqpServiceTest.java
diff --git a/heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorApplicationTest.java b/spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorApplicationTest.java
similarity index 100%
rename from heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorApplicationTest.java
rename to spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorApplicationTest.java
diff --git a/heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorMongoServiceTest.java b/spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorMongoServiceTest.java
similarity index 100%
rename from heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorMongoServiceTest.java
rename to spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorMongoServiceTest.java
diff --git a/heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorMysqlServiceTest.java b/spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorMysqlServiceTest.java
similarity index 100%
rename from heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorMysqlServiceTest.java
rename to spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorMysqlServiceTest.java
diff --git a/heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorPostgresqlServiceTest.java b/spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorPostgresqlServiceTest.java
similarity index 100%
rename from heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorPostgresqlServiceTest.java
rename to spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorPostgresqlServiceTest.java
diff --git a/heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorRedisServiceTest.java b/spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorRedisServiceTest.java
similarity index 100%
rename from heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorRedisServiceTest.java
rename to spring-cloud-heroku-connector/src/test/java/org/springframework/cloud/heroku/HerokuConnectorRedisServiceTest.java
diff --git a/heroku-connector/src/test/resources/log4j.properties b/spring-cloud-heroku-connector/src/test/resources/log4j.properties
similarity index 100%
rename from heroku-connector/src/test/resources/log4j.properties
rename to spring-cloud-heroku-connector/src/test/resources/log4j.properties
diff --git a/spring-service-connector/.gitignore b/spring-cloud-spring-service-connector/.gitignore
similarity index 100%
rename from spring-service-connector/.gitignore
rename to spring-cloud-spring-service-connector/.gitignore
diff --git a/spring-service-connector/README.md b/spring-cloud-spring-service-connector/README.md
similarity index 100%
rename from spring-service-connector/README.md
rename to spring-cloud-spring-service-connector/README.md
diff --git a/spring-service-connector/build.gradle b/spring-cloud-spring-service-connector/build.gradle
similarity index 93%
rename from spring-service-connector/build.gradle
rename to spring-cloud-spring-service-connector/build.gradle
index 3148e21..f03e574 100644
--- a/spring-service-connector/build.gradle
+++ b/spring-cloud-spring-service-connector/build.gradle
@@ -1,8 +1,8 @@
 description = 'Service Connectors'
 
 dependencies {
-  testCompile project(path: ':core', configuration: 'tests')
-  compile project(':core')
+  testCompile project(path: ':spring-cloud-core', configuration: 'tests')
+  compile project(':spring-cloud-core')
 
   compile("org.springframework:spring-context:$springVersion")
   compile("log4j:log4j:$log4jVersion")
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/CloudServicesScanner.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/CloudServicesScanner.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/CloudServicesScanner.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/CloudServicesScanner.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/java/AbstractCloudConfig.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/java/AbstractCloudConfig.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/java/AbstractCloudConfig.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/java/AbstractCloudConfig.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/java/DelegatingServiceScanConfiguration.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/java/DelegatingServiceScanConfiguration.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/java/DelegatingServiceScanConfiguration.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/java/DelegatingServiceScanConfiguration.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/java/ServiceScan.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/java/ServiceScan.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/java/ServiceScan.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/java/ServiceScan.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractCloudServiceFactoryParser.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractCloudServiceFactoryParser.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractCloudServiceFactoryParser.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractCloudServiceFactoryParser.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractNestedElementCloudServiceFactoryParser.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractNestedElementCloudServiceFactoryParser.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractNestedElementCloudServiceFactoryParser.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractNestedElementCloudServiceFactoryParser.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractPoolingCloudServiceFactoryParser.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractPoolingCloudServiceFactoryParser.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractPoolingCloudServiceFactoryParser.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/AbstractPoolingCloudServiceFactoryParser.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParser.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParser.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParser.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudDataSourceFactoryParser.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudMongoDbFactoryParser.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudMongoDbFactoryParser.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudMongoDbFactoryParser.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudMongoDbFactoryParser.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudNamespaceHandler.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudNamespaceHandler.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudNamespaceHandler.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudNamespaceHandler.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudPropertiesFactoryBean.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudPropertiesFactoryBean.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudPropertiesFactoryBean.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudPropertiesFactoryBean.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRabbitConnectionFactoryParser.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRabbitConnectionFactoryParser.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRabbitConnectionFactoryParser.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRabbitConnectionFactoryParser.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRedisConnectionFactoryParser.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRedisConnectionFactoryParser.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRedisConnectionFactoryParser.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/CloudRedisConnectionFactoryParser.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/config/xml/GenericCloudServiceFactoryParser.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/GenericCloudServiceFactoryParser.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/config/xml/GenericCloudServiceFactoryParser.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/config/xml/GenericCloudServiceFactoryParser.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactory.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactory.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactory.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactory.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactory.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactory.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactory.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactory.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfig.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfig.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfig.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfig.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfigurer.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfigurer.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfigurer.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/PooledServiceConnectorConfigurer.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/Util.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/Util.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/Util.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/Util.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryConfig.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryConfig.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryConfig.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryConfig.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryCreator.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryCreator.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryCreator.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryFactory.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryFactory.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryFactory.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/document/MongoDbFactoryFactory.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryConfigurer.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryConfigurer.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryConfigurer.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryConfigurer.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryCreator.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryCreator.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryCreator.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryFactory.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryFactory.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryFactory.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/keyval/RedisConnectionFactoryFactory.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryConfig.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryConfig.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryConfig.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryConfig.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryCreator.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryCreator.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryCreator.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryFactory.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryFactory.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryFactory.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/messaging/RabbitConnectionFactoryFactory.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/BasicDbcpPooledDataSourceCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/BasicDbcpPooledDataSourceCreator.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/relational/BasicDbcpPooledDataSourceCreator.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/BasicDbcpPooledDataSourceCreator.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/CloudDataSourceFactory.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/CloudDataSourceFactory.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/relational/CloudDataSourceFactory.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/CloudDataSourceFactory.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfig.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfig.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfig.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfig.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfigurer.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfigurer.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfigurer.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceConfigurer.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceCreator.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceCreator.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DataSourceCreator.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DbcpLikePooledDataSourceCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DbcpLikePooledDataSourceCreator.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DbcpLikePooledDataSourceCreator.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/DbcpLikePooledDataSourceCreator.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/MysqlDataSourceCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/MysqlDataSourceCreator.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/relational/MysqlDataSourceCreator.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/MysqlDataSourceCreator.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/OracleDataSourceCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/OracleDataSourceCreator.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/relational/OracleDataSourceCreator.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/OracleDataSourceCreator.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/PooledDataSourceCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/PooledDataSourceCreator.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/relational/PooledDataSourceCreator.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/PooledDataSourceCreator.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/PostgresqlDataSourceCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/PostgresqlDataSourceCreator.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/relational/PostgresqlDataSourceCreator.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/PostgresqlDataSourceCreator.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/TomcatDbcpPooledDataSourceCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/TomcatDbcpPooledDataSourceCreator.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/relational/TomcatDbcpPooledDataSourceCreator.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/TomcatDbcpPooledDataSourceCreator.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/relational/TomcatHighPerformancePooledDataSourceCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/TomcatHighPerformancePooledDataSourceCreator.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/relational/TomcatHighPerformancePooledDataSourceCreator.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/TomcatHighPerformancePooledDataSourceCreator.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/smtp/MailSenderCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/smtp/MailSenderCreator.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/smtp/MailSenderCreator.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/smtp/MailSenderCreator.java
diff --git a/spring-service-connector/src/main/java/org/springframework/cloud/service/smtp/MailSenderFactory.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/smtp/MailSenderFactory.java
similarity index 100%
rename from spring-service-connector/src/main/java/org/springframework/cloud/service/smtp/MailSenderFactory.java
rename to spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/smtp/MailSenderFactory.java
diff --git a/spring-service-connector/src/main/resources/META-INF/cloud/cloud-services b/spring-cloud-spring-service-connector/src/main/resources/META-INF/cloud/cloud-services
similarity index 100%
rename from spring-service-connector/src/main/resources/META-INF/cloud/cloud-services
rename to spring-cloud-spring-service-connector/src/main/resources/META-INF/cloud/cloud-services
diff --git a/spring-service-connector/src/main/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator b/spring-cloud-spring-service-connector/src/main/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator
similarity index 100%
rename from spring-service-connector/src/main/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator
rename to spring-cloud-spring-service-connector/src/main/resources/META-INF/services/org.springframework.cloud.service.ServiceConnectorCreator
diff --git a/spring-service-connector/src/main/resources/META-INF/spring.handlers b/spring-cloud-spring-service-connector/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from spring-service-connector/src/main/resources/META-INF/spring.handlers
rename to spring-cloud-spring-service-connector/src/main/resources/META-INF/spring.handlers
diff --git a/spring-service-connector/src/main/resources/META-INF/spring.schemas b/spring-cloud-spring-service-connector/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from spring-service-connector/src/main/resources/META-INF/spring.schemas
rename to spring-cloud-spring-service-connector/src/main/resources/META-INF/spring.schemas
diff --git a/spring-service-connector/src/main/resources/META-INF/spring.tooling b/spring-cloud-spring-service-connector/src/main/resources/META-INF/spring.tooling
similarity index 100%
rename from spring-service-connector/src/main/resources/META-INF/spring.tooling
rename to spring-cloud-spring-service-connector/src/main/resources/META-INF/spring.tooling
diff --git a/spring-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.gif b/spring-cloud-spring-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.gif
similarity index 100%
rename from spring-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.gif
rename to spring-cloud-spring-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.gif
diff --git a/spring-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.xsd b/spring-cloud-spring-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.xsd
similarity index 100%
rename from spring-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.xsd
rename to spring-cloud-spring-service-connector/src/main/resources/org/springframework/cloud/config/xml/spring-cloud.xsd
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/CloudTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/CloudTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/CloudTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/CloudTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/StubCloudConnectorTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/StubCloudConnectorTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/StubCloudConnectorTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/StubCloudConnectorTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/AbstractCloudConfigPropertiesTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/AbstractCloudConfigPropertiesTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/AbstractCloudConfigPropertiesTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/AbstractCloudConfigPropertiesTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/AbstractCloudConfigServiceScanTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/AbstractCloudConfigServiceScanTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/AbstractCloudConfigServiceScanTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/AbstractCloudConfigServiceScanTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/AbstractCloudConfigServiceTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/AbstractCloudConfigServiceTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/AbstractCloudConfigServiceTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/AbstractCloudConfigServiceTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/CommonPoolCloudConfigTestHelper.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/CommonPoolCloudConfigTestHelper.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/CommonPoolCloudConfigTestHelper.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/CommonPoolCloudConfigTestHelper.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/DataSourceCloudConfigTestHelper.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/DataSourceCloudConfigTestHelper.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/DataSourceCloudConfigTestHelper.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/DataSourceCloudConfigTestHelper.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/MongoDbFactoryCloudConfigTestHelper.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/MongoDbFactoryCloudConfigTestHelper.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/MongoDbFactoryCloudConfigTestHelper.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/MongoDbFactoryCloudConfigTestHelper.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/RabbitConnectionFactoryCloudConfigTestHelper.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/RabbitConnectionFactoryCloudConfigTestHelper.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/RabbitConnectionFactoryCloudConfigTestHelper.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/RabbitConnectionFactoryCloudConfigTestHelper.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/RedisConnectionFactoryCloudConfigTestHelper.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/RedisConnectionFactoryCloudConfigTestHelper.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/RedisConnectionFactoryCloudConfigTestHelper.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/RedisConnectionFactoryCloudConfigTestHelper.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/java/AbstractServiceJavaConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/AbstractServiceJavaConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/java/AbstractServiceJavaConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/AbstractServiceJavaConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/java/CloudServiceScanJavaConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/CloudServiceScanJavaConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/java/CloudServiceScanJavaConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/CloudServiceScanJavaConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/java/DataSourceJavaConfigMysqlTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/DataSourceJavaConfigMysqlTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/java/DataSourceJavaConfigMysqlTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/DataSourceJavaConfigMysqlTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/java/DataSourceJavaConfigPostgesqlTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/DataSourceJavaConfigPostgesqlTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/java/DataSourceJavaConfigPostgesqlTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/DataSourceJavaConfigPostgesqlTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/java/DataSourceJavaConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/DataSourceJavaConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/java/DataSourceJavaConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/DataSourceJavaConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/java/GenericServiceJavaConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/GenericServiceJavaConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/java/GenericServiceJavaConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/GenericServiceJavaConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/java/MongoDbFactoryJavaConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/MongoDbFactoryJavaConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/java/MongoDbFactoryJavaConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/MongoDbFactoryJavaConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/java/PropertiesJavaConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/PropertiesJavaConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/java/PropertiesJavaConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/PropertiesJavaConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/java/RabbitConnectionFactoryJavaConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/RabbitConnectionFactoryJavaConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/java/RabbitConnectionFactoryJavaConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/RabbitConnectionFactoryJavaConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/java/RedisConnectionFactoryJavaConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/RedisConnectionFactoryJavaConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/java/RedisConnectionFactoryJavaConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/java/RedisConnectionFactoryJavaConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/AbstractServiceXmlConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/AbstractServiceXmlConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/xml/AbstractServiceXmlConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/AbstractServiceXmlConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudAllServicesTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudAllServicesTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudAllServicesTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudAllServicesTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudServiceScanXmlConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudServiceScanXmlConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudServiceScanXmlConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/CloudServiceScanXmlConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/DataSourceXmlConfigMysqlTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/DataSourceXmlConfigMysqlTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/xml/DataSourceXmlConfigMysqlTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/DataSourceXmlConfigMysqlTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/DataSourceXmlConfigPostgesqlTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/DataSourceXmlConfigPostgesqlTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/xml/DataSourceXmlConfigPostgesqlTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/DataSourceXmlConfigPostgesqlTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/DataSourceXmlConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/DataSourceXmlConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/xml/DataSourceXmlConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/DataSourceXmlConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/GenericServiceXmlConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/GenericServiceXmlConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/xml/GenericServiceXmlConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/GenericServiceXmlConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/MongoDbFactoryXmlConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/MongoDbFactoryXmlConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/xml/MongoDbFactoryXmlConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/MongoDbFactoryXmlConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/PropertiesXmlConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/PropertiesXmlConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/xml/PropertiesXmlConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/PropertiesXmlConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/RabbitConnectionFactoryXmlConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/RabbitConnectionFactoryXmlConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/xml/RabbitConnectionFactoryXmlConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/RabbitConnectionFactoryXmlConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/config/xml/RedisConnectionFactoryXmlConfigTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/RedisConnectionFactoryXmlConfigTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/config/xml/RedisConnectionFactoryXmlConfigTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/config/xml/RedisConnectionFactoryXmlConfigTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactoryTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactoryTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactoryTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/AbstractCloudServiceConnectorFactoryTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactoryTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactoryTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactoryTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/GenericCloudServiceConnectorFactoryTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoDbFactoryFactoryTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoDbFactoryFactoryTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoDbFactoryFactoryTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoDbFactoryFactoryTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoServiceConnectorCreatorTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoServiceConnectorCreatorTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoServiceConnectorCreatorTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/mongo/MongoServiceConnectorCreatorTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryCreatorTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryCreatorTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryCreatorTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryCreatorTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryFactoryTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryFactoryTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryFactoryTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryFactoryTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitServiceInfoTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitServiceInfoTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitServiceInfoTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitServiceInfoTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisConnectionFactoryFactoryTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisConnectionFactoryFactoryTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisConnectionFactoryFactoryTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisConnectionFactoryFactoryTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisServiceConnectorCreatorTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisServiceConnectorCreatorTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisServiceConnectorCreatorTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/redis/RedisServiceConnectorCreatorTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceCreatorTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceCreatorTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceCreatorTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceCreatorTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceFactoryTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceFactoryTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceFactoryTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/AbstractDataSourceFactoryTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlDataSourceFactoryTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlDataSourceFactoryTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlDataSourceFactoryTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlDataSourceFactoryTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorWithDefaultDriverTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorWithDefaultDriverTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorWithDefaultDriverTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorWithDefaultDriverTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorWithMysqlDriverTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorWithMysqlDriverTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorWithMysqlDriverTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/MysqlServiceCreatorWithMysqlDriverTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/OracleDataSourceFactoryTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/OracleDataSourceFactoryTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/relational/OracleDataSourceFactoryTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/OracleDataSourceFactoryTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/OracleServiceCreatorTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/OracleServiceCreatorTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/relational/OracleServiceCreatorTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/OracleServiceCreatorTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PooledDataSourceCreatorsTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PooledDataSourceCreatorsTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PooledDataSourceCreatorsTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PooledDataSourceCreatorsTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlDataSourceFactoryTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlDataSourceFactoryTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlDataSourceFactoryTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlDataSourceFactoryTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlServiceCreatorTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlServiceCreatorTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlServiceCreatorTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/relational/PostgresqlServiceCreatorTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/smtp/MailSenderFactoryTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/smtp/MailSenderFactoryTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/smtp/MailSenderFactoryTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/smtp/MailSenderFactoryTest.java
diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/service/smtp/SmtpServiceConnectorCreatorTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/smtp/SmtpServiceConnectorCreatorTest.java
similarity index 100%
rename from spring-service-connector/src/test/java/org/springframework/cloud/service/smtp/SmtpServiceConnectorCreatorTest.java
rename to spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/smtp/SmtpServiceConnectorCreatorTest.java
diff --git a/spring-service-connector/src/test/resources/log4j.properties b/spring-cloud-spring-service-connector/src/test/resources/log4j.properties
similarity index 100%
rename from spring-service-connector/src/test/resources/log4j.properties
rename to spring-cloud-spring-service-connector/src/test/resources/log4j.properties
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-all-services.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-all-services.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-all-services.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-all-services.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-config.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-config.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-config.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-config.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-service-id.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-service-id.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-service-id.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-with-service-id.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-without-service-id.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-without-service-id.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-without-service-id.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-datasource-without-service-id.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-with-connector-type.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-with-connector-type.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-with-connector-type.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-with-connector-type.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-with-service-id.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-with-service-id.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-with-service-id.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-with-service-id.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-without-service-id.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-without-service-id.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-without-service-id.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-generic-without-service-id.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-config.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-config.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-config.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-config.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-service-id.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-service-id.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-service-id.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-with-service-id.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-without-service-id.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-without-service-id.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-without-service-id.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-mongo-without-service-id.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-properties.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-properties.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-properties.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-properties.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-config.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-config.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-config.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-config.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-service-id.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-service-id.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-service-id.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-with-service-id.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-without-service-id.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-without-service-id.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-without-service-id.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-rabbit-without-service-id.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-config.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-config.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-config.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-config.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-service-id.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-service-id.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-service-id.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-with-service-id.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-without-service-id.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-without-service-id.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-without-service-id.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-redis-without-service-id.xml
diff --git a/spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-scan.xml b/spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-scan.xml
similarity index 100%
rename from spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-scan.xml
rename to spring-cloud-spring-service-connector/src/test/resources/org/springframework/cloud/config/xml/cloud-scan.xml