diff --git a/applications/stream-applications-core/pom.xml b/applications/stream-applications-core/pom.xml
index a1f81f45..6f464d0a 100644
--- a/applications/stream-applications-core/pom.xml
+++ b/applications/stream-applications-core/pom.xml
@@ -30,11 +30,11 @@
     </properties>
 
     <modules>
-        <module>common/stream-applications-test-support</module>
-        <module>common/stream-applications-postprocessor-common</module>
-        <module>common/stream-applications-micrometer-common</module>
-        <module>common/stream-applications-security-common</module>
-        <module>common/stream-applications-composite-function-support</module>
+        <module>stream-applications-test-support</module>
+        <module>stream-applications-postprocessor-common</module>
+        <module>stream-applications-micrometer-common</module>
+        <module>stream-applications-security-common</module>
+        <module>stream-applications-composite-function-support</module>
     </modules>
 
     <dependencyManagement>
diff --git a/applications/stream-applications-core/common/stream-applications-composite-function-support/pom.xml b/applications/stream-applications-core/stream-applications-composite-function-support/pom.xml
similarity index 98%
rename from applications/stream-applications-core/common/stream-applications-composite-function-support/pom.xml
rename to applications/stream-applications-core/stream-applications-composite-function-support/pom.xml
index 70a4c3cc..82a1b260 100644
--- a/applications/stream-applications-core/common/stream-applications-composite-function-support/pom.xml
+++ b/applications/stream-applications-core/stream-applications-composite-function-support/pom.xml
@@ -22,7 +22,7 @@
 		<groupId>org.springframework.cloud.stream.app</groupId>
 		<artifactId>stream-applications-core</artifactId>
 		<version>${revision}</version>
-		<relativePath>../..</relativePath>
+		<relativePath>..</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/applications/stream-applications-core/common/stream-applications-composite-function-support/src/main/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingEnvironmentPostProcessor.java b/applications/stream-applications-core/stream-applications-composite-function-support/src/main/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingEnvironmentPostProcessor.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-composite-function-support/src/main/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingEnvironmentPostProcessor.java
rename to applications/stream-applications-core/stream-applications-composite-function-support/src/main/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingEnvironmentPostProcessor.java
diff --git a/applications/stream-applications-core/common/stream-applications-composite-function-support/src/main/resources/META-INF/spring.factories b/applications/stream-applications-core/stream-applications-composite-function-support/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-composite-function-support/src/main/resources/META-INF/spring.factories
rename to applications/stream-applications-core/stream-applications-composite-function-support/src/main/resources/META-INF/spring.factories
diff --git a/applications/stream-applications-core/common/stream-applications-composite-function-support/src/test/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingsEnvironmentPostProcessorTests.java b/applications/stream-applications-core/stream-applications-composite-function-support/src/test/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingsEnvironmentPostProcessorTests.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-composite-function-support/src/test/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingsEnvironmentPostProcessorTests.java
rename to applications/stream-applications-core/stream-applications-composite-function-support/src/test/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingsEnvironmentPostProcessorTests.java
diff --git a/applications/stream-applications-core/common/stream-applications-micrometer-common/pom.xml b/applications/stream-applications-core/stream-applications-micrometer-common/pom.xml
similarity index 98%
rename from applications/stream-applications-core/common/stream-applications-micrometer-common/pom.xml
rename to applications/stream-applications-core/stream-applications-micrometer-common/pom.xml
index 8cd5df55..85c02c89 100644
--- a/applications/stream-applications-core/common/stream-applications-micrometer-common/pom.xml
+++ b/applications/stream-applications-core/stream-applications-micrometer-common/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>stream-applications-core</artifactId>
         <groupId>org.springframework.cloud.stream.app</groupId>
         <version>${revision}</version>
-        <relativePath>../..</relativePath>
+        <relativePath>..</relativePath>
     </parent>
     <properties>
         <jmockit.version>1.49</jmockit.version>
