diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/package-info.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/package-info.java
new file mode 100644
index 0000000000..75e2f1cdfa
--- /dev/null
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes related to AMQP-backed channels.
+ */
+package org.springframework.integration.amqp.channel;
\ No newline at end of file
diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/package-info.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/package-info.java
new file mode 100644
index 0000000000..233be860b3
--- /dev/null
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes for configuration - parsers, namespace handlers, factory beans.
+ */
+package org.springframework.integration.amqp.config;
\ No newline at end of file
diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/package-info.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/package-info.java
new file mode 100644
index 0000000000..fd336d396c
--- /dev/null
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting inbound endpoints.
+ */
+package org.springframework.integration.amqp.inbound;
\ No newline at end of file
diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/package-info.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/package-info.java
new file mode 100644
index 0000000000..8a9cab221d
--- /dev/null
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting outbound endpoints.
+ */
+package org.springframework.integration.amqp.outbound;
\ No newline at end of file
diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/package-info.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/package-info.java
new file mode 100644
index 0000000000..cf440ffb2e
--- /dev/null
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Base package for AMQP support.
+ */
+package org.springframework.integration.amqp;
\ No newline at end of file
diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/package-info.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/package-info.java
new file mode 100644
index 0000000000..d54ee38c55
--- /dev/null
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides AMQP support classes.
+ */
+package org.springframework.integration.amqp.support;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/package-info.java
new file mode 100644
index 0000000000..65cf228442
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes related to message aggregation.
+ */
+package org.springframework.integration.aggregator;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/package-info.java
new file mode 100644
index 0000000000..4da0c1f9da
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides annotations for annotation-based configuration.
+ */
+package org.springframework.integration.annotation;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/package-info.java
new file mode 100644
index 0000000000..c037795b5b
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/aop/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes to support message publication using AOP.
+ */
+package org.springframework.integration.aop;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/package-info.java
new file mode 100644
index 0000000000..b9030334af
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes related to channel interception.
+ */
+package org.springframework.integration.channel.interceptor;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/package-info.java
new file mode 100644
index 0000000000..f256861dbc
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes representing various channel types.
+ */
+package org.springframework.integration.channel;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/package-info.java
new file mode 100644
index 0000000000..5d4651e249
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting annotation-based configuration.
+ */
+package org.springframework.integration.config.annotation;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/config/package-info.java
new file mode 100644
index 0000000000..1f1d949c99
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Base package for configuration.
+ */
+package org.springframework.integration.config;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/package-info.java
new file mode 100644
index 0000000000..ff7024ec27
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides supporting XML-based configuration - parsers, namespace handlers.
+ */
+package org.springframework.integration.config.xml;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/context/package-info.java
new file mode 100644
index 0000000000..6766d37a52
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/context/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes relating to application context configuration.
+ */
+package org.springframework.integration.context;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/core/package-info.java
new file mode 100644
index 0000000000..17d77270e4
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/core/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides core classes.
+ */
+package org.springframework.integration.core;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/package-info.java
new file mode 100644
index 0000000000..e23dc44523
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes related to dispatching messages.
+ */
+package org.springframework.integration.dispatcher;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/package-info.java
new file mode 100644
index 0000000000..6775816a8a
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides core classes related to Endpoints.
+ */
+package org.springframework.integration.endpoint;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/expression/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/expression/package-info.java
new file mode 100644
index 0000000000..fafb782014
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/expression/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting SpEL expressions.
+ */
+package org.springframework.integration.expression;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/filter/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/filter/package-info.java
new file mode 100644
index 0000000000..3261828323
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/filter/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting the filter pattern.
+ */
+package org.springframework.integration.filter;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/package-info.java
new file mode 100644
index 0000000000..6fea0d3a98
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting messaging gateways.
+ */
+package org.springframework.integration.gateway;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/package-info.java
new file mode 100644
index 0000000000..2cd4cb6315
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes implementing various types of message handler.
+ */
+package org.springframework.integration.handler;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/history/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/history/package-info.java
new file mode 100644
index 0000000000..9cf8c9bf91
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/history/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting the capture of message history.
+ */
+package org.springframework.integration.history;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/json/package-info.java
new file mode 100644
index 0000000000..810cc0eda1
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/json/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting JSON in Spring Integration.
+ */
+package org.springframework.integration.json;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/mapping/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/package-info.java
new file mode 100644
index 0000000000..695cad782e
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes related to mapping to/from message headers.
+ */
+package org.springframework.integration.mapping;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/message/package-info.java
new file mode 100644
index 0000000000..b4247cd4f0
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/message/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides concrete {@link org.springframework.integration.Message} implementations.
+ */
+package org.springframework.integration.message;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/package-info.java
new file mode 100644
index 0000000000..52b64440fe
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * Base package for Spring Integration Core.
+ * 
+ * Provides fundamental classes.
+ */
+package org.springframework.integration;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/resource/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/resource/package-info.java
new file mode 100644
index 0000000000..aa4b302f1b
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/resource/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Provides classes related to messaging 
+ * using Spring {@link org.springframework.core.io.Resource}s
+ */
+package org.springframework.integration.resource;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/router/package-info.java
new file mode 100644
index 0000000000..bb5ee45e99
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/router/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting the router pattern.
+ */
+package org.springframework.integration.router;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/scheduling/package-info.java
new file mode 100644
index 0000000000..1df7e603d6
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/scheduling/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes related to task scheduling.
+ */
+package org.springframework.integration.scheduling;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/selector/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/selector/package-info.java
new file mode 100644
index 0000000000..0684079d67
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/selector/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes related to message selection.
+ */
+package org.springframework.integration.selector;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/splitter/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/splitter/package-info.java
new file mode 100644
index 0000000000..538f270250
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/splitter/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting the splitter pattern.
+ */
+package org.springframework.integration.splitter;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/store/package-info.java
new file mode 100644
index 0000000000..a96e1b379c
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/store/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes releated to storing messages.
+ */
+package org.springframework.integration.store;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/channel/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/support/channel/package-info.java
new file mode 100644
index 0000000000..0ca3bfcb07
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/channel/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting channel resolution.
+ */
+package org.springframework.integration.support.channel;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/support/converter/package-info.java
new file mode 100644
index 0000000000..3a351798a4
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/converter/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting message conversion.
+ */
+package org.springframework.integration.support.converter;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/support/package-info.java
new file mode 100644
index 0000000000..d5749773a1
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Base core support package.
+ */
+package org.springframework.integration.support;
\ No newline at end of file
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/util/package-info.java
new file mode 100644
index 0000000000..1e48fb2440
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/util/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides core utility classes. 
+ */
+package org.springframework.integration.util;
\ No newline at end of file
diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/config/package-info.java b/spring-integration-event/src/main/java/org/springframework/integration/event/config/package-info.java
new file mode 100644
index 0000000000..95cacc698e
--- /dev/null
+++ b/spring-integration-event/src/main/java/org/springframework/integration/event/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes for configuration - parsers, namespace handlers.
+ */
+package org.springframework.integration.event.config;
\ No newline at end of file
diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/core/package-info.java b/spring-integration-event/src/main/java/org/springframework/integration/event/core/package-info.java
new file mode 100644
index 0000000000..e4e6fa51f1
--- /dev/null
+++ b/spring-integration-event/src/main/java/org/springframework/integration/event/core/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides Event core classes.
+ */
+package org.springframework.integration.event.core;
\ No newline at end of file
diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/package-info.java b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/package-info.java
new file mode 100644
index 0000000000..37e9b01512
--- /dev/null
+++ b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting inbound endpoints.
+ */
+package org.springframework.integration.event.inbound;
\ No newline at end of file
diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/outbound/package-info.java b/spring-integration-event/src/main/java/org/springframework/integration/event/outbound/package-info.java
new file mode 100644
index 0000000000..d4bec61c97
--- /dev/null
+++ b/spring-integration-event/src/main/java/org/springframework/integration/event/outbound/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting outbound endpoints.
+ */
+package org.springframework.integration.event.outbound;
\ No newline at end of file
diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/package-info.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/package-info.java
new file mode 100644
index 0000000000..a25230d5bc
--- /dev/null
+++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes for configuration - parsers, namespace handlers.
+ */
+package org.springframework.integration.feed.config;
\ No newline at end of file
diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/package-info.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/package-info.java
new file mode 100644
index 0000000000..051a68101d
--- /dev/null
+++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting inbound endpoints.
+ */
+package org.springframework.integration.feed.inbound;
\ No newline at end of file
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/package-info.java
new file mode 100644
index 0000000000..ad9f5c175c
--- /dev/null
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes for configuration - parsers, namespace handlers, factory beans.
+ */
+package org.springframework.integration.file.config;
\ No newline at end of file
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/filters/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/filters/package-info.java
new file mode 100644
index 0000000000..1ed977d958
--- /dev/null
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/filters/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting file filtering.
+ */
+package org.springframework.integration.file.filters;
\ No newline at end of file
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/locking/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/locking/package-info.java
new file mode 100644
index 0000000000..ff21be6c69
--- /dev/null
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/locking/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting file locking.
+ */
+package org.springframework.integration.file.locking;
\ No newline at end of file
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/package-info.java
new file mode 100644
index 0000000000..7a819cd63b
--- /dev/null
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting remote file gateways.
+ */
+package org.springframework.integration.file.remote.gateway;
\ No newline at end of file
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/package-info.java
new file mode 100644
index 0000000000..30f8b3471b
--- /dev/null
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting remote file message handlers.
+ */
+package org.springframework.integration.file.remote.handler;
\ No newline at end of file
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/package-info.java
new file mode 100644
index 0000000000..3ee2c198a7
--- /dev/null
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Base package for supporting remote files.
+ */
+package org.springframework.integration.file.remote;
\ No newline at end of file
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/package-info.java
new file mode 100644
index 0000000000..2abd3f949a
--- /dev/null
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting remote file sessions.
+ */
+package org.springframework.integration.file.remote.session;
\ No newline at end of file
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/package-info.java
new file mode 100644
index 0000000000..87e7684f33
--- /dev/null
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Provides classes supporting the synchronization of remote and
+ * local file directories.
+ */
+package org.springframework.integration.file.remote.synchronizer;
\ No newline at end of file
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/transformer/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/transformer/package-info.java
new file mode 100644
index 0000000000..f91d9b5a3c
--- /dev/null
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/transformer/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Provides classes supporting the transformation of file contents
+ * to messages.
+ */
+package org.springframework.integration.file.transformer;
\ No newline at end of file
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/package-info.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/package-info.java
new file mode 100644
index 0000000000..46d5d37052
--- /dev/null
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes for configuration - parsers, namespace handlers.
+ */
+package org.springframework.integration.ftp.config;
\ No newline at end of file
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/filters/package-info.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/filters/package-info.java
new file mode 100644
index 0000000000..4386deb757
--- /dev/null
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/filters/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting FTP file filtering.
+ */
+package org.springframework.integration.ftp.filters;
\ No newline at end of file
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/package-info.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/package-info.java
new file mode 100644
index 0000000000..0df0b48511
--- /dev/null
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting FTP gateways.
+ */
+package org.springframework.integration.ftp.gateway;
\ No newline at end of file
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/package-info.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/package-info.java
new file mode 100644
index 0000000000..edc7bbf482
--- /dev/null
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting inbound endpoints.
+ */
+package org.springframework.integration.ftp.inbound;
\ No newline at end of file
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/package-info.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/package-info.java
new file mode 100644
index 0000000000..36349c15b9
--- /dev/null
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting FTP sessions.
+ */
+package org.springframework.integration.ftp.session;
\ No newline at end of file
diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/config/xml/package-info.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/config/xml/package-info.java
new file mode 100644
index 0000000000..6a97083bfa
--- /dev/null
+++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/config/xml/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes for configuration - parsers, namespace handlers.
+ */
+package org.springframework.integration.gemfire.config.xml;
\ No newline at end of file
diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/package-info.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/package-info.java
new file mode 100644
index 0000000000..5495b40c97
--- /dev/null
+++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting inbound endpoints.
+ */
+package org.springframework.integration.gemfire.inbound;
\ No newline at end of file
diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/package-info.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/package-info.java
new file mode 100644
index 0000000000..e17623be69
--- /dev/null
+++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting outbound endpoints.
+ */
+package org.springframework.integration.gemfire.outbound;
\ No newline at end of file
diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/package-info.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/package-info.java
new file mode 100644
index 0000000000..49e330aab9
--- /dev/null
+++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes releated to storing messages.
+ */
+package org.springframework.integration.gemfire.store;
\ No newline at end of file
diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/package-info.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/package-info.java
new file mode 100644
index 0000000000..eb986af844
--- /dev/null
+++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes for configuration - parsers, namespace handlers, factory beans.
+ */
+package org.springframework.integration.groovy.config;
\ No newline at end of file
diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/package-info.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/package-info.java
new file mode 100644
index 0000000000..0c090757c6
--- /dev/null
+++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Base package for Groovy support.
+ */
+package org.springframework.integration.groovy;
\ No newline at end of file
diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/package-info.java
new file mode 100644
index 0000000000..925d371332
--- /dev/null
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes for configuration - parsers, namespace handlers.
+ */
+package org.springframework.integration.http.config;
\ No newline at end of file
diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/converter/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/converter/package-info.java
new file mode 100644
index 0000000000..92bb9a4a6c
--- /dev/null
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/converter/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting message conversion.
+ */
+package org.springframework.integration.http.converter;
\ No newline at end of file
diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/package-info.java
new file mode 100644
index 0000000000..e8a381439b
--- /dev/null
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting inbound endpoints.
+ */
+package org.springframework.integration.http.inbound;
\ No newline at end of file
diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/multipart/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/multipart/package-info.java
new file mode 100644
index 0000000000..96f76ec492
--- /dev/null
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/multipart/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting multipart HTTP requests.
+ */
+package org.springframework.integration.http.multipart;
\ No newline at end of file
diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/package-info.java
new file mode 100644
index 0000000000..7ae26a9981
--- /dev/null
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting outbound endpoints.
+ */
+package org.springframework.integration.http.outbound;
\ No newline at end of file
diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/package-info.java
new file mode 100644
index 0000000000..3cef3afb79
--- /dev/null
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Base package for Http support.
+ */
+package org.springframework.integration.http;
\ No newline at end of file
diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/support/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/support/package-info.java
new file mode 100644
index 0000000000..88f88c6ed0
--- /dev/null
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/support/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Provides classes to support Http endpoints, including header
+ * mapping.
+ */
+package org.springframework.integration.http.support;
\ No newline at end of file
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/package-info.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/package-info.java
new file mode 100644
index 0000000000..6f77c85629
--- /dev/null
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes for configuration - parsers, namespace handlers, factory beans.
+ */
+package org.springframework.integration.ip.config;
\ No newline at end of file
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/package-info.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/package-info.java
new file mode 100644
index 0000000000..9fd1487b9b
--- /dev/null
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Base package for IP (TCP/UDP) Support.
+ */
+package org.springframework.integration.ip;
\ No newline at end of file
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/package-info.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/package-info.java
new file mode 100644
index 0000000000..c770c0e80c
--- /dev/null
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Base package for TCP Support.
+ */
+package org.springframework.integration.ip.tcp;
\ No newline at end of file
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/package-info.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/package-info.java
new file mode 100644
index 0000000000..9d16c5b3cd
--- /dev/null
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Base package for UDP support.
+ */
+package org.springframework.integration.ip.udp;
\ No newline at end of file
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/package-info.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/package-info.java
new file mode 100644
index 0000000000..26e13aa585
--- /dev/null
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides utilities for IP support.
+ */
+package org.springframework.integration.ip.util;
\ No newline at end of file
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/package-info.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/package-info.java
new file mode 100644
index 0000000000..4ff8c1a184
--- /dev/null
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes for configuration - parsers, namespace handlers, factory beans.
+ */
+package org.springframework.integration.jms.config;
\ No newline at end of file
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/package-info.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/package-info.java
new file mode 100644
index 0000000000..7a74b1f504
--- /dev/null
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Base package for JMS Support.
+ */
+package org.springframework.integration.jms;
\ No newline at end of file
diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/jsr223/package-info.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/jsr223/package-info.java
new file mode 100644
index 0000000000..2f51abfa9a
--- /dev/null
+++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/jsr223/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes for configuration - parsers, namespace handlers.
+ */
+package org.springframework.integration.scripting.config.jsr223;
\ No newline at end of file
diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/package-info.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/package-info.java
new file mode 100644
index 0000000000..915f657c49
--- /dev/null
+++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Base package supporting configuration.
+ */
+package org.springframework.integration.scripting.config;
\ No newline at end of file
diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/package-info.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/package-info.java
new file mode 100644
index 0000000000..77d9622f0c
--- /dev/null
+++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting JSR223 Scripting.
+ */
+package org.springframework.integration.scripting.jsr223;
\ No newline at end of file
diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/package-info.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/package-info.java
new file mode 100644
index 0000000000..8dad942fb7
--- /dev/null
+++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Base package for scripting support.
+ */
+package org.springframework.integration.scripting;
\ No newline at end of file
diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/package-info.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/package-info.java
new file mode 100644
index 0000000000..d558e1527a
--- /dev/null
+++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes for configuration - parsers, namespace handlers.
+ */
+package org.springframework.integration.sftp.config;
\ No newline at end of file
diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/package-info.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/package-info.java
new file mode 100644
index 0000000000..b024f71d52
--- /dev/null
+++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting SFTP file filtering.
+ */
+package org.springframework.integration.sftp.filters;
\ No newline at end of file
diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/package-info.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/package-info.java
new file mode 100644
index 0000000000..b78c287c6a
--- /dev/null
+++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting SFTP gateways.
+ */
+package org.springframework.integration.sftp.gateway;
\ No newline at end of file
diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/package-info.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/package-info.java
new file mode 100644
index 0000000000..51c26a36e9
--- /dev/null
+++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting inbound endpoints.
+ */
+package org.springframework.integration.sftp.inbound;
\ No newline at end of file
diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/package-info.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/package-info.java
new file mode 100644
index 0000000000..a45dd814e2
--- /dev/null
+++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting SFTP sessions.
+ */
+package org.springframework.integration.sftp.session;
\ No newline at end of file