diff --git a/applications/processor/bridge-processor/pom.xml b/applications/processor/bridge-processor/pom.xml
index 0f55303a..79fe63f8 100644
--- a/applications/processor/bridge-processor/pom.xml
+++ b/applications/processor/bridge-processor/pom.xml
@@ -43,8 +43,7 @@
                         <name>bridge</name>
                         <type>processor</type>
                         <version>${project.version}</version>
-                        <configClass>org.springframework.cloud.stream.app.BridgeProcessorConfiguration.class
-                        </configClass>
+                        <configClass>org.springframework.cloud.stream.app.processor.bridge.BridgeProcessorConfiguration.class</configClass>
                         <functionDefinition>bridgeFunction</functionDefinition>
                     </generatedApp>
 
diff --git a/applications/processor/bridge-processor/src/main/java/org/springframework/cloud/stream/app/BridgeProcessorConfiguration.java b/applications/processor/bridge-processor/src/main/java/org/springframework/cloud/stream/app/processor/bridge/BridgeProcessorConfiguration.java
similarity index 93%
rename from applications/processor/bridge-processor/src/main/java/org/springframework/cloud/stream/app/BridgeProcessorConfiguration.java
rename to applications/processor/bridge-processor/src/main/java/org/springframework/cloud/stream/app/processor/bridge/BridgeProcessorConfiguration.java
index 59284d61..f832596c 100644
--- a/applications/processor/bridge-processor/src/main/java/org/springframework/cloud/stream/app/BridgeProcessorConfiguration.java
+++ b/applications/processor/bridge-processor/src/main/java/org/springframework/cloud/stream/app/processor/bridge/BridgeProcessorConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app;
+package org.springframework.cloud.stream.app.processor.bridge;
 
 import java.util.function.Function;
 
diff --git a/applications/processor/bridge-processor/src/test/java/org/springframework/cloud/stream/app/BridgeProcessorTests.java b/applications/processor/bridge-processor/src/test/java/org/springframework/cloud/stream/app/processor/bridge/BridgeProcessorTests.java
similarity index 97%
rename from applications/processor/bridge-processor/src/test/java/org/springframework/cloud/stream/app/BridgeProcessorTests.java
rename to applications/processor/bridge-processor/src/test/java/org/springframework/cloud/stream/app/processor/bridge/BridgeProcessorTests.java
index 06735e64..e230a875 100644
--- a/applications/processor/bridge-processor/src/test/java/org/springframework/cloud/stream/app/BridgeProcessorTests.java
+++ b/applications/processor/bridge-processor/src/test/java/org/springframework/cloud/stream/app/processor/bridge/BridgeProcessorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app;
+package org.springframework.cloud.stream.app.processor.bridge;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/applications/processor/filter-processor/src/test/java/org/springframework/cloud/stream/app/header/enricher/processor/FilterProcessorTests.java b/applications/processor/filter-processor/src/test/java/org/springframework/cloud/stream/app/processor/filter/FilterProcessorTests.java
similarity index 97%
rename from applications/processor/filter-processor/src/test/java/org/springframework/cloud/stream/app/header/enricher/processor/FilterProcessorTests.java
rename to applications/processor/filter-processor/src/test/java/org/springframework/cloud/stream/app/processor/filter/FilterProcessorTests.java
index 2d52383d..0d3e6745 100644
--- a/applications/processor/filter-processor/src/test/java/org/springframework/cloud/stream/app/header/enricher/processor/FilterProcessorTests.java
+++ b/applications/processor/filter-processor/src/test/java/org/springframework/cloud/stream/app/processor/filter/FilterProcessorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.header.enricher.processor;
+package org.springframework.cloud.stream.app.processor.filter;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/applications/processor/groovy-processor/pom.xml b/applications/processor/groovy-processor/pom.xml
index 6adfa06b..0fa76f7d 100644
--- a/applications/processor/groovy-processor/pom.xml
+++ b/applications/processor/groovy-processor/pom.xml
@@ -3,7 +3,7 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          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>
-    <artifactId>groovy-transform-processor</artifactId>
+    <artifactId>groovy-processor</artifactId>
     <name>groovy-processor</name>
     <description>groovy processor apps</description>
     <version>3.0.0-SNAPSHOT</version>
