diff --git a/sample.groovy b/sample.groovy
index 4f8198db..c3e2c540 100644
--- a/sample.groovy
+++ b/sample.groovy
@@ -1,6 +1,6 @@
 package demo
 
-@Grab('org.springframework.platform:spring-platform-config-client:1.0.0.BUILD-SNAPSHOT')
+@Grab('org.springframework.cloud:spring-platform-config-client:1.0.0.BUILD-SNAPSHOT')
 @Grab('spring-boot-starter-actuator')
 @RestController
 class Application {
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/autoconfigure/RefreshAutoConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java
similarity index 87%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/autoconfigure/RefreshAutoConfiguration.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java
index 3ab8fed3..11e1d766 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/autoconfigure/RefreshAutoConfiguration.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.springframework.platform.autoconfigure;
+package org.springframework.cloud.autoconfigure;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.endpoint.Endpoint;
@@ -37,16 +37,16 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.integration.monitor.IntegrationMBeanExporter;
-import org.springframework.platform.bootstrap.config.ConfigServiceBootstrapConfiguration;
-import org.springframework.platform.config.client.RefreshEndpoint;
-import org.springframework.platform.context.environment.EnvironmentManager;
-import org.springframework.platform.context.environment.EnvironmentManagerMvcEndpoint;
-import org.springframework.platform.context.properties.ConfigurationPropertiesRebinder;
-import org.springframework.platform.context.restart.RestartEndpoint;
-import org.springframework.platform.context.restart.RestartMvcEndpoint;
-import org.springframework.platform.context.scope.refresh.RefreshScope;
-import org.springframework.platform.endpoint.GenericPostableMvcEndpoint;
-import org.springframework.platform.logging.LoggingRebinder;
+import org.springframework.cloud.bootstrap.config.ConfigServiceBootstrapConfiguration;
+import org.springframework.cloud.config.client.RefreshEndpoint;
+import org.springframework.cloud.context.environment.EnvironmentManager;
+import org.springframework.cloud.context.environment.EnvironmentManagerMvcEndpoint;
+import org.springframework.cloud.context.properties.ConfigurationPropertiesRebinder;
+import org.springframework.cloud.context.restart.RestartEndpoint;
+import org.springframework.cloud.context.restart.RestartMvcEndpoint;
+import org.springframework.cloud.context.scope.refresh.RefreshScope;
+import org.springframework.cloud.endpoint.GenericPostableMvcEndpoint;
+import org.springframework.cloud.logging.LoggingRebinder;
 
 @Configuration
 @ConditionalOnClass(RefreshScope.class)
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapApplicationListener.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java
similarity index 99%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapApplicationListener.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java
index e65fe6ea..fafb465c 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapApplicationListener.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.bootstrap;
+package org.springframework.cloud.bootstrap;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfiguration.java
similarity index 95%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapConfiguration.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfiguration.java
index 49b5fc0c..01ac59f6 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/BootstrapConfiguration.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfiguration.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.springframework.platform.bootstrap;
+package org.springframework.cloud.bootstrap;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/config/ConfigServiceBootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/ConfigServiceBootstrapConfiguration.java
similarity index 94%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/config/ConfigServiceBootstrapConfiguration.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/ConfigServiceBootstrapConfiguration.java
index 4c610975..1918fe7a 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/bootstrap/config/ConfigServiceBootstrapConfiguration.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/ConfigServiceBootstrapConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.bootstrap.config;
+package org.springframework.cloud.bootstrap.config;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -33,8 +33,8 @@ import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
-import org.springframework.platform.config.client.ConfigServicePropertySourceLocator;
-import org.springframework.platform.config.client.PropertySourceLocator;
+import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
+import org.springframework.cloud.config.client.PropertySourceLocator;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/config/Environment.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/Environment.java
similarity index 97%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/config/Environment.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/Environment.java
index 265dfbb6..13eb5a0e 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/config/Environment.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/Environment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.config;
+package org.springframework.cloud.config;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/config/PropertySource.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/PropertySource.java
similarity index 96%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/config/PropertySource.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/PropertySource.java
index 1f8ff661..05126f43 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/config/PropertySource.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/PropertySource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.config;
+package org.springframework.cloud.config;
 
 import java.util.Map;
 
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/ConfigServicePropertySourceLocator.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java
similarity index 93%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/ConfigServicePropertySourceLocator.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java
index 7069842a..e971bd84 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/ConfigServicePropertySourceLocator.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.config.client;
+package org.springframework.cloud.config.client;
 
 import java.util.Map;
 
@@ -24,8 +24,8 @@ import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
-import org.springframework.platform.config.Environment;
-import org.springframework.platform.config.PropertySource;
+import org.springframework.cloud.config.Environment;
+import org.springframework.cloud.config.PropertySource;
 import org.springframework.web.client.RestTemplate;
 
 /**
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/PropertySourceLocator.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/PropertySourceLocator.java
similarity index 93%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/PropertySourceLocator.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/PropertySourceLocator.java
index c5681b8d..426902c5 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/PropertySourceLocator.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/PropertySourceLocator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.config.client;
+package org.springframework.cloud.config.client;
 
 import org.springframework.core.env.PropertySource;
 
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/RefreshEndpoint.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RefreshEndpoint.java
similarity index 97%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/RefreshEndpoint.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RefreshEndpoint.java
index 3b7fe167..9993d280 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/config/client/RefreshEndpoint.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RefreshEndpoint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.config.client;
+package org.springframework.cloud.config.client;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -36,7 +36,7 @@ import org.springframework.core.env.PropertySource;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.jmx.export.annotation.ManagedOperation;
 import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.platform.context.environment.EnvironmentChangeEvent;
+import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.web.context.support.StandardServletEnvironment;
 
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/BeanLifecycleDecorator.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/config/BeanLifecycleDecorator.java
similarity index 97%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/BeanLifecycleDecorator.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/config/BeanLifecycleDecorator.java
index 1cdf49b1..1488d095 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/BeanLifecycleDecorator.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/config/BeanLifecycleDecorator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.context.config;
+package org.springframework.cloud.context.config;
 
 
 /**
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/StandardBeanLifecycleDecorator.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/config/StandardBeanLifecycleDecorator.java
similarity index 98%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/StandardBeanLifecycleDecorator.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/config/StandardBeanLifecycleDecorator.java
index ca6abbc7..32736f61 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/StandardBeanLifecycleDecorator.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/config/StandardBeanLifecycleDecorator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.context.config;
+package org.springframework.cloud.context.config;
 
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/annotation/RefreshScope.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/config/annotation/RefreshScope.java
similarity index 94%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/annotation/RefreshScope.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/config/annotation/RefreshScope.java
index 6ce9676b..59315df4 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/config/annotation/RefreshScope.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/config/annotation/RefreshScope.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.context.config.annotation;
+package org.springframework.cloud.context.config.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentChangeEvent.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/environment/EnvironmentChangeEvent.java
similarity index 94%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentChangeEvent.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/environment/EnvironmentChangeEvent.java
index 7ddd6e80..c4361393 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentChangeEvent.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/environment/EnvironmentChangeEvent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.context.environment;
+package org.springframework.cloud.context.environment;
 
 import java.util.Set;
 
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManager.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/environment/EnvironmentManager.java
similarity index 98%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManager.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/environment/EnvironmentManager.java
index 9940f030..00b969b9 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManager.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/environment/EnvironmentManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.context.environment;
+package org.springframework.cloud.context.environment;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManagerMvcEndpoint.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/environment/EnvironmentManagerMvcEndpoint.java
similarity index 97%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManagerMvcEndpoint.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/environment/EnvironmentManagerMvcEndpoint.java
index 7d065cd5..30a6d784 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/environment/EnvironmentManagerMvcEndpoint.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/environment/EnvironmentManagerMvcEndpoint.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.context.environment;
+package org.springframework.cloud.context.environment;
 
 import java.util.Map;
 
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinder.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java
similarity index 95%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinder.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java
index 1732a24f..8580681d 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinder.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.context.properties;
+package org.springframework.cloud.context.properties;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -30,7 +30,7 @@ import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
 import org.springframework.jmx.export.annotation.ManagedOperation;
 import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.platform.context.environment.EnvironmentChangeEvent;
+import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartEndpoint.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/restart/RestartEndpoint.java
similarity index 99%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartEndpoint.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/restart/RestartEndpoint.java
index 694cc2df..3c128abd 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartEndpoint.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/restart/RestartEndpoint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.context.restart;
+package org.springframework.cloud.context.restart;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartListener.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/restart/RestartListener.java
similarity index 97%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartListener.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/restart/RestartListener.java
index 50755334..cdd25d46 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartListener.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/restart/RestartListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.context.restart;
+package org.springframework.cloud.context.restart;
 
 import org.springframework.boot.context.event.ApplicationPreparedEvent;
 import org.springframework.context.ApplicationEvent;
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartMvcEndpoint.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/restart/RestartMvcEndpoint.java
similarity index 94%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartMvcEndpoint.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/restart/RestartMvcEndpoint.java
index 0cb9bdd2..804a9731 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/restart/RestartMvcEndpoint.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/restart/RestartMvcEndpoint.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.context.restart;
+package org.springframework.cloud.context.restart;
 
 import java.util.Collections;
 import java.util.Map;
@@ -22,7 +22,7 @@ import org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter;
 import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.platform.endpoint.GenericPostableMvcEndpoint;
+import org.springframework.cloud.endpoint.GenericPostableMvcEndpoint;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/GenericScope.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/GenericScope.java
similarity index 94%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/GenericScope.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/GenericScope.java
index b6a04c49..42175c54 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/GenericScope.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/GenericScope.java
@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.platform.context.scope;
+package org.springframework.cloud.context.scope;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -41,9 +41,9 @@ import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.ParseException;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
-import org.springframework.platform.context.config.BeanLifecycleDecorator;
-import org.springframework.platform.context.config.BeanLifecycleDecorator.Context;
-import org.springframework.platform.context.config.StandardBeanLifecycleDecorator;
+import org.springframework.cloud.context.config.BeanLifecycleDecorator;
+import org.springframework.cloud.context.config.BeanLifecycleDecorator.Context;
+import org.springframework.cloud.context.config.StandardBeanLifecycleDecorator;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringValueResolver;
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/ScopeCache.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/ScopeCache.java
similarity index 97%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/ScopeCache.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/ScopeCache.java
index 483fa052..1be557c0 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/ScopeCache.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/ScopeCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.context.scope;
+package org.springframework.cloud.context.scope;
 
 import java.util.Collection;
 
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/StandardScopeCache.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/StandardScopeCache.java
similarity index 96%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/StandardScopeCache.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/StandardScopeCache.java
index cb46708b..e3591a0d 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/StandardScopeCache.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/StandardScopeCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.context.scope;
+package org.springframework.cloud.context.scope;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/refresh/RefreshScope.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/refresh/RefreshScope.java
similarity index 94%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/refresh/RefreshScope.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/refresh/RefreshScope.java
index b3e33521..5e9f3073 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/refresh/RefreshScope.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/refresh/RefreshScope.java
@@ -11,13 +11,13 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.platform.context.scope.refresh;
+package org.springframework.cloud.context.scope.refresh;
 
 import java.io.Serializable;
 
 import org.springframework.jmx.export.annotation.ManagedOperation;
 import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.platform.context.scope.GenericScope;
+import org.springframework.cloud.context.scope.GenericScope;
 
 /**
  * <p>
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadLocalScopeCache.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/thread/ThreadLocalScopeCache.java
similarity index 92%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadLocalScopeCache.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/thread/ThreadLocalScopeCache.java
index f228d913..c140d63d 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadLocalScopeCache.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/thread/ThreadLocalScopeCache.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.context.scope.thread;
+package org.springframework.cloud.context.scope.thread;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.springframework.platform.context.scope.ScopeCache;
+import org.springframework.cloud.context.scope.ScopeCache;
 
 /**
  * @author Dave Syer
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadScope.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/thread/ThreadScope.java
similarity index 85%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadScope.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/thread/ThreadScope.java
index a1ec0885..8637cd2b 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/context/scope/thread/ThreadScope.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/context/scope/thread/ThreadScope.java
@@ -11,9 +11,9 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.platform.context.scope.thread;
+package org.springframework.cloud.context.scope.thread;
 
-import org.springframework.platform.context.scope.GenericScope;
+import org.springframework.cloud.context.scope.GenericScope;
 
 /**
  * 
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/endpoint/GenericPostableMvcEndpoint.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/endpoint/GenericPostableMvcEndpoint.java
similarity index 97%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/endpoint/GenericPostableMvcEndpoint.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/endpoint/GenericPostableMvcEndpoint.java
index 7f422b2f..2ef3447f 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/endpoint/GenericPostableMvcEndpoint.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/endpoint/GenericPostableMvcEndpoint.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.endpoint;
+package org.springframework.cloud.endpoint;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/platform/logging/LoggingRebinder.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/logging/LoggingRebinder.java
similarity index 92%
rename from spring-cloud-config-client/src/main/java/org/springframework/platform/logging/LoggingRebinder.java
rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/logging/LoggingRebinder.java
index a5cce5b3..98331658 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/platform/logging/LoggingRebinder.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/logging/LoggingRebinder.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.logging;
+package org.springframework.cloud.logging;
 
 import org.springframework.boot.logging.LoggingApplicationListener;
 import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.Environment;
-import org.springframework.platform.context.environment.EnvironmentChangeEvent;
+import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
 
 /**
  * @author Dave Syer
diff --git a/spring-cloud-config-client/src/main/resources/META-INF/spring.factories b/spring-cloud-config-client/src/main/resources/META-INF/spring.factories
index fe31b9cb..4276fca3 100644
--- a/spring-cloud-config-client/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-config-client/src/main/resources/META-INF/spring.factories
@@ -1,13 +1,13 @@
 # Auto Configure
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.platform.autoconfigure.RefreshAutoConfiguration
+org.springframework.cloud.autoconfigure.RefreshAutoConfiguration
 
 # Application Listeners
 org.springframework.context.ApplicationListener=\
-org.springframework.platform.bootstrap.BootstrapApplicationListener,\
-org.springframework.platform.context.restart.RestartListener
+org.springframework.cloud.bootstrap.BootstrapApplicationListener,\
+org.springframework.cloud.context.restart.RestartListener
 
 # Bootstrap components
-org.springframework.platform.bootstrap.BootstrapConfiguration=\
-org.springframework.platform.bootstrap.config.ConfigServiceBootstrapConfiguration,\
+org.springframework.cloud.bootstrap.BootstrapConfiguration=\
+org.springframework.cloud.bootstrap.config.ConfigServiceBootstrapConfiguration,\
 org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-config-client/src/test/java/org/springframework/platform/bootstrap/BootstrapConfigurationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/bootstrap/BootstrapConfigurationTests.java
similarity index 96%
rename from spring-cloud-config-client/src/test/java/org/springframework/platform/bootstrap/BootstrapConfigurationTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/cloud/bootstrap/BootstrapConfigurationTests.java
index ed51b45b..f34cf5ab 100644
--- a/spring-cloud-config-client/src/test/java/org/springframework/platform/bootstrap/BootstrapConfigurationTests.java
+++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/bootstrap/BootstrapConfigurationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.bootstrap;
+package org.springframework.cloud.bootstrap;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -33,7 +33,7 @@ import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.env.StandardEnvironment;
-import org.springframework.platform.config.client.PropertySourceLocator;
+import org.springframework.cloud.config.client.PropertySourceLocator;
 
 /**
  * @author Dave Syer
diff --git a/spring-cloud-config-client/src/test/java/org/springframework/platform/context/environment/EnvironmentManagerIntegrationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java
similarity index 95%
rename from spring-cloud-config-client/src/test/java/org/springframework/platform/context/environment/EnvironmentManagerIntegrationTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java
index eecf8d00..d2f6f61b 100644
--- a/spring-cloud-config-client/src/test/java/org/springframework/platform/context/environment/EnvironmentManagerIntegrationTests.java
+++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.context.environment;
+package org.springframework.cloud.context.environment;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -34,7 +34,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.platform.context.environment.EnvironmentManagerIntegrationTests.TestConfiguration;
+import org.springframework.cloud.context.environment.EnvironmentManagerIntegrationTests.TestConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
diff --git a/spring-cloud-config-client/src/test/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java
similarity index 92%
rename from spring-cloud-config-client/src/test/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java
index 6f235a0f..8d62251a 100644
--- a/spring-cloud-config-client/src/test/java/org/springframework/platform/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java
+++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.context.properties;
+package org.springframework.cloud.context.properties;
 
 import static org.junit.Assert.assertEquals;
 
@@ -29,8 +29,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.platform.autoconfigure.RefreshAutoConfiguration;
-import org.springframework.platform.context.properties.ConfigurationPropertiesRebinderIntegrationTests.TestConfiguration;
+import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
+import org.springframework.cloud.context.properties.ConfigurationPropertiesRebinderIntegrationTests.TestConfiguration;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
diff --git a/spring-cloud-config-client/src/test/java/org/springframework/platform/context/restart/RestartIntegrationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java
similarity index 97%
rename from spring-cloud-config-client/src/test/java/org/springframework/platform/context/restart/RestartIntegrationTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java
index 0a6a7b4b..139d584b 100644
--- a/spring-cloud-config-client/src/test/java/org/springframework/platform/context/restart/RestartIntegrationTests.java
+++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.context.restart;
+package org.springframework.cloud.context.restart;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
diff --git a/spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/MoreRefreshScopeIntegrationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/context/scope/refresh/MoreRefreshScopeIntegrationTests.java
similarity index 94%
rename from spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/MoreRefreshScopeIntegrationTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/cloud/context/scope/refresh/MoreRefreshScopeIntegrationTests.java
index ac98237d..b4d54305 100644
--- a/spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/MoreRefreshScopeIntegrationTests.java
+++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/context/scope/refresh/MoreRefreshScopeIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.context.scope.refresh;
+package org.springframework.cloud.context.scope.refresh;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
@@ -42,9 +42,9 @@ import org.springframework.context.annotation.Import;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
 import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.platform.autoconfigure.RefreshAutoConfiguration;
-import org.springframework.platform.context.config.annotation.RefreshScope;
-import org.springframework.platform.context.scope.refresh.MoreRefreshScopeIntegrationTests.TestConfiguration;
+import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.cloud.context.scope.refresh.MoreRefreshScopeIntegrationTests.TestConfiguration;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -59,7 +59,7 @@ public class MoreRefreshScopeIntegrationTests {
 	private TestProperties properties;
 
 	@Autowired
-	private org.springframework.platform.context.scope.refresh.RefreshScope scope;
+	private org.springframework.cloud.context.scope.refresh.RefreshScope scope;
 
 	@Autowired
 	private ConfigurableEnvironment environment;
diff --git a/spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeConcurrencyTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConcurrencyTests.java
similarity index 93%
rename from spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeConcurrencyTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConcurrencyTests.java
index 61dc6fdb..1aef5713 100644
--- a/spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeConcurrencyTests.java
+++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConcurrencyTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.context.scope.refresh;
+package org.springframework.cloud.context.scope.refresh;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -42,9 +42,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
 import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.platform.autoconfigure.RefreshAutoConfiguration;
-import org.springframework.platform.context.config.annotation.RefreshScope;
-import org.springframework.platform.context.scope.refresh.RefreshScopeConcurrencyTests.TestConfiguration;
+import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.cloud.context.scope.refresh.RefreshScopeConcurrencyTests.TestConfiguration;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.Repeat;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -64,7 +64,7 @@ public class RefreshScopeConcurrencyTests {
 	private TestProperties properties;
 
 	@Autowired
-	private org.springframework.platform.context.scope.refresh.RefreshScope scope;
+	private org.springframework.cloud.context.scope.refresh.RefreshScope scope;
 
 	@Test
 	@Repeat(10)
diff --git a/spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeIntegrationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java
similarity index 93%
rename from spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeIntegrationTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java
index e991d788..b56cfa49 100644
--- a/spring-cloud-config-client/src/test/java/org/springframework/platform/context/scope/refresh/RefreshScopeIntegrationTests.java
+++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.context.scope.refresh;
+package org.springframework.cloud.context.scope.refresh;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
@@ -37,9 +37,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
 import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.platform.autoconfigure.RefreshAutoConfiguration;
-import org.springframework.platform.context.config.annotation.RefreshScope;
-import org.springframework.platform.context.scope.refresh.RefreshScopeIntegrationTests.TestConfiguration;
+import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.cloud.context.scope.refresh.RefreshScopeIntegrationTests.TestConfiguration;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -54,7 +54,7 @@ public class RefreshScopeIntegrationTests {
 	private TestProperties properties;
 
 	@Autowired
-	private org.springframework.platform.context.scope.refresh.RefreshScope scope;
+	private org.springframework.cloud.context.scope.refresh.RefreshScope scope;
 
 	@Before
 	public void init() {
diff --git a/spring-cloud-config-client/src/test/java/org/springframework/platform/logging/LoggingRebinderTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/logging/LoggingRebinderTests.java
similarity index 93%
rename from spring-cloud-config-client/src/test/java/org/springframework/platform/logging/LoggingRebinderTests.java
rename to spring-cloud-config-client/src/test/java/org/springframework/cloud/logging/LoggingRebinderTests.java
index 6cfcd5d1..c8b1e14d 100644
--- a/spring-cloud-config-client/src/test/java/org/springframework/platform/logging/LoggingRebinderTests.java
+++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/logging/LoggingRebinderTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.logging;
+package org.springframework.cloud.logging;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -28,7 +28,7 @@ import org.springframework.boot.logging.LogLevel;
 import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.boot.test.EnvironmentTestUtils;
 import org.springframework.core.env.StandardEnvironment;
-import org.springframework.platform.context.environment.EnvironmentChangeEvent;
+import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
 
 /**
  * @author Dave Syer
diff --git a/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java
index 0616e3e8..65414b16 100644
--- a/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java
+++ b/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java
@@ -30,7 +30,7 @@ public class ApplicationTests {
 	@BeforeClass
 	public static void startConfigServer() {
 		ConfigurableApplicationContext context = SpringApplication.run(
-				org.springframework.platform.config.server.Application.class,
+				org.springframework.cloud.config.server.Application.class,
 				"--server.port=" + configPort, "--spring.config.name=server");
 		configPort = ((EmbeddedWebApplicationContext) context).getEmbeddedServletContainer().getPort();
 		System.setProperty("config.port", "" + configPort);
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/Application.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/Application.java
similarity index 81%
rename from spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/Application.java
rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/Application.java
index 2c9d7730..34b2d4dd 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/Application.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/Application.java
@@ -1,4 +1,4 @@
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/ConfigServerConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java
similarity index 98%
rename from spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/ConfigServerConfiguration.java
rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java
index f3599378..e6a4f076 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/ConfigServerConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
 import javax.annotation.PostConstruct;
 
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnableConfigServer.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java
similarity index 95%
rename from spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnableConfigServer.java
rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java
index 32d02243..378b4b8b 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnableConfigServer.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EncryptionController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java
similarity index 97%
rename from spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EncryptionController.java
rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java
index 4392c901..d83bae03 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EncryptionController.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
 import java.io.IOException;
 import java.security.KeyPair;
@@ -28,8 +28,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.platform.config.Environment;
-import org.springframework.platform.config.PropertySource;
+import org.springframework.cloud.config.Environment;
+import org.springframework.cloud.config.PropertySource;
 import org.springframework.security.crypto.codec.Base64;
 import org.springframework.security.crypto.encrypt.Encryptors;
 import org.springframework.security.crypto.encrypt.TextEncryptor;
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java
similarity index 90%
rename from spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentController.java
rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java
index 362d62d9..49073e48 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentController.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java
@@ -1,8 +1,8 @@
 
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.platform.config.Environment;
+import org.springframework.cloud.config.Environment;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java
similarity index 87%
rename from spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentRepository.java
rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java
index 67ce6ff1..f2c6e451 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/EnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
-import org.springframework.platform.config.Environment;
+import org.springframework.cloud.config.Environment;
 
 
 /**
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java
similarity index 97%
rename from spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java
rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java
index 2e8919f2..ed82ac5e 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,8 +32,8 @@ import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.util.FileUtils;
 import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.platform.config.Environment;
-import org.springframework.platform.config.PropertySource;
+import org.springframework.cloud.config.Environment;
+import org.springframework.cloud.config.PropertySource;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/NativeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java
similarity index 93%
rename from spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/NativeEnvironmentRepository.java
rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java
index 1da695c9..29d2750f 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/NativeEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -24,8 +24,8 @@ import java.util.Set;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.StandardEnvironment;
-import org.springframework.platform.config.Environment;
-import org.springframework.platform.config.PropertySource;
+import org.springframework.cloud.config.Environment;
+import org.springframework.cloud.config.PropertySource;
 import org.springframework.web.context.support.StandardServletEnvironment;
 
 /**
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/SerializableMapPropertySource.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SerializableMapPropertySource.java
similarity index 94%
rename from spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/SerializableMapPropertySource.java
rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SerializableMapPropertySource.java
index 2ae40dfd..b244fed4 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/SerializableMapPropertySource.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SerializableMapPropertySource.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
 import java.util.Map;
 
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java
similarity index 96%
rename from spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepository.java
rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java
index a9c911b2..12244955 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,7 +26,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.StandardEnvironment;
-import org.springframework.platform.config.Environment;
+import org.springframework.cloud.config.Environment;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/ApplicationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ApplicationTests.java
similarity index 89%
rename from spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/ApplicationTests.java
rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ApplicationTests.java
index 66f0bd44..d705cb4e 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/ApplicationTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ApplicationTests.java
@@ -1,4 +1,4 @@
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.assertFalse;
 
@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.platform.config.Environment;
+import org.springframework.cloud.config.Environment;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/EncryptionControllerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java
similarity index 94%
rename from spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/EncryptionControllerTests.java
rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java
index d5084cde..129ef083 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/EncryptionControllerTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertTrue;
 import java.util.Collections;
 
 import org.junit.Test;
-import org.springframework.platform.config.Environment;
-import org.springframework.platform.config.PropertySource;
+import org.springframework.cloud.config.Environment;
+import org.springframework.cloud.config.PropertySource;
 import org.springframework.security.rsa.crypto.RsaSecretEncryptor;
 
 /**
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java
similarity index 97%
rename from spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java
rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java
index b3e63f2e..72a22485 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -28,7 +28,7 @@ import org.eclipse.jgit.util.FileUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.core.env.StandardEnvironment;
-import org.springframework.platform.config.Environment;
+import org.springframework.cloud.config.Environment;
 
 import com.jcraft.jsch.Session;
 
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java
similarity index 94%
rename from spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepositoryTests.java
rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java
index 98b2b727..ca2a2c84 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/platform/config/server/SpringApplicationEnvironmentRepositoryTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.config.server;
+package org.springframework.cloud.config.server;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.springframework.platform.config.Environment;
+import org.springframework.cloud.config.Environment;
 
 
 /**