diff --git a/applications/stream-applications-core/common/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTags.java b/applications/stream-applications-core/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTags.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTags.java
rename to applications/stream-applications-core/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTags.java
diff --git a/applications/stream-applications-core/common/stream-applications-micrometer-common/src/main/resources/META-INF/spring.factories b/applications/stream-applications-core/stream-applications-micrometer-common/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-micrometer-common/src/main/resources/META-INF/spring.factories
rename to applications/stream-applications-core/stream-applications-micrometer-common/src/main/resources/META-INF/spring.factories
diff --git a/applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/AbstractMicrometerTagTest.java b/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/AbstractMicrometerTagTest.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/AbstractMicrometerTagTest.java
rename to applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/AbstractMicrometerTagTest.java
diff --git a/applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTagsTest.java b/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTagsTest.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTagsTest.java
rename to applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTagsTest.java
diff --git a/applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/resources/org/springframework/cloud/stream/app/micrometer/common/pcf-scs-info.json b/applications/stream-applications-core/stream-applications-micrometer-common/src/test/resources/org/springframework/cloud/stream/app/micrometer/common/pcf-scs-info.json
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/resources/org/springframework/cloud/stream/app/micrometer/common/pcf-scs-info.json
rename to applications/stream-applications-core/stream-applications-micrometer-common/src/test/resources/org/springframework/cloud/stream/app/micrometer/common/pcf-scs-info.json
diff --git a/applications/stream-applications-core/common/stream-applications-postprocessor-common/pom.xml b/applications/stream-applications-core/stream-applications-postprocessor-common/pom.xml
similarity index 95%
rename from applications/stream-applications-core/common/stream-applications-postprocessor-common/pom.xml
rename to applications/stream-applications-core/stream-applications-postprocessor-common/pom.xml
index 25fdc63b..d8f639f7 100644
--- a/applications/stream-applications-core/common/stream-applications-postprocessor-common/pom.xml
+++ b/applications/stream-applications-core/stream-applications-postprocessor-common/pom.xml
@@ -5,7 +5,7 @@
         <artifactId>stream-applications-core</artifactId>
         <groupId>org.springframework.cloud.stream.app</groupId>
         <version>${revision}</version>
-        <relativePath>../..</relativePath>
+        <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/applications/stream-applications-core/common/stream-applications-postprocessor-common/src/main/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessor.java b/applications/stream-applications-core/stream-applications-postprocessor-common/src/main/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessor.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-postprocessor-common/src/main/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessor.java
rename to applications/stream-applications-core/stream-applications-postprocessor-common/src/main/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessor.java
diff --git a/applications/stream-applications-core/common/stream-applications-postprocessor-common/src/main/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeHeaderBeanPostProcessorAutoConfiguration.java b/applications/stream-applications-core/stream-applications-postprocessor-common/src/main/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeHeaderBeanPostProcessorAutoConfiguration.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-postprocessor-common/src/main/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeHeaderBeanPostProcessorAutoConfiguration.java
rename to applications/stream-applications-core/stream-applications-postprocessor-common/src/main/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeHeaderBeanPostProcessorAutoConfiguration.java
diff --git a/applications/stream-applications-core/common/stream-applications-postprocessor-common/src/main/resources/META-INF/spring.factories b/applications/stream-applications-core/stream-applications-postprocessor-common/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-postprocessor-common/src/main/resources/META-INF/spring.factories
rename to applications/stream-applications-core/stream-applications-postprocessor-common/src/main/resources/META-INF/spring.factories
diff --git a/applications/stream-applications-core/common/stream-applications-postprocessor-common/src/test/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessorTests.java b/applications/stream-applications-core/stream-applications-postprocessor-common/src/test/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessorTests.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-postprocessor-common/src/test/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessorTests.java
rename to applications/stream-applications-core/stream-applications-postprocessor-common/src/test/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessorTests.java
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/README.adoc b/applications/stream-applications-core/stream-applications-security-common/README.adoc
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/README.adoc
rename to applications/stream-applications-core/stream-applications-security-common/README.adoc
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/pom.xml b/applications/stream-applications-core/stream-applications-security-common/pom.xml
similarity index 97%
rename from applications/stream-applications-core/common/stream-applications-security-common/pom.xml
rename to applications/stream-applications-core/stream-applications-security-common/pom.xml
index bd488120..241827e3 100644
--- a/applications/stream-applications-core/common/stream-applications-security-common/pom.xml
+++ b/applications/stream-applications-core/stream-applications-security-common/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>stream-applications-core</artifactId>
         <groupId>org.springframework.cloud.stream.app</groupId>
         <version>${revision}</version>