@@ -92,7 +92,7 @@
                         <type>processor</type>
                         <version>${project.version}</version>
                         <configClass>
-                            org.springframework.cloud.stream.app.groovy.processor.GroovyProcessorConfiguration.class
+                            org.springframework.cloud.stream.app.processor.groovy.GroovyProcessorConfiguration.class
                         </configClass>
                         <functionDefinition>byteArrayTextToString|groovyProcessorFunction</functionDefinition>
                     </generatedApp>
diff --git a/applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorConfiguration.java b/applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/processor/groovy/GroovyProcessorConfiguration.java
similarity index 97%
rename from applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorConfiguration.java
rename to applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/processor/groovy/GroovyProcessorConfiguration.java
index 06f1746e..1cfc57ee 100644
--- a/applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorConfiguration.java
+++ b/applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/processor/groovy/GroovyProcessorConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.groovy.processor;
+package org.springframework.cloud.stream.app.processor.groovy;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorProperties.java b/applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/processor/groovy/GroovyProcessorProperties.java
similarity index 96%
rename from applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorProperties.java
rename to applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/processor/groovy/GroovyProcessorProperties.java
index 2e469cc0..22332f57 100644
--- a/applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorProperties.java
+++ b/applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/processor/groovy/GroovyProcessorProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.groovy.processor;
+package org.springframework.cloud.stream.app.processor.groovy;
 
 import java.util.Properties;
 
