diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml
index c4ebb7718..431c83115 100644
--- a/spring-cloud-function-adapters/pom.xml
+++ b/spring-cloud-function-adapters/pom.xml
@@ -17,7 +17,6 @@
 	<modules>
 		<module>spring-cloud-function-adapter-aws</module>
 		<module>spring-cloud-function-adapter-openwhisk</module>
-		<module>spring-cloud-function-adapter-samples</module>
-  </modules>
+  	</modules>
 
 </project>
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/pom.xml
deleted file mode 100644
index 04ed9523b..000000000
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>org.springframework.cloud</groupId>
-	<artifactId>spring-cloud-function-adapter-samples</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
-	<packaging>pom</packaging>
-
-	<modules>
-		<module>function-adapter-sample-aws</module>
-	</modules>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/.jdk8 b/spring-cloud-function-samples/function-sample-aws/.jdk8
similarity index 100%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/.jdk8
rename to spring-cloud-function-samples/function-sample-aws/.jdk8
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/build.gradle b/spring-cloud-function-samples/function-sample-aws/build.gradle
similarity index 100%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/build.gradle
rename to spring-cloud-function-samples/function-sample-aws/build.gradle
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-function-samples/function-sample-aws/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradle/wrapper/gradle-wrapper.jar
rename to spring-cloud-function-samples/function-sample-aws/gradle/wrapper/gradle-wrapper.jar
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-function-samples/function-sample-aws/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradle/wrapper/gradle-wrapper.properties
rename to spring-cloud-function-samples/function-sample-aws/gradle/wrapper/gradle-wrapper.properties
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradlew b/spring-cloud-function-samples/function-sample-aws/gradlew
similarity index 100%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradlew
rename to spring-cloud-function-samples/function-sample-aws/gradlew
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradlew.bat b/spring-cloud-function-samples/function-sample-aws/gradlew.bat
similarity index 100%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradlew.bat
rename to spring-cloud-function-samples/function-sample-aws/gradlew.bat
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml
similarity index 98%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/pom.xml
rename to spring-cloud-function-samples/function-sample-aws/pom.xml
index 5825fd20e..2d7b7eb60 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>io.spring.sample</groupId>
-	<artifactId>function-adapter-sample-aws</artifactId>
+	<artifactId>function-sample-aws</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/java/example/Config.java b/spring-cloud-function-samples/function-sample-aws/src/main/java/example/Config.java
similarity index 100%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/java/example/Config.java
rename to spring-cloud-function-samples/function-sample-aws/src/main/java/example/Config.java
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/java/example/Handler.java b/spring-cloud-function-samples/function-sample-aws/src/main/java/example/Handler.java
similarity index 100%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/java/example/Handler.java
rename to spring-cloud-function-samples/function-sample-aws/src/main/java/example/Handler.java
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/java/example/Properties.java b/spring-cloud-function-samples/function-sample-aws/src/main/java/example/Properties.java
similarity index 100%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/java/example/Properties.java
rename to spring-cloud-function-samples/function-sample-aws/src/main/java/example/Properties.java
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/resources/META-INF/thin.properties b/spring-cloud-function-samples/function-sample-aws/src/main/resources/META-INF/thin.properties
similarity index 100%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/resources/META-INF/thin.properties
rename to spring-cloud-function-samples/function-sample-aws/src/main/resources/META-INF/thin.properties
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/resources/log4j.properties b/spring-cloud-function-samples/function-sample-aws/src/main/resources/log4j.properties
similarity index 100%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/resources/log4j.properties
rename to spring-cloud-function-samples/function-sample-aws/src/main/resources/log4j.properties
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/test/java/example/MapTests.java b/spring-cloud-function-samples/function-sample-aws/src/test/java/example/MapTests.java
similarity index 100%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/test/java/example/MapTests.java
rename to spring-cloud-function-samples/function-sample-aws/src/test/java/example/MapTests.java
diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml
index 5aedc1268..77df80170 100644
--- a/spring-cloud-function-samples/pom.xml
+++ b/spring-cloud-function-samples/pom.xml
@@ -18,6 +18,7 @@
 		<module>function-sample-pojo</module>
 		<module>function-sample-compiler</module>
 		<module>function-sample-task</module>
+		<module>function-sample-aws</module>
 	</modules>
 
 	<build>