diff --git a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/command/EncryptCommand.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/command/EncryptCommand.java
similarity index 95%
rename from spring-cloud-cli/src/main/java/org/springframework/platform/cli/command/EncryptCommand.java
rename to spring-cloud-cli/src/main/java/org/springframework/cloud/cli/command/EncryptCommand.java
index 6bce6be..c9a0d9e 100644
--- a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/command/EncryptCommand.java
+++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/command/EncryptCommand.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.cli.command;
+package org.springframework.cloud.cli.command;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java
similarity index 88%
rename from spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java
index 4474ecc..88df5d8 100644
--- a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java
+++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundryResourceCompilerAutoConfiguration.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.cli.compiler;
+package org.springframework.cloud.cli.compiler;
 
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.control.CompilationFailedException;
@@ -37,7 +37,7 @@ public class CloudfoundryResourceCompilerAutoConfiguration extends CompilerAutoC
 	public void applyDependencies(DependencyCustomizer dependencies) {
 		dependencies
 				.ifAnyMissingClasses(
-						"org.springframework.platform.cloudfoundry.resource.EnableCloudfoundryResource")
+						"org.springframework.cloud.cloudfoundry.resource.EnableCloudfoundryResource")
 				.add("spring-platform-starter-cloudfoundry")
 				.add("org.springframework.security.oauth:spring-security-oauth2:2.0.3.RELEASE");
 	}
@@ -45,7 +45,7 @@ public class CloudfoundryResourceCompilerAutoConfiguration extends CompilerAutoC
 	@Override
 	public void applyImports(ImportCustomizer imports) throws CompilationFailedException {
 		imports.addImports(
-				"org.springframework.platform.cloudfoundry.resource.EnableCloudfoundryResource",
+				"org.springframework.cloud.cloudfoundry.resource.EnableCloudfoundryResource",
 				"org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter");
 	}
 
diff --git a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java
similarity index 84%
rename from spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java
index 3521bab..49052de 100644
--- a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java
+++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/CloudfoundrySsoCompilerAutoConfiguration.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.cli.compiler;
+package org.springframework.cloud.cli.compiler;
 
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.control.CompilationFailedException;
@@ -37,7 +37,7 @@ public class CloudfoundrySsoCompilerAutoConfiguration extends CompilerAutoConfig
 	public void applyDependencies(DependencyCustomizer dependencies) {
 		dependencies
 				.ifAnyMissingClasses(
-						"org.springframework.platform.cloudfoundry.sso.EnableCloudfoundrySso")
+						"org.springframework.cloud.cloudfoundry.sso.EnableCloudfoundrySso")
 				.add("spring-platform-starter-cloudfoundry")
 				.add("org.springframework.security.oauth:spring-security-oauth2:2.0.3.RELEASE");
 	}
@@ -45,8 +45,8 @@ public class CloudfoundrySsoCompilerAutoConfiguration extends CompilerAutoConfig
 	@Override
 	public void applyImports(ImportCustomizer imports) throws CompilationFailedException {
 		imports.addImports(
-				"org.springframework.platform.cloudfoundry.sso.EnableCloudfoundrySso",
-				"org.springframework.platform.cloudfoundry.sso.CloudfoundrySsoConfigurerAdapter");
+				"org.springframework.cloud.cloudfoundry.sso.EnableCloudfoundrySso",
+				"org.springframework.cloud.cloudfoundry.sso.CloudfoundrySsoConfigurerAdapter");
 	}
 
 }
diff --git a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/ConfigServerCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ConfigServerCompilerAutoConfiguration.java
similarity index 86%
rename from spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/ConfigServerCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ConfigServerCompilerAutoConfiguration.java
index 509b1df..e78fc3e 100644
--- a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/ConfigServerCompilerAutoConfiguration.java
+++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ConfigServerCompilerAutoConfiguration.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.cli.compiler;
+package org.springframework.cloud.cli.compiler;
 
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.control.CompilationFailedException;
@@ -36,13 +36,13 @@ public class ConfigServerCompilerAutoConfiguration extends CompilerAutoConfigura
 	@Override
 	public void applyDependencies(DependencyCustomizer dependencies) {
 		dependencies
-				.ifAnyMissingClasses("org.springframework.platform.config.server.EnableConfigServer")
+				.ifAnyMissingClasses("org.springframework.cloud.config.server.EnableConfigServer")
 				.add("spring-platform-config-server");
 	}
 	
 	@Override
 	public void applyImports(ImportCustomizer imports) throws CompilationFailedException {
-		imports.addImports("org.springframework.platform.config.server.EnableConfigServer");
+		imports.addImports("org.springframework.cloud.config.server.EnableConfigServer");
 	}
 
 }
