diff --git a/spring-boot-data-gemfire/spring-boot-data-gemfire.gradle b/spring-boot-starter-data-gemfire/spring-boot-starter-data-gemfire.gradle
similarity index 83%
rename from spring-boot-data-gemfire/spring-boot-data-gemfire.gradle
rename to spring-boot-starter-data-gemfire/spring-boot-starter-data-gemfire.gradle
index 1d55d24f..751761eb 100644
--- a/spring-boot-data-gemfire/spring-boot-data-gemfire.gradle
+++ b/spring-boot-starter-data-gemfire/spring-boot-starter-data-gemfire.gradle
@@ -6,7 +6,7 @@ description = "Spring Boot for Pivotal GemFire"
 
 dependencies {
 
-	compile(project(':spring-boot-data-geode')) {
+	compile(project(':spring-boot-starter-data-geode')) {
 		exclude group: "org.springframework.data", module: "spring-data-geode"
 	}
 
diff --git a/spring-boot-data-geode/spring-boot-data-geode.gradle b/spring-boot-starter-data-geode/spring-boot-starter-data-geode.gradle
similarity index 100%
rename from spring-boot-data-geode/spring-boot-data-geode.gradle
rename to spring-boot-starter-data-geode/spring-boot-starter-data-geode.gradle
diff --git a/spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeCachingProviderAutoConfiguration.java b/spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeCachingProviderAutoConfiguration.java
similarity index 100%
rename from spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeCachingProviderAutoConfiguration.java
rename to spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeCachingProviderAutoConfiguration.java
diff --git a/spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeClientCacheAutoConfiguration.java b/spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeClientCacheAutoConfiguration.java
similarity index 100%
rename from spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeClientCacheAutoConfiguration.java
rename to spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeClientCacheAutoConfiguration.java
diff --git a/spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeContinuousQueryAutoConfiguration.java b/spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeContinuousQueryAutoConfiguration.java
similarity index 100%
rename from spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeContinuousQueryAutoConfiguration.java
rename to spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeContinuousQueryAutoConfiguration.java
diff --git a/spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeFunctionExecutionAutoConfiguration.java b/spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeFunctionExecutionAutoConfiguration.java
similarity index 100%
rename from spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeFunctionExecutionAutoConfiguration.java
rename to spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeFunctionExecutionAutoConfiguration.java
diff --git a/spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeRepositoriesAutoConfiguration.java b/spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeRepositoriesAutoConfiguration.java
similarity index 100%
rename from spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeRepositoriesAutoConfiguration.java
rename to spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeRepositoriesAutoConfiguration.java
diff --git a/spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeRepositoriesAutoConfigurationRegistrar.java b/spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeRepositoriesAutoConfigurationRegistrar.java
similarity index 100%
rename from spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeRepositoriesAutoConfigurationRegistrar.java
rename to spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/GeodeRepositoriesAutoConfigurationRegistrar.java
diff --git a/spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/package-info.java b/spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/package-info.java
similarity index 100%
rename from spring-boot-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/package-info.java
rename to spring-boot-starter-data-geode/src/main/java/org/springframework/boot/data/geode/autoconfigure/package-info.java
diff --git a/spring-boot-data-geode/src/main/resources/META-INF/spring.factories b/spring-boot-starter-data-geode/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from spring-boot-data-geode/src/main/resources/META-INF/spring.factories
rename to spring-boot-starter-data-geode/src/main/resources/META-INF/spring.factories
diff --git a/spring-boot-data-geode/src/test/java/org/springframework/boot/data/geode/cache/client/SpringBootApacheGeodeCacheClientApplicationTests.java b/spring-boot-starter-data-geode/src/test/java/org/springframework/boot/data/geode/cache/client/SpringBootApacheGeodeCacheClientApplicationTests.java
similarity index 100%
rename from spring-boot-data-geode/src/test/java/org/springframework/boot/data/geode/cache/client/SpringBootApacheGeodeCacheClientApplicationTests.java
rename to spring-boot-starter-data-geode/src/test/java/org/springframework/boot/data/geode/cache/client/SpringBootApacheGeodeCacheClientApplicationTests.java