diff --git a/pom.xml b/pom.xml
index d5c5a3d3..6455388d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -26,8 +26,7 @@
 
 	<modules>
 		<module>spring-cloud-task-core</module>
+		<module>spring-cloud-task-samples</module>
 	</modules>
 
-
-
 </project>
diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/annotation/Task.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/annotation/Task.java
index 94add499..0437b854 100644
--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/annotation/Task.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/annotation/Task.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.cloud.task.config.DefaultTaskConfigurer;
+import org.springframework.cloud.task.configuration.DefaultTaskConfigurer;
 import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Component;
 
diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/config/DefaultTaskConfigurer.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/DefaultTaskConfigurer.java
similarity index 95%
rename from spring-cloud-task-core/src/main/java/org/springframework/cloud/task/config/DefaultTaskConfigurer.java
rename to spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/DefaultTaskConfigurer.java
index 11e22494..ff5ceab3 100644
--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/config/DefaultTaskConfigurer.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/DefaultTaskConfigurer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.task.config;
+package org.springframework.cloud.task.configuration;
 
 import org.springframework.cloud.task.repository.LoggerTaskRepository;
 import org.springframework.cloud.task.repository.TaskRepository;
diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/config/TaskConfigurer.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskConfigurer.java
similarity index 94%
rename from spring-cloud-task-core/src/main/java/org/springframework/cloud/task/config/TaskConfigurer.java
rename to spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskConfigurer.java
index 7ce5b1fa..3faf4855 100644
--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/config/TaskConfigurer.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskConfigurer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.task.config;
+package org.springframework.cloud.task.configuration;
 
 import org.springframework.cloud.task.repository.TaskRepository;
 
diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/config/TaskHandler.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskHandler.java
similarity index 98%
rename from spring-cloud-task-core/src/main/java/org/springframework/cloud/task/config/TaskHandler.java
rename to spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskHandler.java
index 8bed88f8..a32a2acd 100644
--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/config/TaskHandler.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.task.config;
+package org.springframework.cloud.task.configuration;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/spring-cloud-task-samples/pom.xml b/spring-cloud-task-samples/pom.xml
new file mode 100644
index 00000000..53d711a3
--- /dev/null
+++ b/spring-cloud-task-samples/pom.xml
@@ -0,0 +1,14 @@
+<?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-task-parent</artifactId>
+		<groupId>org.springframework.cloud</groupId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>spring-cloud-task-samples</artifactId>
+
+</project>