diff --git a/applications/processor/groovy-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/applications/processor/groovy-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
index eafc5392..845b1d3a 100644
--- a/applications/processor/groovy-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
+++ b/applications/processor/groovy-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
@@ -1,3 +1,3 @@
-configuration-properties.classes=org.springframework.cloud.stream.app.groovy.processor.GroovyProcessorProperties
+configuration-properties.classes=org.springframework.cloud.stream.app.processor.groovy.GroovyProcessorProperties
 
 
diff --git a/applications/processor/groovy-processor/src/test/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorIntegrationTests.java b/applications/processor/groovy-processor/src/test/java/org/springframework/cloud/stream/app/processor/groovy/GroovyProcessorIntegrationTests.java
similarity index 98%
rename from applications/processor/groovy-processor/src/test/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorIntegrationTests.java
rename to applications/processor/groovy-processor/src/test/java/org/springframework/cloud/stream/app/processor/groovy/GroovyProcessorIntegrationTests.java
index b1271b15..abb0941a 100644
--- a/applications/processor/groovy-processor/src/test/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorIntegrationTests.java
+++ b/applications/processor/groovy-processor/src/test/java/org/springframework/cloud/stream/app/processor/groovy/GroovyProcessorIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.groovy.processor;
+package org.springframework.cloud.stream.app.processor.groovy;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/applications/processor/header-enricher-processor/src/test/java/org/springframework/cloud/stream/app/header/enricher/processor/HeaderEnricherProcessorTests.java b/applications/processor/header-enricher-processor/src/test/java/org/springframework/cloud/stream/app/processor/header/enricher/HeaderEnricherProcessorTests.java
similarity index 97%
rename from applications/processor/header-enricher-processor/src/test/java/org/springframework/cloud/stream/app/header/enricher/processor/HeaderEnricherProcessorTests.java
rename to applications/processor/header-enricher-processor/src/test/java/org/springframework/cloud/stream/app/processor/header/enricher/HeaderEnricherProcessorTests.java
index 057e67d9..40fd4566 100644
--- a/applications/processor/header-enricher-processor/src/test/java/org/springframework/cloud/stream/app/header/enricher/processor/HeaderEnricherProcessorTests.java
+++ b/applications/processor/header-enricher-processor/src/test/java/org/springframework/cloud/stream/app/processor/header/enricher/HeaderEnricherProcessorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.header.enricher.processor;
+package org.springframework.cloud.stream.app.processor.header.enricher;
 
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
diff --git a/applications/processor/splitter-processor/src/test/java/org/springframework/cloud/stream/app/splitter/processor/SplitterProcessorTests.java b/applications/processor/splitter-processor/src/test/java/org/springframework/cloud/stream/app/processor/splitter/SplitterProcessorTests.java
similarity index 97%
rename from applications/processor/splitter-processor/src/test/java/org/springframework/cloud/stream/app/splitter/processor/SplitterProcessorTests.java
rename to applications/processor/splitter-processor/src/test/java/org/springframework/cloud/stream/app/processor/splitter/SplitterProcessorTests.java
index 8e5235b8..fe32bd85 100644
--- a/applications/processor/splitter-processor/src/test/java/org/springframework/cloud/stream/app/splitter/processor/SplitterProcessorTests.java
+++ b/applications/processor/splitter-processor/src/test/java/org/springframework/cloud/stream/app/processor/splitter/SplitterProcessorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.splitter.processor;
+package org.springframework.cloud.stream.app.processor.splitter;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/applications/processor/transform-processor/src/test/java/org/springframework/cloud/stream/app/transform/processor/TransformProcessorTests.java b/applications/processor/transform-processor/src/test/java/org/springframework/cloud/stream/app/processor/transform/TransformProcessorTests.java
similarity index 97%
rename from applications/processor/transform-processor/src/test/java/org/springframework/cloud/stream/app/transform/processor/TransformProcessorTests.java
rename to applications/processor/transform-processor/src/test/java/org/springframework/cloud/stream/app/processor/transform/TransformProcessorTests.java
index 837df49c..fab71b65 100644
--- a/applications/processor/transform-processor/src/test/java/org/springframework/cloud/stream/app/transform/processor/TransformProcessorTests.java
+++ b/applications/processor/transform-processor/src/test/java/org/springframework/cloud/stream/app/processor/transform/TransformProcessorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.transform.processor;
+package org.springframework.cloud.stream.app.processor.transform;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/applications/sink/counter-sink/pom.xml b/applications/sink/counter-sink/pom.xml
index e75250ee..dd4e9f67 100644
--- a/applications/sink/counter-sink/pom.xml
+++ b/applications/sink/counter-sink/pom.xml
@@ -61,8 +61,7 @@
                         <name>counter</name>
                         <type>sink</type>
                         <version>${project.version}</version>
-                        <configClass>org.springframework.cloud.fn.consumer.counter.CounterConsumerConfiguration.class
-                        </configClass>
+                        <configClass>org.springframework.cloud.fn.consumer.counter.CounterConsumerConfiguration.class</configClass>
                         <functionDefinition>byteArrayTextToString|counterConsumer</functionDefinition>
                     </generatedApp>
                     <dependencies>
diff --git a/applications/sink/counter-sink/src/test/java/org/springframework/cloud/stream/app/counter/sink/CounterSinkTests.java b/applications/sink/counter-sink/src/test/java/org/springframework/cloud/stream/app/sink/counter/CounterSinkTests.java
similarity index 98%
rename from applications/sink/counter-sink/src/test/java/org/springframework/cloud/stream/app/counter/sink/CounterSinkTests.java
rename to applications/sink/counter-sink/src/test/java/org/springframework/cloud/stream/app/sink/counter/CounterSinkTests.java
index e938f155..75732e2c 100644
--- a/applications/sink/counter-sink/src/test/java/org/springframework/cloud/stream/app/counter/sink/CounterSinkTests.java
+++ b/applications/sink/counter-sink/src/test/java/org/springframework/cloud/stream/app/sink/counter/CounterSinkTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.counter.sink;
+package org.springframework.cloud.stream.app.sink.counter;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/applications/sink/file-sink/pom.xml b/applications/sink/file-sink/pom.xml
index 5f9dcc59..06879ad9 100644
--- a/applications/sink/file-sink/pom.xml
+++ b/applications/sink/file-sink/pom.xml
@@ -42,8 +42,7 @@
                         <name>file</name>
                         <type>sink</type>
                         <version>${project.version}</version>
