diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/PollableAmqpChannel.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/PollableAmqpChannel.java
index 121ff40a98..95e4d53ff0 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/PollableAmqpChannel.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/PollableAmqpChannel.java
@@ -26,7 +26,7 @@ import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.integration.channel.ExecutorChannelInterceptorAware;
-import org.springframework.integration.channel.management.PollableChannelManagement;
+import org.springframework.integration.support.management.PollableChannelManagement;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.PollableChannel;
 import org.springframework.messaging.support.ChannelInterceptor;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/BarrierMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/BarrierMessageHandler.java
similarity index 95%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/BarrierMessageHandler.java
rename to spring-integration-core/src/main/java/org/springframework/integration/aggregator/BarrierMessageHandler.java
index 24d50eeaa5..c21d5a0845 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/BarrierMessageHandler.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/BarrierMessageHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler;
+package org.springframework.integration.aggregator;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -22,10 +22,8 @@ import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.TimeUnit;
 
 import org.springframework.integration.IntegrationMessageHeaderAccessor;
-import org.springframework.integration.aggregator.CorrelationStrategy;
-import org.springframework.integration.aggregator.DefaultAggregatingMessageGroupProcessor;
-import org.springframework.integration.aggregator.HeaderAttributeCorrelationStrategy;
-import org.springframework.integration.aggregator.MessageGroupProcessor;
+import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.handler.MessageTriggerAction;
 import org.springframework.integration.store.SimpleMessageGroup;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHandlingException;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
index 939ecd0d19..6530ac668f 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
@@ -28,18 +28,18 @@ import org.apache.commons.logging.Log;
 
 import org.springframework.core.OrderComparator;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.integration.channel.management.AbstractMessageChannelMetrics;
-import org.springframework.integration.channel.management.DefaultMessageChannelMetrics;
-import org.springframework.integration.channel.management.MessageChannelMetrics;
 import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.context.IntegrationObjectSupport;
 import org.springframework.integration.history.MessageHistory;
-import org.springframework.integration.history.TrackableComponent;
 import org.springframework.integration.support.converter.DefaultDatatypeChannelMessageConverter;
+import org.springframework.integration.support.management.AbstractMessageChannelMetrics;
 import org.springframework.integration.support.management.ConfigurableMetricsAware;
+import org.springframework.integration.support.management.DefaultMessageChannelMetrics;
 import org.springframework.integration.support.management.IntegrationManagedResource;
+import org.springframework.integration.support.management.MessageChannelMetrics;
 import org.springframework.integration.support.management.MetricsContext;
 import org.springframework.integration.support.management.Statistics;
+import org.springframework.integration.support.management.TrackableComponent;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageDeliveryException;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java
index b3990d620e..563fc992c2 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java
@@ -20,7 +20,7 @@ import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.List;
 
-import org.springframework.integration.channel.management.PollableChannelManagement;
+import org.springframework.integration.support.management.PollableChannelManagement;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.PollableChannel;
 import org.springframework.messaging.support.ChannelInterceptor;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/NullChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/NullChannel.java
index 467a14ed81..69c8c4c838 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/NullChannel.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/NullChannel.java
@@ -20,12 +20,12 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.integration.channel.management.AbstractMessageChannelMetrics;
-import org.springframework.integration.channel.management.DefaultMessageChannelMetrics;
-import org.springframework.integration.channel.management.MessageChannelMetrics;
 import org.springframework.integration.support.context.NamedComponent;
+import org.springframework.integration.support.management.AbstractMessageChannelMetrics;
 import org.springframework.integration.support.management.ConfigurableMetricsAware;
+import org.springframework.integration.support.management.DefaultMessageChannelMetrics;
 import org.springframework.integration.support.management.IntegrationManagedResource;
+import org.springframework.integration.support.management.MessageChannelMetrics;
 import org.springframework.integration.support.management.Statistics;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.PollableChannel;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java
index ee4e53d5fb..55c58f4ef1 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java
@@ -24,8 +24,8 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import org.springframework.integration.channel.management.QueueChannelManagement;
 import org.springframework.integration.core.MessageSelector;
+import org.springframework.integration.support.management.QueueChannelManagement;
 import org.springframework.messaging.Message;
 import org.springframework.util.Assert;
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/management/package-info.java
deleted file mode 100644
index 3fff0b1255..0000000000
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Provides classes related to channel management.
- */
-package org.springframework.integration.channel.management;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/CodecMessageConverter.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/CodecMessageConverter.java
similarity index 95%
rename from spring-integration-core/src/main/java/org/springframework/integration/support/converter/CodecMessageConverter.java
rename to spring-integration-core/src/main/java/org/springframework/integration/codec/CodecMessageConverter.java
index cdfb860eb2..f794db1182 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/CodecMessageConverter.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/CodecMessageConverter.java
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.support.converter;
+package org.springframework.integration.codec;
 
 import java.io.IOException;
 
