diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/RotatingServerAdvice.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/aop/RotatingServerAdvice.java
similarity index 98%
rename from spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/RotatingServerAdvice.java
rename to spring-integration-file/src/main/java/org/springframework/integration/file/remote/aop/RotatingServerAdvice.java
index f0905b10cd..24af3e40f8 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/RotatingServerAdvice.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/aop/RotatingServerAdvice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.file.remote.session;
+package org.springframework.integration.file.remote.aop;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -26,6 +26,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.integration.aop.AbstractMessageSourceAdvice;
 import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.file.remote.AbstractRemoteFileStreamingMessageSource;
+import org.springframework.integration.file.remote.session.DelegatingSessionFactory;
 import org.springframework.integration.file.remote.synchronizer.AbstractInboundFileSynchronizingMessageSource;
 import org.springframework.messaging.Message;
 import org.springframework.util.Assert;
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/aop/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/aop/package-info.java
new file mode 100644
index 0000000000..a7ce737a46
--- /dev/null
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/aop/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides classes related to AOP.
+ */
+package org.springframework.integration.file.remote.aop;
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java
index 489ae6fa28..2689c29599 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java
@@ -41,11 +41,11 @@ import org.springframework.integration.dsl.IntegrationFlow;
 import org.springframework.integration.dsl.IntegrationFlows;
 import org.springframework.integration.dsl.MessageChannels;
 import org.springframework.integration.dsl.Pollers;
+import org.springframework.integration.file.remote.aop.RotatingServerAdvice;
+import org.springframework.integration.file.remote.aop.RotatingServerAdvice.KeyDirectory;
 import org.springframework.integration.file.remote.session.CachingSessionFactory;
 import org.springframework.integration.file.remote.session.DefaultSessionFactoryLocator;
 import org.springframework.integration.file.remote.session.DelegatingSessionFactory;
-import org.springframework.integration.file.remote.session.RotatingServerAdvice;
-import org.springframework.integration.file.remote.session.RotatingServerAdvice.KeyDirectory;
 import org.springframework.integration.file.remote.session.Session;
 import org.springframework.integration.file.remote.session.SessionFactory;
 import org.springframework.integration.file.remote.session.SessionFactoryLocator;