-                        <configClass>org.springframework.cloud.fn.consumer.file.FileConsumerConfiguration.class
-                        </configClass>
+                        <configClass>org.springframework.cloud.fn.consumer.file.FileConsumerConfiguration.class</configClass>
                     </generatedApp>
                     <dependencies>
                         <dependency>
diff --git a/applications/sink/file-sink/src/test/java/org/springframework/cloud/stream/app/FileSinkTests.java b/applications/sink/file-sink/src/test/java/org/springframework/cloud/stream/app/file/sink/FileSinkTests.java
similarity index 97%
rename from applications/sink/file-sink/src/test/java/org/springframework/cloud/stream/app/FileSinkTests.java
rename to applications/sink/file-sink/src/test/java/org/springframework/cloud/stream/app/file/sink/FileSinkTests.java
index 75a8b0f5..eb6f283c 100644
--- a/applications/sink/file-sink/src/test/java/org/springframework/cloud/stream/app/FileSinkTests.java
+++ b/applications/sink/file-sink/src/test/java/org/springframework/cloud/stream/app/file/sink/FileSinkTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app;
+package org.springframework.cloud.stream.app.file.sink;
 
 import java.io.File;
 import java.io.FileReader;
diff --git a/applications/sink/jdbc-sink/pom.xml b/applications/sink/jdbc-sink/pom.xml
index 59d2fcb9..14966577 100644
--- a/applications/sink/jdbc-sink/pom.xml
+++ b/applications/sink/jdbc-sink/pom.xml
@@ -60,8 +60,7 @@
                         <name>jdbc</name>
                         <type>sink</type>
                         <version>${project.version}</version>
-                        <configClass>org.springframework.cloud.fn.consumer.jdbc.JdbcConsumerConfiguration.class
-                        </configClass>
+                        <configClass>org.springframework.cloud.fn.consumer.jdbc.JdbcConsumerConfiguration.class</configClass>
                     </generatedApp>
                     <dependencies>
                         <dependency>
diff --git a/applications/sink/jdbc-sink/src/test/java/org/springframework/cloud/stream/app/jdbc/sink/JdbcSinkTests.java b/applications/sink/jdbc-sink/src/test/java/org/springframework/cloud/stream/app/sink/jdbc/JdbcSinkTests.java
similarity index 97%
rename from applications/sink/jdbc-sink/src/test/java/org/springframework/cloud/stream/app/jdbc/sink/JdbcSinkTests.java
rename to applications/sink/jdbc-sink/src/test/java/org/springframework/cloud/stream/app/sink/jdbc/JdbcSinkTests.java
index 4e3fe5d4..ac02e1e9 100644
--- a/applications/sink/jdbc-sink/src/test/java/org/springframework/cloud/stream/app/jdbc/sink/JdbcSinkTests.java
+++ b/applications/sink/jdbc-sink/src/test/java/org/springframework/cloud/stream/app/sink/jdbc/JdbcSinkTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.jdbc.sink;
+package org.springframework.cloud.stream.app.sink.jdbc;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/applications/sink/log-sink/pom.xml b/applications/sink/log-sink/pom.xml
index e7a5b9c6..a77006dd 100644
--- a/applications/sink/log-sink/pom.xml
+++ b/applications/sink/log-sink/pom.xml
@@ -53,8 +53,7 @@
                         <name>log</name>
                         <type>sink</type>
                         <version>${project.version}</version>
-                        <configClass>org.springframework.cloud.fn.consumer.log.LogConsumerConfiguration.class
-                        </configClass>
+                        <configClass>org.springframework.cloud.fn.consumer.log.LogConsumerConfiguration.class</configClass>
                         <functionDefinition>byteArrayTextToString|logConsumer</functionDefinition>
                     </generatedApp>
                     <dependencies>