-import org.springframework.integration.codec.Codec;
 import org.springframework.integration.context.IntegrationObjectSupport;
 import org.springframework.integration.support.AbstractIntegrationMessageBuilder;
 import org.springframework.messaging.Message;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AggregatorFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/AggregatorFactoryBean.java
index bb5f1ee8cf..7bd1eacd4a 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/AggregatorFactoryBean.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/AggregatorFactoryBean.java
@@ -32,9 +32,9 @@ import org.springframework.integration.aggregator.CorrelationStrategy;
 import org.springframework.integration.aggregator.MessageGroupProcessor;
 import org.springframework.integration.aggregator.MethodInvokingMessageGroupProcessor;
 import org.springframework.integration.aggregator.ReleaseStrategy;
-import org.springframework.integration.handler.management.AbstractMessageHandlerMetrics;
 import org.springframework.integration.store.MessageGroupStore;
 import org.springframework.integration.support.locks.LockRegistry;
+import org.springframework.integration.support.management.AbstractMessageHandlerMetrics;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.core.DestinationResolver;
 import org.springframework.scheduling.TaskScheduler;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/BarrierParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/BarrierParser.java
index 94e4756e58..b58547ceb3 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/BarrierParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/BarrierParser.java
@@ -20,7 +20,7 @@ import org.w3c.dom.Element;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.integration.handler.BarrierMessageHandler;
+import org.springframework.integration.aggregator.BarrierMessageHandler;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java
index 7c5a332f48..efb79f5c49 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java
@@ -19,7 +19,7 @@ package org.springframework.integration.endpoint;
 import org.springframework.integration.core.MessageProducer;
 import org.springframework.integration.core.MessagingTemplate;
 import org.springframework.integration.history.MessageHistory;
-import org.springframework.integration.history.TrackableComponent;
+import org.springframework.integration.support.management.TrackableComponent;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessagingException;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java
index cf5cf333af..94daaf15c6 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java
@@ -29,8 +29,8 @@ import org.springframework.integration.aop.AbstractMessageSourceAdvice;
 import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.core.MessagingTemplate;
 import org.springframework.integration.history.MessageHistory;
-import org.springframework.integration.history.TrackableComponent;
 import org.springframework.integration.support.context.NamedComponent;
+import org.springframework.integration.support.management.TrackableComponent;
 import org.springframework.integration.transaction.IntegrationResourceHolder;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
index c6b41c7e8a..829d96f21a 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
@@ -48,8 +48,8 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.integration.annotation.Gateway;
 import org.springframework.integration.annotation.GatewayHeader;
 import org.springframework.integration.endpoint.AbstractEndpoint;
-import org.springframework.integration.history.TrackableComponent;
 import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
+import org.springframework.integration.support.management.TrackableComponent;
 import org.springframework.integration.support.utils.IntegrationUtils;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
index 5b51055e5d..ba5c96a8af 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
@@ -23,12 +23,12 @@ import org.springframework.integration.endpoint.EventDrivenConsumer;
 import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.handler.BridgeHandler;
 import org.springframework.integration.history.HistoryWritingMessagePostProcessor;
-import org.springframework.integration.history.TrackableComponent;
 import org.springframework.integration.mapping.InboundMessageMapper;
 import org.springframework.integration.mapping.OutboundMessageMapper;
 import org.springframework.integration.support.DefaultMessageBuilderFactory;
 import org.springframework.integration.support.MessageBuilderFactory;
 import org.springframework.integration.support.converter.SimpleMessageConverter;
+import org.springframework.integration.support.management.TrackableComponent;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessagingException;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
index 818a983606..1a84b334ed 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
@@ -19,15 +19,15 @@ package org.springframework.integration.handler;
 import org.springframework.core.Ordered;
 import org.springframework.integration.context.IntegrationObjectSupport;
 import org.springframework.integration.context.Orderable;
-import org.springframework.integration.handler.management.AbstractMessageHandlerMetrics;
-import org.springframework.integration.handler.management.DefaultMessageHandlerMetrics;
 import org.springframework.integration.history.MessageHistory;
-import org.springframework.integration.history.TrackableComponent;
+import org.springframework.integration.support.management.AbstractMessageHandlerMetrics;
 import org.springframework.integration.support.management.ConfigurableMetricsAware;
