diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundFileSynchronizingMessageSourceFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundFileSynchronizingMessageSourceFactoryBean.java
index c4a672d687..d68093cb74 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundFileSynchronizingMessageSourceFactoryBean.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundFileSynchronizingMessageSourceFactoryBean.java
@@ -28,12 +28,12 @@ import org.springframework.core.io.ResourceEditor;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.integration.file.filters.CompositeFileListFilter;
 import org.springframework.integration.file.filters.FileListFilter;
-import org.springframework.integration.ftp.client.AbstractFtpClientFactory;
-import org.springframework.integration.ftp.client.DefaultFtpClientFactory;
-import org.springframework.integration.ftp.client.QueuedFtpClientPool;
 import org.springframework.integration.ftp.filters.FtpPatternMatchingFileListFilter;
 import org.springframework.integration.ftp.inbound.FtpInboundFileSynchronizer;
 import org.springframework.integration.ftp.inbound.FtpInboundFileSynchronizingMessageSource;
+import org.springframework.integration.ftp.session.AbstractFtpClientFactory;
+import org.springframework.integration.ftp.session.DefaultFtpClientFactory;
+import org.springframework.integration.ftp.session.QueuedFtpClientPool;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java
index 7bcb02d1d7..166a57ffc3 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java
@@ -18,10 +18,10 @@ package org.springframework.integration.ftp.config;
 
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.integration.file.FileNameGenerator;
-import org.springframework.integration.ftp.client.AbstractFtpClientFactory;
-import org.springframework.integration.ftp.client.DefaultFtpClientFactory;
-import org.springframework.integration.ftp.client.QueuedFtpClientPool;
 import org.springframework.integration.ftp.outbound.FtpSendingMessageHandler;