diff --git a/applications/sink/log-sink/src/test/java/org/springframework/cloud/stream/app/LogSinkTests.java b/applications/sink/log-sink/src/test/java/org/springframework/cloud/stream/app/sink/log/LogSinkTests.java
similarity index 97%
rename from applications/sink/log-sink/src/test/java/org/springframework/cloud/stream/app/LogSinkTests.java
rename to applications/sink/log-sink/src/test/java/org/springframework/cloud/stream/app/sink/log/LogSinkTests.java
index 51e868da..41f55a15 100644
--- a/applications/sink/log-sink/src/test/java/org/springframework/cloud/stream/app/LogSinkTests.java
+++ b/applications/sink/log-sink/src/test/java/org/springframework/cloud/stream/app/sink/log/LogSinkTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app;
+package org.springframework.cloud.stream.app.sink.log;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/applications/sink/rabbit-sink/pom.xml b/applications/sink/rabbit-sink/pom.xml
index 3fa850b8..2f94e5d1 100644
--- a/applications/sink/rabbit-sink/pom.xml
+++ b/applications/sink/rabbit-sink/pom.xml
@@ -75,8 +75,7 @@
                         <name>rabbit</name>
                         <type>sink</type>
                         <version>${project.version}</version>
-                        <configClass>org.springframework.cloud.fn.consumer.rabbit.RabbitConsumerConfiguration.class
-                        </configClass>
+                        <configClass>org.springframework.cloud.fn.consumer.rabbit.RabbitConsumerConfiguration.class</configClass>
                     </generatedApp>
 
                     <dependencies>
diff --git a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/rabbit/sink/OwnConnectionTest.java b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/OwnConnectionTest.java
similarity index 96%
rename from applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/rabbit/sink/OwnConnectionTest.java
rename to applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/OwnConnectionTest.java
index cf899ccc..87fbf028 100644
--- a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/rabbit/sink/OwnConnectionTest.java
+++ b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/OwnConnectionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.rabbit.sink;
+package org.springframework.cloud.stream.app.sink.rabbit;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/rabbit/sink/RabbitSinkIntegrationTests.java b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java
similarity index 98%
rename from applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/rabbit/sink/RabbitSinkIntegrationTests.java
rename to applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java
index 7bd8c882..e259c22b 100644
--- a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/rabbit/sink/RabbitSinkIntegrationTests.java
+++ b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.rabbit.sink;
+package org.springframework.cloud.stream.app.sink.rabbit;
 
 import java.util.function.Consumer;
 
diff --git a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/rabbit/sink/RabbitSinkInvalidConfigTests.java b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkInvalidConfigTests.java
similarity index 97%
rename from applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/rabbit/sink/RabbitSinkInvalidConfigTests.java
rename to applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkInvalidConfigTests.java
index 861bbe35..a0c52026 100644
--- a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/rabbit/sink/RabbitSinkInvalidConfigTests.java
+++ b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkInvalidConfigTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.rabbit.sink;
+package org.springframework.cloud.stream.app.sink.rabbit;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/rabbit/sink/SimpleRoutingKeyAndCustomHeaderTests.java b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/SimpleRoutingKeyAndCustomHeaderTests.java
similarity index 96%
rename from applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/rabbit/sink/SimpleRoutingKeyAndCustomHeaderTests.java
rename to applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/SimpleRoutingKeyAndCustomHeaderTests.java
index 05eb171f..4450c9bf 100644
--- a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/rabbit/sink/SimpleRoutingKeyAndCustomHeaderTests.java
+++ b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/SimpleRoutingKeyAndCustomHeaderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.rabbit.sink;
+package org.springframework.cloud.stream.app.sink.rabbit;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/redis/sink/RedisSinkTests.java b/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java
similarity index 98%
rename from applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/redis/sink/RedisSinkTests.java
rename to applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java
index 037c7cec..b5369a7e 100644
--- a/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/redis/sink/RedisSinkTests.java
+++ b/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.redis.sink;
+package org.springframework.cloud.stream.app.sink.redis;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/applications/sink/router-sink/pom.xml b/applications/sink/router-sink/pom.xml
index bcc6c9df..20904929 100644
--- a/applications/sink/router-sink/pom.xml
+++ b/applications/sink/router-sink/pom.xml
@@ -87,8 +87,7 @@
                         <name>router</name>
                         <type>sink</type>
                         <version>${project.version}</version>