diff --git a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/EurekaClientCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaClientCompilerAutoConfiguration.java
similarity index 82%
rename from spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/EurekaClientCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaClientCompilerAutoConfiguration.java
index 790cb1a..65f8556 100644
--- a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/EurekaClientCompilerAutoConfiguration.java
+++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaClientCompilerAutoConfiguration.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.cli.compiler;
+package org.springframework.cloud.cli.compiler;
 
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.control.CompilationFailedException;
@@ -36,16 +36,16 @@ public class EurekaClientCompilerAutoConfiguration extends CompilerAutoConfigura
 	@Override
 	public void applyDependencies(DependencyCustomizer dependencies) {
 		dependencies.ifAnyMissingClasses(
-				"org.springframework.platform.netflix.eureka.EnableEurekaClient").add(
+				"org.springframework.cloud.netflix.eureka.EnableEurekaClient").add(
 				"spring-platform-starter-eureka");
 	}
 
 	@Override
 	public void applyImports(ImportCustomizer imports) throws CompilationFailedException {
 		imports.addImports(
-				"org.springframework.platform.netflix.eureka.EnableEurekaClient",
-				"org.springframework.platform.netflix.eureka.EurekaInstanceConfigBean",
-				"org.springframework.platform.netflix.eureka.EurekaClientConfigBean",
+				"org.springframework.cloud.netflix.eureka.EnableEurekaClient",
+				"org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean",
+				"org.springframework.cloud.netflix.eureka.EurekaClientConfigBean",
 				"com.netflix.discovery.DiscoveryClient",
 				"com.netflix.appinfo.InstanceInfo");
 	}
diff --git a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/HystrixCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java
similarity index 88%
rename from spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/HystrixCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java
index c797aa0..e34aac7 100644
--- a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/HystrixCompilerAutoConfiguration.java
+++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.cli.compiler;
+package org.springframework.cloud.cli.compiler;
 
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.control.CompilationFailedException;
@@ -36,14 +36,14 @@ public class HystrixCompilerAutoConfiguration extends CompilerAutoConfiguration
 	@Override
 	public void applyDependencies(DependencyCustomizer dependencies) {
 		dependencies.ifAnyMissingClasses(
-				"org.springframework.platform.netflix.hystrix.annotations.EnableHystrix")
+				"org.springframework.cloud.netflix.hystrix.annotations.EnableHystrix")
 				.add("spring-platform-starter-hystrix");
 	}
 
 	@Override
 	public void applyImports(ImportCustomizer imports) throws CompilationFailedException {
 		imports.addImports(
-				"org.springframework.platform.netflix.hystrix.annotations.EnableHystrix",
+				"org.springframework.cloud.netflix.hystrix.annotations.EnableHystrix",
 				"com.netflix.hystrix.contrib.javanica.annotation.HystrixCollapser",
 				"com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand");
 	}
diff --git a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/SpringPlatformCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringPlatformCompilerAutoConfiguration.java
similarity index 95%
rename from spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/SpringPlatformCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringPlatformCompilerAutoConfiguration.java
index ed49dbf..d47b01c 100644
--- a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/SpringPlatformCompilerAutoConfiguration.java
+++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringPlatformCompilerAutoConfiguration.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.cli.compiler;
+package org.springframework.cloud.cli.compiler;
 
 import groovy.grape.Grape;
 
@@ -44,7 +44,7 @@ public class SpringPlatformCompilerAutoConfiguration extends CompilerAutoConfigu
 				"org.springframework.boot.actuate.endpoint.EnvironmentEndpoint").add(
 				"spring-boot-starter-actuator");
 		dependencies
-				.ifAnyMissingClasses("org.springframework.platform.config.Environment")
+				.ifAnyMissingClasses("org.springframework.cloud.config.Environment")
 				.add("spring-platform-config-client");
 	}
 
@@ -59,7 +59,7 @@ public class SpringPlatformCompilerAutoConfiguration extends CompilerAutoConfigu
 	}
 
 	private List<Dependencies> getAdditionalDependencies() {
-		String[] components = "org.springframework.platform:spring-platform-components-versions:1.0.0.BUILD-SNAPSHOT"
+		String[] components = "org.springframework.cloud:spring-platform-components-versions:1.0.0.BUILD-SNAPSHOT"
 				.split(":");
 		Map<String, String> dependency;
 		dependency = new HashMap<String, String>();
diff --git a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/ZuulCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ZuulCompilerAutoConfiguration.java
similarity index 87%
rename from spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/ZuulCompilerAutoConfiguration.java
rename to spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ZuulCompilerAutoConfiguration.java
index 4ce45b9..20bd246 100644
--- a/spring-cloud-cli/src/main/java/org/springframework/platform/cli/compiler/ZuulCompilerAutoConfiguration.java
+++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/ZuulCompilerAutoConfiguration.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.platform.cli.compiler;
+package org.springframework.cloud.cli.compiler;
 
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.control.CompilationFailedException;
@@ -36,13 +36,13 @@ public class ZuulCompilerAutoConfiguration extends CompilerAutoConfiguration {
 	@Override
 	public void applyDependencies(DependencyCustomizer dependencies) {
 		dependencies
-				.ifAnyMissingClasses("org.springframework.platform.netflix.zuul.EnableZuulProxy")
+				.ifAnyMissingClasses("org.springframework.cloud.netflix.zuul.EnableZuulProxy")
 				.add("spring-platform-starter-zuul");
 	}
 	
 	@Override
 	public void applyImports(ImportCustomizer imports) throws CompilationFailedException {
-		imports.addImports("org.springframework.platform.netflix.zuul.EnableZuulProxy");
+		imports.addImports("org.springframework.cloud.netflix.zuul.EnableZuulProxy");
 	}
 
 }