diff --git a/pom.xml b/pom.xml
index 73c4c2d6..d195bd42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
     <modules>
         <module>spring-cloud-kubernetes-dependencies</module>
         <module>spring-cloud-kubernetes-core</module>
+        <module>spring-cloud-kubernetes-config</module>
         <module>spring-cloud-kubernetes-discovery</module>
         <module>spring-cloud-kubernetes-ribbon</module>
         <module>spring-cloud-kubernetes-zipkin</module>
diff --git a/spring-cloud-kubernetes-config/.jdk8 b/spring-cloud-kubernetes-config/.jdk8
new file mode 100644
index 00000000..e69de29b
diff --git a/spring-cloud-kubernetes-config/pom.xml b/spring-cloud-kubernetes-config/pom.xml
new file mode 100644
index 00000000..d61e56f3
--- /dev/null
+++ b/spring-cloud-kubernetes-config/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>spring-cloud-kubernetes</artifactId>
+        <groupId>org.springframework.cloud</groupId>
+        <version>0.2.0.BUILD-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-kubernetes-conifg</artifactId>
+    <name>Spring Cloud Kubernetes :: Config</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-kubernetes-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-actuator</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-context</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <!-- Only needed at compile time -->
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Testing Dependencies -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-client</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-spring</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/AbstractConfigProperties.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/AbstractConfigProperties.java
similarity index 100%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/AbstractConfigProperties.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/AbstractConfigProperties.java
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java
similarity index 100%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapConfigProperties.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapConfigProperties.java
similarity index 100%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapConfigProperties.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapConfigProperties.java
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java
similarity index 100%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java
similarity index 100%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigUtils.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigUtils.java
similarity index 100%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/ConfigUtils.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigUtils.java
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/Constants.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/Constants.java
similarity index 100%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/Constants.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/Constants.java
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsConfigProperties.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsConfigProperties.java
similarity index 100%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsConfigProperties.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsConfigProperties.java
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySource.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySource.java
similarity index 100%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySource.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySource.java
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceLocator.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceLocator.java
similarity index 100%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceLocator.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceLocator.java
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigReloadAutoConfiguration.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java
similarity index 98%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigReloadAutoConfiguration.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java
index af3d3534..1a3e5fee 100644
--- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigReloadAutoConfiguration.java
+++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.springframework.cloud.kubernetes.reload;
+package org.springframework.cloud.kubernetes.config.reload;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
 import org.springframework.cloud.kubernetes.config.ConfigMapPropertySourceLocator;
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigReloadProperties.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadProperties.java
similarity index 98%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigReloadProperties.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadProperties.java
index 52cd2793..7320d65e 100644
--- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigReloadProperties.java
+++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.springframework.cloud.kubernetes.reload;
+package org.springframework.cloud.kubernetes.config.reload;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigurationChangeDetector.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetector.java
similarity index 98%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigurationChangeDetector.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetector.java
index e01e6d5c..74058a3d 100644
--- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigurationChangeDetector.java
+++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.springframework.cloud.kubernetes.reload;
+package org.springframework.cloud.kubernetes.config.reload;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigurationUpdateStrategy.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationUpdateStrategy.java
similarity index 96%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigurationUpdateStrategy.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationUpdateStrategy.java
index 87d2d7f4..62ef7386 100644
--- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/ConfigurationUpdateStrategy.java
+++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationUpdateStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.springframework.cloud.kubernetes.reload;
+package org.springframework.cloud.kubernetes.config.reload;
 
 import java.util.Objects;
 
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/EventBasedConfigurationChangeDetector.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetector.java
similarity index 99%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/EventBasedConfigurationChangeDetector.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetector.java
index 6500c6f8..33908ce0 100644
--- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/EventBasedConfigurationChangeDetector.java
+++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.springframework.cloud.kubernetes.reload;
+package org.springframework.cloud.kubernetes.config.reload;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/PollingConfigurationChangeDetector.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/PollingConfigurationChangeDetector.java
similarity index 98%
rename from spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/PollingConfigurationChangeDetector.java
rename to spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/PollingConfigurationChangeDetector.java
index c8bfe211..ee3db51a 100644
--- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/reload/PollingConfigurationChangeDetector.java
+++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/PollingConfigurationChangeDetector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.springframework.cloud.kubernetes.reload;
+package org.springframework.cloud.kubernetes.config.reload;
 
 import javax.annotation.PostConstruct;
 
diff --git a/spring-cloud-kubernetes-config/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-config/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..142d7999
--- /dev/null
+++ b/spring-cloud-kubernetes-config/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,5 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springframework.cloud.kubernetes.config.reload.ConfigReloadAutoConfiguration
+
+org.springframework.cloud.bootstrap.BootstrapConfiguration=\
+org.springframework.cloud.kubernetes.config.BootstrapConfiguration
diff --git a/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/CoreTest.groovy b/spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/CoreTest.groovy
similarity index 98%
rename from spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/CoreTest.groovy
rename to spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/CoreTest.groovy
index e850b420..8d37bee7 100644
--- a/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/CoreTest.groovy
+++ b/spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/CoreTest.groovy
@@ -15,7 +15,7 @@
  *
  */
 
-package org.springframework.cloud.kubernetes.config.test
+package org.springframework.cloud.kubernetes.config
 
 import io.fabric8.kubernetes.api.model.SecretBuilder
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder
diff --git a/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/TestApplication.groovy b/spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/TestApplication.groovy
similarity index 93%
rename from spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/TestApplication.groovy
rename to spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/TestApplication.groovy
index e1c172cc..25fa666d 100644
--- a/spring-cloud-kubernetes-core/src/test/groovy/io/fabric8/spring/cloud/kubernetes/config/test/TestApplication.groovy
+++ b/spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/TestApplication.groovy
@@ -15,7 +15,7 @@
  *
  */
 
-package org.springframework.cloud.kubernetes.config.test
+package org.springframework.cloud.kubernetes.config
 
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
diff --git a/spring-cloud-kubernetes-core/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-core/src/main/resources/META-INF/spring.factories
index 564f5b0d..226fa4b0 100644
--- a/spring-cloud-kubernetes-core/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-kubernetes-core/src/main/resources/META-INF/spring.factories
@@ -1,9 +1,5 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.kubernetes.KubernetesAutoConfiguration,\
-org.springframework.cloud.kubernetes.reload.ConfigReloadAutoConfiguration
-
-org.springframework.cloud.bootstrap.BootstrapConfiguration=\
-org.springframework.cloud.kubernetes.config.BootstrapConfiguration
+org.springframework.cloud.kubernetes.KubernetesAutoConfiguration\
 
 org.springframework.context.ApplicationContextInitializer=\
 org.springframework.cloud.kubernetes.profile.KubernetesApplicationContextInitializer