-                        <configClass>org.springframework.cloud.stream.app.router.sink.RouterSinkConfiguration.class
-                        </configClass>
+                        <configClass>org.springframework.cloud.stream.app.sink.router.RouterSinkConfiguration.class</configClass>
                         <functionDefinition>byteArrayTextToString|routerSinkConsumer</functionDefinition>
                     </generatedApp>
                     <dependencies>
diff --git a/applications/sink/router-sink/src/main/java/org/springframework/cloud/stream/app/router/sink/RouterSinkConfiguration.java b/applications/sink/router-sink/src/main/java/org/springframework/cloud/stream/app/sink/router/RouterSinkConfiguration.java
similarity index 98%
rename from applications/sink/router-sink/src/main/java/org/springframework/cloud/stream/app/router/sink/RouterSinkConfiguration.java
rename to applications/sink/router-sink/src/main/java/org/springframework/cloud/stream/app/sink/router/RouterSinkConfiguration.java
index 38a18920..982b6721 100644
--- a/applications/sink/router-sink/src/main/java/org/springframework/cloud/stream/app/router/sink/RouterSinkConfiguration.java
+++ b/applications/sink/router-sink/src/main/java/org/springframework/cloud/stream/app/sink/router/RouterSinkConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.router.sink;
+package org.springframework.cloud.stream.app.sink.router;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/applications/sink/router-sink/src/main/java/org/springframework/cloud/stream/app/router/sink/RouterSinkProperties.java b/applications/sink/router-sink/src/main/java/org/springframework/cloud/stream/app/sink/router/RouterSinkProperties.java
similarity index 98%
rename from applications/sink/router-sink/src/main/java/org/springframework/cloud/stream/app/router/sink/RouterSinkProperties.java
rename to applications/sink/router-sink/src/main/java/org/springframework/cloud/stream/app/sink/router/RouterSinkProperties.java
index a960330e..715b987e 100644
--- a/applications/sink/router-sink/src/main/java/org/springframework/cloud/stream/app/router/sink/RouterSinkProperties.java
+++ b/applications/sink/router-sink/src/main/java/org/springframework/cloud/stream/app/sink/router/RouterSinkProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.router.sink;
+package org.springframework.cloud.stream.app.sink.router;
 
 import java.util.Properties;
 import java.util.function.Function;
diff --git a/applications/sink/router-sink/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/applications/sink/router-sink/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
index dea60279..4c972b5e 100644
--- a/applications/sink/router-sink/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
+++ b/applications/sink/router-sink/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
@@ -1,2 +1,2 @@
-configuration-properties.classes=org.springframework.cloud.stream.app.router.sink.RouterSinkProperties
+configuration-properties.classes=org.springframework.cloud.stream.app.sink.router.RouterSinkProperties
 
diff --git a/applications/sink/router-sink/src/test/java/org/springframework/cloud/stream/app/router/sink/RouterSinkIntegrationTests.java b/applications/sink/router-sink/src/test/java/org/springframework/cloud/stream/app/sink/router/RouterSinkIntegrationTests.java
similarity index 99%
rename from applications/sink/router-sink/src/test/java/org/springframework/cloud/stream/app/router/sink/RouterSinkIntegrationTests.java
rename to applications/sink/router-sink/src/test/java/org/springframework/cloud/stream/app/sink/router/RouterSinkIntegrationTests.java
index 39998e74..9d4a4972 100644
--- a/applications/sink/router-sink/src/test/java/org/springframework/cloud/stream/app/router/sink/RouterSinkIntegrationTests.java
+++ b/applications/sink/router-sink/src/test/java/org/springframework/cloud/stream/app/sink/router/RouterSinkIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.router.sink;
+package org.springframework.cloud.stream.app.sink.router;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/applications/source/file-source/pom.xml b/applications/source/file-source/pom.xml
index e8c1ed65..44c3adad 100644
--- a/applications/source/file-source/pom.xml
+++ b/applications/source/file-source/pom.xml
@@ -42,8 +42,7 @@
                         <name>file</name>
                         <type>source</type>
                         <version>${project.version}</version>