-        <relativePath>../..</relativePath>
+        <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebFluxSecurityAutoConfiguration.java b/applications/stream-applications-core/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebFluxSecurityAutoConfiguration.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebFluxSecurityAutoConfiguration.java
rename to applications/stream-applications-core/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebFluxSecurityAutoConfiguration.java
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfiguration.java b/applications/stream-applications-core/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfiguration.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfiguration.java
rename to applications/stream-applications-core/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfiguration.java
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfigurationProperties.java b/applications/stream-applications-core/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfigurationProperties.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfigurationProperties.java
rename to applications/stream-applications-core/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfigurationProperties.java
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/OnHttpCsrfOrSecurityDisabled.java b/applications/stream-applications-core/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/OnHttpCsrfOrSecurityDisabled.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/OnHttpCsrfOrSecurityDisabled.java
rename to applications/stream-applications-core/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/OnHttpCsrfOrSecurityDisabled.java
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/main/resources/META-INF/spring.factories b/applications/stream-applications-core/stream-applications-security-common/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/main/resources/META-INF/spring.factories
rename to applications/stream-applications-core/stream-applications-security-common/src/main/resources/META-INF/spring.factories
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/AbstractSecurityCommonTests.java b/applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/AbstractSecurityCommonTests.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/AbstractSecurityCommonTests.java
rename to applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/AbstractSecurityCommonTests.java
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityDisabledManagementSecurityEnabledTests.java b/applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityDisabledManagementSecurityEnabledTests.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityDisabledManagementSecurityEnabledTests.java
rename to applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityDisabledManagementSecurityEnabledTests.java
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java b/applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java
rename to applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java b/applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java
rename to applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityEnabledTests.java b/applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityEnabledTests.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityEnabledTests.java
rename to applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityEnabledTests.java
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityDisabledManagementSecurityEnabledTests.java b/applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityDisabledManagementSecurityEnabledTests.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityDisabledManagementSecurityEnabledTests.java
rename to applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityDisabledManagementSecurityEnabledTests.java
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java b/applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java
rename to applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java b/applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java
rename to applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java
diff --git a/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityEnabledTests.java b/applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityEnabledTests.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityEnabledTests.java
rename to applications/stream-applications-core/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityEnabledTests.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/README.adoc b/applications/stream-applications-core/stream-applications-test-support/README.adoc
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/README.adoc
rename to applications/stream-applications-core/stream-applications-test-support/README.adoc
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/pom.xml b/applications/stream-applications-core/stream-applications-test-support/pom.xml
similarity index 98%
rename from applications/stream-applications-core/common/stream-applications-test-support/pom.xml
rename to applications/stream-applications-core/stream-applications-test-support/pom.xml
index 42309cac..a9148984 100644
--- a/applications/stream-applications-core/common/stream-applications-test-support/pom.xml
+++ b/applications/stream-applications-core/stream-applications-test-support/pom.xml
@@ -5,7 +5,7 @@
 		<artifactId>stream-applications-core</artifactId>
 		<groupId>org.springframework.cloud.stream.app</groupId>
 		<version>${revision}</version>