+import org.springframework.integration.support.management.DefaultMessageHandlerMetrics;
 import org.springframework.integration.support.management.IntegrationManagedResource;
 import org.springframework.integration.support.management.MessageHandlerMetrics;
 import org.springframework.integration.support.management.MetricsContext;
 import org.springframework.integration.support.management.Statistics;
+import org.springframework.integration.support.management.TrackableComponent;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.MessageHandlingException;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/management/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/management/package-info.java
deleted file mode 100644
index b1922a3633..0000000000
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/management/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Provides classes related to handler management.
- */
-package org.springframework.integration.handler.management;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/history/HistoryWritingMessagePostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/history/HistoryWritingMessagePostProcessor.java
index ec25e2a6da..b45979aa68 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/history/HistoryWritingMessagePostProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/history/HistoryWritingMessagePostProcessor.java
@@ -18,6 +18,7 @@ package org.springframework.integration.history;
 
 import org.springframework.integration.support.DefaultMessageBuilderFactory;
 import org.springframework.integration.support.MessageBuilderFactory;
+import org.springframework.integration.support.management.TrackableComponent;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.core.MessagePostProcessor;
 import org.springframework.util.Assert;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryConfigurer.java b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryConfigurer.java
index e7a986bd93..4cc5774fc6 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryConfigurer.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryConfigurer.java
@@ -32,6 +32,7 @@ import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionValidationException;
 import org.springframework.context.SmartLifecycle;
 import org.springframework.integration.support.management.IntegrationManagedResource;
+import org.springframework.integration.support.management.TrackableComponent;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
 import org.springframework.jmx.export.annotation.ManagedOperation;
 import org.springframework.jmx.export.annotation.ManagedResource;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouterManagement.java b/spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouterManagement.java
index 0cacb717fc..60623c148d 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouterManagement.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouterManagement.java
@@ -19,7 +19,6 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Properties;
 
-import org.springframework.integration.router.RecipientListRouter.Recipient;
 import org.springframework.integration.support.management.IntegrationManagedResource;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
 import org.springframework.jmx.export.annotation.ManagedOperation;