-                        <configClass>org.springframework.cloud.fn.supplier.file.FileSupplierConfiguration.class
-                        </configClass>
+                        <configClass>org.springframework.cloud.fn.supplier.file.FileSupplierConfiguration.class</configClass>
                     </generatedApp>
                     <dependencies>
                         <dependency>
diff --git a/applications/source/file-source/src/test/java/org.springframework.cloud.stream.app/FileSourceTests.java b/applications/source/file-source/src/test/java/org/springframework/cloud/stream/app/source/file/FileSourceTests.java
similarity index 97%
rename from applications/source/file-source/src/test/java/org.springframework.cloud.stream.app/FileSourceTests.java
rename to applications/source/file-source/src/test/java/org/springframework/cloud/stream/app/source/file/FileSourceTests.java
index 70c59fc2..6a7fe9dd 100644
--- a/applications/source/file-source/src/test/java/org.springframework.cloud.stream.app/FileSourceTests.java
+++ b/applications/source/file-source/src/test/java/org/springframework/cloud/stream/app/source/file/FileSourceTests.java
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+package org.springframework.cloud.stream.app.source.file;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 
diff --git a/applications/source/http-source/pom.xml b/applications/source/http-source/pom.xml
index 0be7cc36..58a7bd9e 100644
--- a/applications/source/http-source/pom.xml
+++ b/applications/source/http-source/pom.xml
@@ -52,8 +52,7 @@
                         <name>http</name>
                         <type>source</type>
                         <version>${project.version}</version>
-                        <configClass>org.springframework.cloud.fn.supplier.http.HttpSupplierConfiguration.class
-                        </configClass>
+                        <configClass>org.springframework.cloud.fn.supplier.http.HttpSupplierConfiguration.class</configClass>
                     </generatedApp>
 
                     <dependencies>
diff --git a/applications/source/http-source/src/test/java/org/springframework/cloud/stream/app/HttpSourceTests.java b/applications/source/http-source/src/test/java/org/springframework/cloud/stream/app/source/http/HttpSourceTests.java
similarity index 97%
rename from applications/source/http-source/src/test/java/org/springframework/cloud/stream/app/HttpSourceTests.java
rename to applications/source/http-source/src/test/java/org/springframework/cloud/stream/app/source/http/HttpSourceTests.java
index c7002b84..0dda8fde 100644
--- a/applications/source/http-source/src/test/java/org/springframework/cloud/stream/app/HttpSourceTests.java
+++ b/applications/source/http-source/src/test/java/org/springframework/cloud/stream/app/source/http/HttpSourceTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app;
+package org.springframework.cloud.stream.app.source.http;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/applications/source/jdbc-source/pom.xml b/applications/source/jdbc-source/pom.xml
index 88010e1a..7f03836c 100644
--- a/applications/source/jdbc-source/pom.xml
+++ b/applications/source/jdbc-source/pom.xml
@@ -63,8 +63,7 @@
                         <name>jdbc</name>
                         <type>source</type>
                         <version>${project.version}</version>
-                        <configClass>org.springframework.cloud.fn.supplier.jdbc.JdbcSupplierConfiguration.class
-                        </configClass>
+                        <configClass>org.springframework.cloud.fn.supplier.jdbc.JdbcSupplierConfiguration.class</configClass>
                     </generatedApp>
 
                     <dependencies>