-		<relativePath>../..</relativePath>
+		<relativePath>..</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/BinderTestPropertiesInitializer.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/BinderTestPropertiesInitializer.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/BinderTestPropertiesInitializer.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/BinderTestPropertiesInitializer.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/file/remote/RemoteFileTestSupport.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/file/remote/RemoteFileTestSupport.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/file/remote/RemoteFileTestSupport.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/file/remote/RemoteFileTestSupport.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/AbstractTestTopicListener.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/AbstractTestTopicListener.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/AbstractTestTopicListener.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/AbstractTestTopicListener.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/AppLog.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/AppLog.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/AppLog.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/AppLog.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/FluentMap.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/FluentMap.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/FluentMap.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/FluentMap.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/LogMatcher.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/LogMatcher.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/LogMatcher.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/LogMatcher.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamAppContainer.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamAppContainer.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamAppContainer.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamAppContainer.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamApplicationIntegrationTestSupport.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamApplicationIntegrationTestSupport.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamApplicationIntegrationTestSupport.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamApplicationIntegrationTestSupport.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamApps.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamApps.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamApps.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamApps.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/TestTopicListener.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/TestTopicListener.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/TestTopicListener.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/TestTopicListener.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamAppContainer.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamAppContainer.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamAppContainer.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamAppContainer.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamApplicationIntegrationTestSupport.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamApplicationIntegrationTestSupport.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamApplicationIntegrationTestSupport.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamApplicationIntegrationTestSupport.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamApps.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamApps.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamApps.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamApps.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamAppContainer.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamAppContainer.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamAppContainer.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamAppContainer.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamApplicationIntegrationTestSupport.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamApplicationIntegrationTestSupport.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamApplicationIntegrationTestSupport.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamApplicationIntegrationTestSupport.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamApps.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamApps.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamApps.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamApps.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSinkTestConfiguration.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSinkTestConfiguration.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSinkTestConfiguration.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSinkTestConfiguration.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSourceTestConfiguration.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSourceTestConfiguration.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSourceTestConfiguration.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSourceTestConfiguration.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/script/ScriptableTestConfiguration.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/script/ScriptableTestConfiguration.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/script/ScriptableTestConfiguration.java
rename to applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/script/ScriptableTestConfiguration.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/test/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamApplicationIntegrationTestSupportTests.java b/applications/stream-applications-core/stream-applications-test-support/src/test/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamApplicationIntegrationTestSupportTests.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/test/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamApplicationIntegrationTestSupportTests.java
rename to applications/stream-applications-core/stream-applications-test-support/src/test/java/org/springframework/cloud/stream/app/test/integration/kafka/KafkaStreamApplicationIntegrationTestSupportTests.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/test/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamApplicationIntegrationTestSupportTests.java b/applications/stream-applications-core/stream-applications-test-support/src/test/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamApplicationIntegrationTestSupportTests.java
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/test/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamApplicationIntegrationTestSupportTests.java
rename to applications/stream-applications-core/stream-applications-test-support/src/test/java/org/springframework/cloud/stream/app/test/integration/rabbitmq/RabbitMQStreamApplicationIntegrationTestSupportTests.java
diff --git a/applications/stream-applications-core/common/stream-applications-test-support/src/test/resources/logback-test.xml b/applications/stream-applications-core/stream-applications-test-support/src/test/resources/logback-test.xml
similarity index 100%
rename from applications/stream-applications-core/common/stream-applications-test-support/src/test/resources/logback-test.xml
rename to applications/stream-applications-core/stream-applications-test-support/src/test/resources/logback-test.xml
diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml
index 61f1c3f8..acf52544 100644
--- a/stream-applications-build/pom.xml
+++ b/stream-applications-build/pom.xml
@@ -41,7 +41,7 @@
 		<disable.nohttp.checks>true</disable.nohttp.checks>
 		<spring-javaformat-checkstyle.version>0.0.7</spring-javaformat-checkstyle.version>
 		<spring-boot.version>2.3.4.RELEASE</spring-boot.version>
-		<spring-kafka.version>2.6.0-M1</spring-kafka.version>
+		<spring-kafka.version>2.6.2</spring-kafka.version>
 		<spring-rabbit.version>2.2.11.RELEASE</spring-rabbit.version>
 		<spring-cloud-function.version>3.0.9.RELEASE</spring-cloud-function.version>
 		<spring-integration-dependencies.version>5.3.3.BUILD-SNAPSHOT</spring-integration-dependencies.version>