diff --git a/common/pom.xml b/common/pom.xml
new file mode 100644
index 00000000..fae2a428
--- /dev/null
+++ b/common/pom.xml
@@ -0,0 +1,29 @@
+<?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.fn</groupId>
+	<artifactId>functions-common</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+	<name>java-functions-common</name>
+	<description>Java Functions Common</description>
+	<packaging>pom</packaging>
+
+	<modules>
+        <module>config-common</module>
+        <module>aws-s3-common</module>
+		<module>file-common</module>
+		<module>ftp-common</module>
+		<module>function-test-support</module>
+		<module>geode-common</module>
+		<module>metadata-store-common</module>
+		<module>mqtt-common</module>
+		<module>tcp-common</module>
+		<module>twitter-common</module>
+		<module>tensorflow-common</module>
+		<module>cdc-debezium-common</module>
+		<module>cdc-debezium-boot-starter</module>
+	</modules>
+
+</project>
diff --git a/consumer/pom.xml b/consumer/pom.xml
new file mode 100644
index 00000000..a7d7c04c
--- /dev/null
+++ b/consumer/pom.xml
@@ -0,0 +1,37 @@
+<?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.fn</groupId>
+	<artifactId>java-functions-consumer</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+	<name>java-functions-consumer</name>
+	<description>Java Functions Consumer</description>
+	<packaging>pom</packaging>
+
+	<modules>
+
+		<module>cassandra-consumer</module>
+		<module>elasticsearch-consumer</module>
+		<module>analytics-consumer</module>
+		<module>file-consumer</module>
+		<module>ftp-consumer</module>
+		<module>geode-consumer</module>
+		<module>jdbc-consumer</module>
+		<module>log-consumer</module>
+		<module>mongodb-consumer</module>
+		<module>mqtt-consumer</module>
+		<module>rabbit-consumer</module>
+		<module>redis-consumer</module>
+		<module>sftp-consumer</module>
+		<module>tcp-consumer</module>
+		<module>websocket-consumer</module>
+		<module>s3-consumer</module>
+		<module>twitter-consumer</module>
+		<module>wavefront-consumer</module>
+		<module>rsocket-consumer</module>
+		<module>zeromq-consumer</module>
+	</modules>
+
+</project>
diff --git a/function/pom.xml b/function/pom.xml
new file mode 100644
index 00000000..6d1dd859
--- /dev/null
+++ b/function/pom.xml
@@ -0,0 +1,28 @@
+<?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.fn</groupId>
+    <artifactId>java-functions-function</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <name>java-functions-function</name>
+    <description>Java Functions Function</description>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>aggregator-function</module>
+        <module>filter-function</module>
+        <module>header-enricher-function</module>
+        <module>http-request-function</module>
+        <module>spel-function</module>
+        <module>payload-converter-function</module>
+        <module>splitter-function</module>
+        <module>task-launch-request-function</module>
+        <module>twitter-function</module>
+        <module>image-recognition-function</module>
+        <module>object-detection-function</module>
+        <module>semantic-segmentation-function</module>
+    </modules>
+
+</project>
diff --git a/pom.xml b/pom.xml
index b4e8bb09..24d7f149 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,77 +11,11 @@
 	<packaging>pom</packaging>
 
 	<modules>
-        <module>common/config-common</module>
-
-        <module>common/aws-s3-common</module>
-		<module>common/file-common</module>
-		<module>common/ftp-common</module>
-		<module>common/function-test-support</module>
-		<module>common/geode-common</module>
-		<module>common/metadata-store-common</module>
-		<module>common/mqtt-common</module>
-		<module>common/tcp-common</module>
-		<module>common/twitter-common</module>
-		<module>common/tensorflow-common</module>
-		<module>common/cdc-debezium-common</module>
-		<module>common/cdc-debezium-boot-starter</module>
-
-		<module>consumer/cassandra-consumer</module>
-		<module>consumer/elasticsearch-consumer</module>
-		<module>consumer/analytics-consumer</module>
-		<module>consumer/file-consumer</module>
-		<module>consumer/ftp-consumer</module>
-		<module>consumer/geode-consumer</module>
-		<module>consumer/jdbc-consumer</module>
-		<module>consumer/log-consumer</module>
-		<module>consumer/mongodb-consumer</module>
-		<module>consumer/mqtt-consumer</module>
-		<module>consumer/rabbit-consumer</module>
-		<module>consumer/redis-consumer</module>
-		<module>consumer/sftp-consumer</module>
-		<module>consumer/tcp-consumer</module>
-		<module>consumer/websocket-consumer</module>
-		<module>consumer/s3-consumer</module>
-		<module>consumer/twitter-consumer</module>
-		<module>consumer/wavefront-consumer</module>
-		<module>consumer/rsocket-consumer</module>
-		<module>consumer/zeromq-consumer</module>
-
-		<module>function/aggregator-function</module>
-		<module>function/filter-function</module>
-		<module>function/header-enricher-function</module>
-		<module>function/http-request-function</module>
-		<module>function/spel-function</module>
-		<module>function/payload-converter-function</module>
-		<module>function/splitter-function</module>
-		<module>function/task-launch-request-function</module>
-		<module>function/twitter-function</module>
-		<module>function/image-recognition-function</module>
-		<module>function/object-detection-function</module>
-		<module>function/semantic-segmentation-function</module>
-
-		<module>supplier/file-supplier</module>
-		<module>supplier/ftp-supplier</module>
-		<module>supplier/geode-supplier</module>
-		<module>supplier/http-supplier</module>
-		<module>supplier/jdbc-supplier</module>
-		<module>supplier/jms-supplier</module>
-		<module>supplier/mail-supplier</module>
-		<module>supplier/mongodb-supplier</module>
-		<module>supplier/mqtt-supplier</module>
-		<module>supplier/sftp-supplier</module>
-		<module>supplier/tcp-supplier</module>
-		<module>supplier/time-supplier</module>
-		<module>supplier/rabbit-supplier</module>
-		<module>supplier/websocket-supplier</module>
-		<module>supplier/s3-supplier</module>
-		<module>supplier/twitter-supplier</module>
-		<module>supplier/cdc-debezium-supplier</module>
-		<module>supplier/syslog-supplier</module>
-		<module>supplier/zeromq-supplier</module>
-
+        <module>common</module>
 		<module>spring-functions-parent</module>
-
+		<module>consumer</module>
+		<module>function</module>
+		<module>supplier</module>
 		<module>function-dependencies</module>
 	</modules>
 
diff --git a/supplier/pom.xml b/supplier/pom.xml
new file mode 100644
index 00000000..34cd96ff
--- /dev/null
+++ b/supplier/pom.xml
@@ -0,0 +1,35 @@
+<?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.fn</groupId>
+	<artifactId>java-functions-supplier</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+	<name>java-functions-supplier</name>
+	<description>Java Functions Supplier</description>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>file-supplier</module>
+		<module>ftp-supplier</module>
+		<module>geode-supplier</module>
+		<module>http-supplier</module>
+		<module>jdbc-supplier</module>
+		<module>jms-supplier</module>
+		<module>mail-supplier</module>
+		<module>mongodb-supplier</module>
+		<module>mqtt-supplier</module>
+		<module>sftp-supplier</module>
+		<module>tcp-supplier</module>
+		<module>time-supplier</module>
+		<module>rabbit-supplier</module>
+		<module>websocket-supplier</module>
+		<module>s3-supplier</module>
+		<module>twitter-supplier</module>
+		<module>cdc-debezium-supplier</module>
+		<module>syslog-supplier</module>
+		<module>zeromq-supplier</module>
+	</modules>
+
+</project>