+import org.springframework.integration.ftp.session.AbstractFtpClientFactory;
+import org.springframework.integration.ftp.session.DefaultFtpClientFactory;
+import org.springframework.integration.ftp.session.QueuedFtpClientPool;
 
 /**
  * A factory bean implementation that handles constructing an outbound FTP
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java
index c8e0b19118..c01229fff3 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java
@@ -31,7 +31,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.integration.MessagingException;
 import org.springframework.integration.file.synchronizer.AbstractInboundFileSynchronizer;
 import org.springframework.integration.file.synchronizer.AbstractInboundFileSynchronizingMessageSource;
-import org.springframework.integration.ftp.client.FtpClientPool;
+import org.springframework.integration.ftp.session.FtpClientPool;
 import org.springframework.util.Assert;
 
 /**
@@ -46,9 +46,9 @@ public class FtpInboundFileSynchronizer extends AbstractInboundFileSynchronizer<
 
 
 	/**
-	 * The {@link org.springframework.integration.ftp.client.FtpClientPool} that holds references to {@link org.apache.commons.net.ftp.FTPClient} instances
+	 * The {@link org.springframework.integration.ftp.session.FtpClientPool} that holds references to {@link org.apache.commons.net.ftp.FTPClient} instances
 	 *
-	 * @param clientPool the {@link org.springframework.integration.ftp.client.FtpClientPool}
+	 * @param clientPool the {@link org.springframework.integration.ftp.session.FtpClientPool}
 	 */
 	public void setClientPool(FtpClientPool clientPool) {
 		this.clientPool = clientPool;
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandler.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandler.java
index 8670d18ab7..b299450889 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandler.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandler.java
@@ -33,7 +33,7 @@ import org.springframework.integration.Message;
 import org.springframework.integration.MessageDeliveryException;
 import org.springframework.integration.file.DefaultFileNameGenerator;
 import org.springframework.integration.file.FileNameGenerator;
-import org.springframework.integration.ftp.client.FtpClientPool;
+import org.springframework.integration.ftp.session.FtpClientPool;
 import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.util.Assert;
 import org.springframework.util.FileCopyUtils;
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/AbstractFtpClientFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpClientFactory.java
similarity index 98%
rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/AbstractFtpClientFactory.java
rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpClientFactory.java
index bfe1e6e2e5..4320e933fb 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/AbstractFtpClientFactory.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpClientFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.ftp.client;
+package org.springframework.integration.ftp.session;
 
 import java.io.IOException;
 import java.net.SocketException;
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * base class for the other {@link org.springframework.integration.ftp.client.FtpClientFactory} implementations.
+ * base class for the other {@link org.springframework.integration.ftp.session.FtpClientFactory} implementations.
  * Most of this came out of the {@link DefaultFtpClientFactory} and was refactored into a base class
  *
  * @author Iwein Fuld
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/DefaultFtpClientFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpClientFactory.java
similarity index 94%
rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/DefaultFtpClientFactory.java
rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpClientFactory.java
index bf4b03cc76..efd475f4f5 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/DefaultFtpClientFactory.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpClientFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.ftp.client;
+package org.springframework.integration.ftp.session;
 
 import org.apache.commons.net.ftp.FTPClient;
 
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/DefaultFtpsClientFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsClientFactory.java
similarity index 97%
rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/DefaultFtpsClientFactory.java
rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsClientFactory.java
index 8c50a6c7d5..5662c081b5 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/DefaultFtpsClientFactory.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsClientFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.ftp.client;
+package org.springframework.integration.ftp.session;
 
 import java.io.IOException;
 import java.net.SocketException;
@@ -28,7 +28,7 @@ import org.apache.commons.net.ftp.FTPSClient;
 import org.springframework.util.StringUtils;
 
 /**
- * provides a working FTPS implementation. Based heavily on {@link org.springframework.integration.ftp.client.DefaultFtpClientFactory}
+ * provides a working FTPS implementation. Based heavily on {@link org.springframework.integration.ftp.session.DefaultFtpClientFactory}
  * 
  * @author Josh Long
  * @author Iwein Fuld
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/FtpClientFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpClientFactory.java
similarity index 95%
rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/FtpClientFactory.java
rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpClientFactory.java
index a0f32f1b1b..fe86ac3e75 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/FtpClientFactory.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpClientFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.ftp.client;
+package org.springframework.integration.ftp.session;
 
 import org.apache.commons.net.ftp.FTPClient;
 
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/FtpClientPool.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpClientPool.java
similarity index 97%
rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/FtpClientPool.java
rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpClientPool.java
index adf4471dd4..b567d7c194 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/FtpClientPool.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpClientPool.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.ftp.client;
+package org.springframework.integration.ftp.session;
 
 import org.apache.commons.net.ftp.FTPClient;
 
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/QueuedFtpClientPool.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/QueuedFtpClientPool.java
similarity index 98%
rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/QueuedFtpClientPool.java
rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/QueuedFtpClientPool.java
index 92a26044f2..d4b8d0bfb1 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/client/QueuedFtpClientPool.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/QueuedFtpClientPool.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.ftp.client;
+package org.springframework.integration.ftp.session;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-context.xml
index fd20cb36cc..49ea6346f2 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-context.xml
@@ -10,7 +10,7 @@
         http://www.springframework.org/schema/integration  http://www.springframework.org/schema/integration/spring-integration.xsd
        http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.client.DefaultFtpClientFactory">
+	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpClientFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-fail-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-fail-context.xml
index 190d63f8b7..d0cf8210c9 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-fail-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-fail-context.xml
@@ -10,7 +10,7 @@
         http://www.springframework.org/schema/integration  http://www.springframework.org/schema/integration/spring-integration.xsd
        http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.client.DefaultFtpClientFactory">
+	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpClientFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests-context.xml
index af5ba9c2b4..1828ed1e92 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests-context.xml
@@ -10,7 +10,7 @@
 	<int:channel id="ftpOutbound"/>
 	
 	
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.client.DefaultFtpsClientFactory">
+	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpsClientFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java
index 558e442302..e3db33efdb 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java
@@ -33,9 +33,9 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
 import org.springframework.integration.file.filters.CompositeFileListFilter;
-import org.springframework.integration.ftp.client.DefaultFtpClientFactory;
 import org.springframework.integration.ftp.inbound.FtpInboundFileSynchronizer;
 import org.springframework.integration.ftp.inbound.FtpInboundFileSynchronizingMessageSource;
+import org.springframework.integration.ftp.session.DefaultFtpClientFactory;
 import org.springframework.integration.test.util.TestUtils;
 
 /**
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterSample-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterSample-context.xml
index 35ade82acf..f7e88c68c8 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterSample-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterSample-context.xml
@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd">
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.client.DefaultFtpClientFactory">
+	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpClientFactory">
 		<property name="host" value="localhost"/>
 		<property name="username" value="ozhurakousky"/>
 		<property name="password" value="seva@1994"/>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml
index b5b2d37c6f..fe15919de8 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml
@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd">
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.client.DefaultFtpClientFactory">
+	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpClientFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java
index a9bd0565d9..5d879d840b 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java
@@ -24,9 +24,9 @@ import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
-import org.springframework.integration.ftp.client.FtpClientFactory;
-import org.springframework.integration.ftp.client.FtpClientPool;
 import org.springframework.integration.ftp.outbound.FtpSendingMessageHandler;
+import org.springframework.integration.ftp.session.FtpClientFactory;
+import org.springframework.integration.ftp.session.FtpClientPool;
 import org.springframework.integration.test.util.TestUtils;
 
 /**
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterSample-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterSample-context.xml
index 19b8acd1cf..239200bab3 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterSample-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterSample-context.xml
@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd">
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.client.DefaultFtpClientFactory">
+	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpClientFactory">
 		<property name="host" value="localhost"/>
 		<property name="username" value="ozhurakousky"/>
 		<property name="password" value="seva@1994"/>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests-context.xml
index d4df775b54..d2c046472c 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests-context.xml
@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd">
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.client.DefaultFtpsClientFactory">
+	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpsClientFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests-context.xml
index 7fbd3ddad9..6020bf411d 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests-context.xml
@@ -14,7 +14,7 @@
 		<constructor-arg value="javax.net.ssl.TrustManager"/>
 	</bean>
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.client.DefaultFtpsClientFactory">
+	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpsClientFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests.java
index c9613abc68..8c1a836607 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests.java
@@ -24,9 +24,9 @@ import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
-import org.springframework.integration.ftp.client.FtpClientFactory;
-import org.springframework.integration.ftp.client.FtpClientPool;
 import org.springframework.integration.ftp.outbound.FtpSendingMessageHandler;
+import org.springframework.integration.ftp.session.FtpClientFactory;
+import org.springframework.integration.ftp.session.FtpClientPool;
 import org.springframework.integration.test.util.TestUtils;
 
 /**
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/ftp-message-history-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/ftp-message-history-context.xml
index 8668c612d8..02eb247765 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/ftp-message-history-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/ftp-message-history-context.xml
@@ -12,7 +12,7 @@
 	<int:message-history/>
 	
 	
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.client.DefaultFtpClientFactory">
+	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpClientFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java
index 3df09f8cac..9a96dde09c 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java
@@ -32,9 +32,9 @@ import org.mockito.Mockito;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.integration.file.filters.FileListFilter;
-import org.springframework.integration.ftp.client.DefaultFtpClientFactory;
-import org.springframework.integration.ftp.client.QueuedFtpClientPool;
 import org.springframework.integration.ftp.filters.FtpPatternMatchingFileListFilter;
+import org.springframework.integration.ftp.session.DefaultFtpClientFactory;
+import org.springframework.integration.ftp.session.QueuedFtpClientPool;
 
 /**
  * @author Oleg Zhurakousky
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerTest.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerTest.java
index b8e7a7cbf6..c001645acb 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerTest.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerTest.java
@@ -27,7 +27,7 @@ import org.apache.commons.net.ftp.FTPClient;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import org.springframework.integration.ftp.client.FtpClientPool;
+import org.springframework.integration.ftp.session.FtpClientPool;
 import org.springframework.integration.message.GenericMessage;
 
 /**