@@ -74,7 +73,7 @@ public interface RecipientListRouterManagement {
 	 * @return an unmodifiable collection of recipients.
 	 */
 	@ManagedAttribute
-	Collection<Recipient> getRecipients();
+	Collection<?> getRecipients();
 
 	/**
 	 * Replace recipient.
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scattergather/ScatterGatherHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/scattergather/ScatterGatherHandler.java
index 96e9d9d9e3..0741650741 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/scattergather/ScatterGatherHandler.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/scattergather/ScatterGatherHandler.java
@@ -18,7 +18,6 @@ package org.springframework.integration.scattergather;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.context.Lifecycle;
-import org.springframework.integration.aggregator.AggregatingMessageHandler;
 import org.springframework.integration.channel.FixedSubscriberChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.context.IntegrationContextUtils;
@@ -27,7 +26,6 @@ import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
 import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.router.RecipientListRouter;
 import org.springframework.integration.support.channel.HeaderChannelRegistry;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
@@ -38,6 +36,7 @@ import org.springframework.messaging.MessagingException;
 import org.springframework.messaging.PollableChannel;
 import org.springframework.messaging.SubscribableChannel;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 
 /**
  * The {@link MessageHandler} implementation for the
@@ -67,8 +66,7 @@ public class ScatterGatherHandler extends AbstractReplyProducingMessageHandler i
 		Assert.notNull(scatterChannel);
 		Assert.notNull(gatherer);
 		Class<?> gathererClass = AopUtils.getTargetClass(gatherer);
-		Assert.isAssignable(AggregatingMessageHandler.class, gathererClass,
-				"the 'gatherer' must be an AggregatingMessageHandler instance");
+		checkClass(gathererClass, "org.springframework.integration.aggregator.AggregatingMessageHandler", "gatherer");
 		this.scatterChannel = scatterChannel;
 		this.gatherer = gatherer;
 	}
@@ -76,9 +74,8 @@ public class ScatterGatherHandler extends AbstractReplyProducingMessageHandler i
 	public ScatterGatherHandler(MessageHandler scatterer, MessageHandler gatherer) {
 		this(new FixedSubscriberChannel(scatterer), gatherer);
 		Assert.notNull(scatterer);
-		Class<?> scatterClass = AopUtils.getTargetClass(scatterer);
-		Assert.isAssignable(RecipientListRouter.class, scatterClass,
-				"the 'scatterer' must be a RecipientListRouter instance");
+		Class<?> scattererClass = AopUtils.getTargetClass(scatterer);
+		checkClass(scattererClass, "org.springframework.integration.router.RecipientListRouter", "scatterer");
 	}
 
 	public void setGatherChannel(MessageChannel gatherChannel) {
@@ -178,4 +175,14 @@ public class ScatterGatherHandler extends AbstractReplyProducingMessageHandler i
 		return this.gatherEndpoint == null || this.gatherEndpoint.isRunning();
 	}
 
+	private void checkClass(Class<?> gathererClass, String className, String type) throws LinkageError {
+		Class<?> clazz = null;
+		try {
+			clazz = ClassUtils.forName(className, getClass().getClassLoader());
+		}
+		catch (Exception e) {
+		}
+		Assert.isAssignable(clazz, gathererClass, "the '" + type + "' must be an " + className + " instance");
+	}
+
 }
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/AbstractMessageChannelMetrics.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/AbstractMessageChannelMetrics.java
similarity index 91%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/management/AbstractMessageChannelMetrics.java
rename to spring-integration-core/src/main/java/org/springframework/integration/support/management/AbstractMessageChannelMetrics.java
index 2be316cc52..fe82bec2a8 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/AbstractMessageChannelMetrics.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/AbstractMessageChannelMetrics.java
@@ -13,15 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.channel.management;
+package org.springframework.integration.support.management;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.integration.support.management.ConfigurableMetrics;
-import org.springframework.integration.support.management.MetricsContext;
-import org.springframework.integration.support.management.Statistics;
-
 /**
  * Abstract base class for channel metrics implementations.
  *
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/management/AbstractMessageHandlerMetrics.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/AbstractMessageHandlerMetrics.java
similarity index 89%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/management/AbstractMessageHandlerMetrics.java
rename to spring-integration-core/src/main/java/org/springframework/integration/support/management/AbstractMessageHandlerMetrics.java
index 9e287efcbe..c050f8e5b8 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/management/AbstractMessageHandlerMetrics.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/AbstractMessageHandlerMetrics.java
@@ -13,15 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.handler.management;
+package org.springframework.integration.support.management;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.integration.support.management.ConfigurableMetrics;
-import org.springframework.integration.support.management.MetricsContext;
-import org.springframework.integration.support.management.Statistics;
-
 /**
  * Abstract base class for handler metrics implementations.
  *
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/AggregatingMessageChannelMetrics.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/AggregatingMessageChannelMetrics.java
similarity index 90%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/management/AggregatingMessageChannelMetrics.java
rename to spring-integration-core/src/main/java/org/springframework/integration/support/management/AggregatingMessageChannelMetrics.java
index ad9cac5a42..92258bc64d 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/AggregatingMessageChannelMetrics.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/AggregatingMessageChannelMetrics.java
@@ -11,12 +11,8 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.integration.channel.management;
+package org.springframework.integration.support.management;
 
-import org.springframework.integration.support.management.ExponentialMovingAverage;
-import org.springframework.integration.support.management.ExponentialMovingAverageRate;
-import org.springframework.integration.support.management.ExponentialMovingAverageRatio;
-import org.springframework.integration.support.management.MetricsContext;
 
 /**
  * An implementation of {@link MessageChannelMetrics} that aggregates the total response
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/management/AggregatingMessageHandlerMetrics.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/AggregatingMessageHandlerMetrics.java
similarity index 93%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/management/AggregatingMessageHandlerMetrics.java
rename to spring-integration-core/src/main/java/org/springframework/integration/support/management/AggregatingMessageHandlerMetrics.java
index a3159f29fc..9f4afe88d0 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/management/AggregatingMessageHandlerMetrics.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/AggregatingMessageHandlerMetrics.java
@@ -14,10 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler.management;
+package org.springframework.integration.support.management;
 
-import org.springframework.integration.support.management.ExponentialMovingAverage;
-import org.springframework.integration.support.management.MetricsContext;
 
 /**
  * An implementation of {@link org.springframework.integration.support.management.MessageHandlerMetrics}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/AggregatingMetricsFactory.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/AggregatingMetricsFactory.java
index a16f1d1dc7..90b16bfbf2 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/AggregatingMetricsFactory.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/AggregatingMetricsFactory.java
@@ -15,10 +15,6 @@
  */
 package org.springframework.integration.support.management;
 
-import org.springframework.integration.channel.management.AbstractMessageChannelMetrics;
-import org.springframework.integration.channel.management.AggregatingMessageChannelMetrics;
-import org.springframework.integration.handler.management.AbstractMessageHandlerMetrics;
-import org.springframework.integration.handler.management.AggregatingMessageHandlerMetrics;
 
 
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/DefaultMessageChannelMetrics.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/DefaultMessageChannelMetrics.java
similarity index 93%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/management/DefaultMessageChannelMetrics.java
rename to spring-integration-core/src/main/java/org/springframework/integration/support/management/DefaultMessageChannelMetrics.java
index 4d20542080..4c01b8e65a 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/DefaultMessageChannelMetrics.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/DefaultMessageChannelMetrics.java
@@ -11,16 +11,10 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.integration.channel.management;
+package org.springframework.integration.support.management;
 
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.springframework.integration.support.management.ExponentialMovingAverage;
-import org.springframework.integration.support.management.ExponentialMovingAverageRate;
-import org.springframework.integration.support.management.ExponentialMovingAverageRatio;
-import org.springframework.integration.support.management.MetricsContext;
-import org.springframework.integration.support.management.Statistics;
-
 /**
  * Default implementation; use the full constructor to customize the moving averages.
  *
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/management/DefaultMessageHandlerMetrics.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/DefaultMessageHandlerMetrics.java
similarity index 93%
rename from spring-integration-core/src/main/java/org/springframework/integration/handler/management/DefaultMessageHandlerMetrics.java
rename to spring-integration-core/src/main/java/org/springframework/integration/support/management/DefaultMessageHandlerMetrics.java
index 6e0e0cb1d9..1c151a8a87 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/management/DefaultMessageHandlerMetrics.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/DefaultMessageHandlerMetrics.java
@@ -14,14 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler.management;
+package org.springframework.integration.support.management;
 
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.springframework.integration.support.management.ExponentialMovingAverage;
-import org.springframework.integration.support.management.MetricsContext;
-import org.springframework.integration.support.management.Statistics;
-
 /**
  * Default implementation; use the full constructor to customize the moving averages.
  *
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/DefaultMetricsFactory.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/DefaultMetricsFactory.java
index f436c5392c..e1676dfa5b 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/DefaultMetricsFactory.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/DefaultMetricsFactory.java
@@ -15,10 +15,6 @@
  */
 package org.springframework.integration.support.management;
 
-import org.springframework.integration.channel.management.AbstractMessageChannelMetrics;
-import org.springframework.integration.channel.management.DefaultMessageChannelMetrics;
-import org.springframework.integration.handler.management.AbstractMessageHandlerMetrics;
-import org.springframework.integration.handler.management.DefaultMessageHandlerMetrics;
 
 
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagementConfigurer.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagementConfigurer.java
index cba519e9b8..c44fe3d493 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagementConfigurer.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagementConfigurer.java
@@ -24,9 +24,6 @@ import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.integration.channel.management.AbstractMessageChannelMetrics;
-import org.springframework.integration.channel.management.MessageChannelMetrics;
-import org.springframework.integration.handler.management.AbstractMessageHandlerMetrics;
 import org.springframework.util.Assert;
 import org.springframework.util.PatternMatchUtils;
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleMessageHandlerMetrics.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleMessageHandlerMetrics.java
index f547464f37..4015035065 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleMessageHandlerMetrics.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleMessageHandlerMetrics.java
@@ -17,7 +17,6 @@
 package org.springframework.integration.support.management;
 
 import org.springframework.context.Lifecycle;
-import org.springframework.integration.handler.management.AbstractMessageHandlerMetrics;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
 import org.springframework.jmx.export.annotation.ManagedOperation;
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleTrackableMessageHandlerMetrics.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleTrackableMessageHandlerMetrics.java
index 9c6f38d1a0..89359f8026 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleTrackableMessageHandlerMetrics.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleTrackableMessageHandlerMetrics.java
@@ -17,7 +17,6 @@
 package org.springframework.integration.support.management;
 
 import org.springframework.context.Lifecycle;
-import org.springframework.integration.history.TrackableComponent;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleTrackableMessageSourceMetrics.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleTrackableMessageSourceMetrics.java
index e191e52bf9..bc04b9788e 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleTrackableMessageSourceMetrics.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleTrackableMessageSourceMetrics.java
@@ -17,7 +17,6 @@
 package org.springframework.integration.support.management;
 
 import org.springframework.context.Lifecycle;
-import org.springframework.integration.history.TrackableComponent;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/MessageChannelMetrics.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/MessageChannelMetrics.java
similarity index 94%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/management/MessageChannelMetrics.java
rename to spring-integration-core/src/main/java/org/springframework/integration/support/management/MessageChannelMetrics.java
index 315ed94765..903f3ee4a5 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/MessageChannelMetrics.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/MessageChannelMetrics.java
@@ -14,10 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.channel.management;
+package org.springframework.integration.support.management;
 
-import org.springframework.integration.support.management.IntegrationStatsManagement;
-import org.springframework.integration.support.management.Statistics;
 import org.springframework.jmx.export.annotation.ManagedMetric;
 import org.springframework.jmx.support.MetricType;
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/MetricsFactory.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/MetricsFactory.java
index 2a74a0ffb9..50f50661ee 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/MetricsFactory.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/MetricsFactory.java
@@ -15,8 +15,6 @@
  */
 package org.springframework.integration.support.management;
 
-import org.springframework.integration.channel.management.AbstractMessageChannelMetrics;
-import org.springframework.integration.handler.management.AbstractMessageHandlerMetrics;
 
 /**
  * Factories implementing this interface provide metric objects for message channels and
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/PollableChannelManagement.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/PollableChannelManagement.java
similarity index 95%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/management/PollableChannelManagement.java
rename to spring-integration-core/src/main/java/org/springframework/integration/support/management/PollableChannelManagement.java
index 96721b8826..e650fb5b4e 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/PollableChannelManagement.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/PollableChannelManagement.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.channel.management;
+package org.springframework.integration.support.management;
 
 import org.springframework.jmx.export.annotation.ManagedMetric;
 import org.springframework.jmx.support.MetricType;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/QueueChannelManagement.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/QueueChannelManagement.java
similarity index 94%
rename from spring-integration-core/src/main/java/org/springframework/integration/channel/management/QueueChannelManagement.java
rename to spring-integration-core/src/main/java/org/springframework/integration/support/management/QueueChannelManagement.java
index 7acf6d7d79..43a0182cb2 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/management/QueueChannelManagement.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/QueueChannelManagement.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.channel.management;
+package org.springframework.integration.support.management;
 
 import org.springframework.jmx.export.annotation.ManagedMetric;
 import org.springframework.jmx.support.MetricType;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/history/TrackableComponent.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/TrackableComponent.java
similarity index 87%
rename from spring-integration-core/src/main/java/org/springframework/integration/history/TrackableComponent.java
rename to spring-integration-core/src/main/java/org/springframework/integration/support/management/TrackableComponent.java
index 988aff01d4..8a863afde4 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/history/TrackableComponent.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/TrackableComponent.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.history;
+package org.springframework.integration.support.management;
 
 import org.springframework.integration.support.context.NamedComponent;
-import org.springframework.integration.support.management.IntegrationManagedResource;
 import org.springframework.jmx.export.annotation.ManagedOperation;
 
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/TrackableRouterMetrics.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/TrackableRouterMetrics.java
index 0febcb1a2c..1b0dcb65ad 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/TrackableRouterMetrics.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/TrackableRouterMetrics.java
@@ -17,7 +17,6 @@
 package org.springframework.integration.support.management;
 
 import org.springframework.context.Lifecycle;
-import org.springframework.integration.history.TrackableComponent;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/BarrierMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/BarrierMessageHandlerTests.java
similarity index 98%
rename from spring-integration-core/src/test/java/org/springframework/integration/handler/BarrierMessageHandlerTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/aggregator/BarrierMessageHandlerTests.java
index 74dfca335f..f6ce939005 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/handler/BarrierMessageHandlerTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/BarrierMessageHandlerTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler;
+package org.springframework.integration.aggregator;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
@@ -46,6 +46,7 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.aggregator.BarrierMessageHandler;
 import org.springframework.integration.annotation.Poller;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.channel.DirectChannel;
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BarrierParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BarrierParserTests.java
index 8ee45f2364..03e5e4fbbc 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BarrierParserTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BarrierParserTests.java
@@ -25,12 +25,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.aggregator.BarrierMessageHandler;
 import org.springframework.integration.aggregator.CorrelationStrategy;
 import org.springframework.integration.aggregator.HeaderAttributeCorrelationStrategy;
 import org.springframework.integration.aggregator.MessageGroupProcessor;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
 import org.springframework.integration.endpoint.PollingConsumer;
-import org.springframework.integration.handler.BarrierMessageHandler;
 import org.springframework.integration.store.MessageGroup;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.Message;
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java
index f5dc8f0528..11c84b5f28 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java
@@ -888,6 +888,13 @@ public abstract class AbstractConnectionFactory extends IntegrationObjectSupport
 		}
 	}
 
+	@Override
+	public String toString() {
+		return super.toString()
+				+ (this.host != null ? ", host=" + this.host : "")
+				+ ", port=" + this.port;
+	}
+
 	private class PendingIO {
 
 		private final long failedAt;
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionServerExceptionEvent.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionServerExceptionEvent.java
index fae213f2ca..bf3f00ad0f 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionServerExceptionEvent.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionServerExceptionEvent.java
@@ -28,26 +28,10 @@ import org.springframework.util.Assert;
 @SuppressWarnings("serial")
 public class TcpConnectionServerExceptionEvent extends IpIntegrationEvent {
 
-	public TcpConnectionServerExceptionEvent(AbstractServerConnectionFactory connectionFactory, Throwable cause) {
+	public TcpConnectionServerExceptionEvent(Object connectionFactory, Throwable cause) {
 		super(connectionFactory, cause);
 		Assert.notNull(cause, "'cause' cannot be null");
 		Assert.notNull(connectionFactory, "'connectionFactory' cannot be null");
 	}
 
-	/**
-	 * The connection factory that experienced the exception; examine it to determine the port etc.
-	 * @return the connection factory.
-	 */
-	public AbstractServerConnectionFactory getConnectionFactory() {
-		return (AbstractServerConnectionFactory) getSource();
-	}
-
-	@Override
-	public String toString() {
-		return super.toString() +
-				", [factory=" + getConnectionFactory().getComponentType() +
-				":" + getConnectionFactory().getComponentName() +
-				", port=" + getConnectionFactory().getPort() + "]";
-	}
-
 }
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java
index 5aa07e89f1..0899f6d2bd 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java
@@ -307,11 +307,8 @@ public class ConnectionEventTests {
 		assertTrue(latch.await(10, TimeUnit.SECONDS));
 		String actual = theEvent.toString();
 		assertThat(actual, containsString("cause=java.net.BindException"));
-		assertThat(actual, containsString("[factory="
-				+ (factory instanceof TcpNetServerConnectionFactory
-				? "tcp-net-server-connection-factory"
-				: "tcp-nio-server-connection-factory")
-				+ ":sf, port=" + port + "]"));
+		assertThat(actual, containsString("source="
+				+ "sf, port=" + port));
 
 		ArgumentCaptor<String> reasonCaptor = ArgumentCaptor.forClass(String.class);
 		ArgumentCaptor<Throwable> throwableCaptor = ArgumentCaptor.forClass(Throwable.class);
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapperTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapperTests.java
index ddec3896af..e84321672c 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapperTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapperTests.java
@@ -37,12 +37,12 @@ import org.springframework.core.serializer.DefaultDeserializer;
 import org.springframework.core.serializer.DefaultSerializer;
 import org.springframework.integration.IntegrationMessageHeaderAccessor;
 import org.springframework.integration.codec.Codec;
+import org.springframework.integration.codec.CodecMessageConverter;
 import org.springframework.integration.codec.CompositeCodec;
 import org.springframework.integration.codec.kryo.MessageCodec;
 import org.springframework.integration.ip.IpHeaders;
 import org.springframework.integration.ip.tcp.serializer.MapJsonSerializer;
 import org.springframework.integration.support.MessageBuilder;
-import org.springframework.integration.support.converter.CodecMessageConverter;
 import org.springframework.integration.support.converter.MapMessageConverter;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.converter.MessageConverter;
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java
index 9d7485f3ea..6ffc1fe7a5 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java
@@ -33,9 +33,9 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.gateway.MessagingGatewaySupport;
-import org.springframework.integration.history.TrackableComponent;
 import org.springframework.integration.support.DefaultMessageBuilderFactory;
 import org.springframework.integration.support.MessageBuilderFactory;
+import org.springframework.integration.support.management.TrackableComponent;
 import org.springframework.integration.support.utils.IntegrationUtils;
 import org.springframework.jms.listener.SessionAwareMessageListener;
 import org.springframework.jms.support.JmsUtils;
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/PollableJmsChannel.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/PollableJmsChannel.java
index 75be0244f7..b54509fa79 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/PollableJmsChannel.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/PollableJmsChannel.java
@@ -21,7 +21,7 @@ import java.util.Deque;
 import java.util.List;
 
 import org.springframework.integration.channel.ExecutorChannelInterceptorAware;
-import org.springframework.integration.channel.management.PollableChannelManagement;
+import org.springframework.integration.support.management.PollableChannelManagement;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.PollableChannel;
diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
index 030742ceb9..549c501ccf 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
@@ -43,15 +43,12 @@ import org.springframework.context.EmbeddedValueResolverAware;
 import org.springframework.context.Lifecycle;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.channel.management.MessageChannelMetrics;
-import org.springframework.integration.channel.management.PollableChannelManagement;
 import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.context.OrderlyShutdownCapable;
 import org.springframework.integration.core.MessageProducer;
 import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.handler.AbstractMessageProducingHandler;
 import org.springframework.integration.history.MessageHistoryConfigurer;
-import org.springframework.integration.history.TrackableComponent;
 import org.springframework.integration.support.context.NamedComponent;
 import org.springframework.integration.support.management.IntegrationManagedResource;
 import org.springframework.integration.support.management.IntegrationManagementConfigurer;
@@ -60,10 +57,13 @@ import org.springframework.integration.support.management.LifecycleMessageSource
 import org.springframework.integration.support.management.LifecycleTrackableMessageHandlerMetrics;
 import org.springframework.integration.support.management.LifecycleTrackableMessageSourceMetrics;
 import org.springframework.integration.support.management.MappingMessageRouterManagement;
+import org.springframework.integration.support.management.MessageChannelMetrics;
 import org.springframework.integration.support.management.MessageHandlerMetrics;
 import org.springframework.integration.support.management.MessageSourceMetrics;
+import org.springframework.integration.support.management.PollableChannelManagement;
 import org.springframework.integration.support.management.RouterMetrics;
 import org.springframework.integration.support.management.Statistics;
+import org.springframework.integration.support.management.TrackableComponent;
 import org.springframework.integration.support.management.TrackableRouterMetrics;
 import org.springframework.jmx.export.MBeanExporter;
 import org.springframework.jmx.export.UnableToRegisterMBeanException;
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests.java
index 97f2aec898..9c6cdf44fe 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests.java
@@ -31,16 +31,16 @@ import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.springframework.integration.channel.management.AbstractMessageChannelMetrics;
-import org.springframework.integration.channel.management.DefaultMessageChannelMetrics;
-import org.springframework.integration.channel.management.MessageChannelMetrics;
-import org.springframework.integration.handler.management.AbstractMessageHandlerMetrics;
-import org.springframework.integration.handler.management.DefaultMessageHandlerMetrics;
 import org.springframework.integration.monitor.IntegrationMBeanExporter;
+import org.springframework.integration.support.management.AbstractMessageChannelMetrics;
+import org.springframework.integration.support.management.AbstractMessageHandlerMetrics;
+import org.springframework.integration.support.management.DefaultMessageChannelMetrics;
+import org.springframework.integration.support.management.DefaultMessageHandlerMetrics;
 import org.springframework.integration.support.management.ExponentialMovingAverage;
 import org.springframework.integration.support.management.ExponentialMovingAverageRate;
 import org.springframework.integration.support.management.ExponentialMovingAverageRatio;
 import org.springframework.integration.support.management.IntegrationManagementConfigurer;
+import org.springframework.integration.support.management.MessageChannelMetrics;
 import org.springframework.integration.support.management.MessageHandlerMetrics;
 import org.springframework.integration.support.management.MetricsFactory;
 import org.springframework.integration.test.util.TestUtils;
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/AggregatingMetricsTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/AggregatingMetricsTests.java
index 7fc410d9a2..5e7abaae40 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/AggregatingMetricsTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/AggregatingMetricsTests.java
@@ -26,10 +26,10 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.channel.AbstractMessageChannel;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.channel.management.AggregatingMessageChannelMetrics;
 import org.springframework.integration.handler.BridgeHandler;
 import org.springframework.integration.handler.ServiceActivatingHandler;
-import org.springframework.integration.handler.management.AggregatingMessageHandlerMetrics;
+import org.springframework.integration.support.management.AggregatingMessageChannelMetrics;
+import org.springframework.integration.support.management.AggregatingMessageHandlerMetrics;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.support.GenericMessage;
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MonitorTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MonitorTests.java
index e40c2d3ef0..8aca18bc13 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MonitorTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MonitorTests.java
@@ -42,7 +42,7 @@ import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.core.MessagingTemplate;
 import org.springframework.integration.endpoint.AbstractMessageSource;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.handler.management.DefaultMessageHandlerMetrics;
+import org.springframework.integration.support.management.DefaultMessageHandlerMetrics;
 import org.springframework.integration.support.management.MetricsContext;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.Message;
diff --git a/src/reference/asciidoc/whats-new.adoc b/src/reference/asciidoc/whats-new.adoc
index ee40e08a85..93a043eb52 100644
--- a/src/reference/asciidoc/whats-new.adoc
+++ b/src/reference/asciidoc/whats-new.adoc
@@ -184,7 +184,8 @@ The annotation now defaults this attribute to 1.
 [[x4.2-api-changes]]
 ==== API Changes
 
-`o.s.integtation.util.FunctionIterator` now requires a `o.s.integration.util.Function` instead of a `reactor.function.Function`.
+`o.s.integration.util.FunctionIterator` now requires a `o.s.integration.util.Function` instead of a
+`reactor.function.Function`.
 This was done to remove an unnecessary hard dependency on Reactor.
 Any uses of this iterator will need to change the import.