diff --git a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/DefaultBehaviorTests.java b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/DefaultBehaviorTests.java
similarity index 97%
rename from applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/DefaultBehaviorTests.java
rename to applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/DefaultBehaviorTests.java
index 7a3ce34f..b5f9cd79 100644
--- a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/DefaultBehaviorTests.java
+++ b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/DefaultBehaviorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.jdbc.source;
+package org.springframework.cloud.stream.app.source.jdbc;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
diff --git a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/JdbcSourceIntegrationTests.java b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/JdbcSourceIntegrationTests.java
similarity index 96%
rename from applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/JdbcSourceIntegrationTests.java
rename to applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/JdbcSourceIntegrationTests.java
index 9e388476..f12fb7cc 100644
--- a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/JdbcSourceIntegrationTests.java
+++ b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/JdbcSourceIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.jdbc.source;
+package org.springframework.cloud.stream.app.source.jdbc;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
diff --git a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/Select2PerPollNoSplitWithUpdateTests.java b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/Select2PerPollNoSplitWithUpdateTests.java
similarity index 97%
rename from applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/Select2PerPollNoSplitWithUpdateTests.java
rename to applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/Select2PerPollNoSplitWithUpdateTests.java
index fc01910c..7f40146c 100644
--- a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/Select2PerPollNoSplitWithUpdateTests.java
+++ b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/Select2PerPollNoSplitWithUpdateTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.jdbc.source;
+package org.springframework.cloud.stream.app.source.jdbc;
 
 import java.util.List;
 import java.util.Map;
diff --git a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/SelectAllNoSplitTests.java b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/SelectAllNoSplitTests.java
similarity index 97%
rename from applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/SelectAllNoSplitTests.java
rename to applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/SelectAllNoSplitTests.java
index 602b205c..fb9d3838 100644
--- a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/SelectAllNoSplitTests.java
+++ b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/SelectAllNoSplitTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.jdbc.source;
+package org.springframework.cloud.stream.app.source.jdbc;
 
 import java.util.List;
 import java.util.Map;
diff --git a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/SelectAllWithDelayTests.java b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/SelectAllWithDelayTests.java
similarity index 97%
rename from applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/SelectAllWithDelayTests.java
rename to applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/SelectAllWithDelayTests.java
index d439f645..b89dd4b3 100644
--- a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/SelectAllWithDelayTests.java
+++ b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/SelectAllWithDelayTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.jdbc.source;
+package org.springframework.cloud.stream.app.source.jdbc;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
diff --git a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/SelectAllWithMinDelayTests.java b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/SelectAllWithMinDelayTests.java
similarity index 97%
rename from applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/SelectAllWithMinDelayTests.java
rename to applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/SelectAllWithMinDelayTests.java
index 2e717a1d..099be995 100644
--- a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/jdbc/source/SelectAllWithMinDelayTests.java
+++ b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/SelectAllWithMinDelayTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app.jdbc.source;
+package org.springframework.cloud.stream.app.source.jdbc;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
diff --git a/applications/source/time-source/pom.xml b/applications/source/time-source/pom.xml
index 95317f96..b9a8554d 100644
--- a/applications/source/time-source/pom.xml
+++ b/applications/source/time-source/pom.xml
@@ -42,8 +42,7 @@
                         <name>time</name>
                         <type>source</type>
                         <version>${project.version}</version>
-                        <configClass>org.springframework.cloud.fn.supplier.time.TimeSupplierConfiguration.class
-                        </configClass>
+                        <configClass>org.springframework.cloud.fn.supplier.time.TimeSupplierConfiguration.class</configClass>
                     </generatedApp>
                     <dependencies>
                         <dependency>
diff --git a/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/TimeSourceTests.java b/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java
similarity index 97%
rename from applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/TimeSourceTests.java
rename to applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java
index 8e39db8b..c80a256e 100644
--- a/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/TimeSourceTests.java
+++ b/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.stream.app;
+package org.springframework.cloud.stream.app.source.time;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;