diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/DefaultDirectoryScanner.java b/spring-integration-file/src/main/java/org/springframework/integration/file/DefaultDirectoryScanner.java
index e40398d320..7ef77a77b8 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/DefaultDirectoryScanner.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/DefaultDirectoryScanner.java
@@ -17,7 +17,6 @@
 package org.springframework.integration.file;
 
 import org.springframework.integration.core.MessagingException;
-import org.springframework.integration.file.locking.FileLocker;
 
 import java.io.File;
 import java.util.List;
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/DirectoryScanner.java b/spring-integration-file/src/main/java/org/springframework/integration/file/DirectoryScanner.java
index 05a99cdf11..a194998c61 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/DirectoryScanner.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/DirectoryScanner.java
@@ -16,8 +16,6 @@
 
 package org.springframework.integration.file;
 
-import org.springframework.integration.file.locking.FileLocker;
-
 import java.io.File;
 import java.util.List;
 
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/locking/FileLocker.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileLocker.java
similarity index 92%
rename from spring-integration-file/src/main/java/org/springframework/integration/file/locking/FileLocker.java
rename to spring-integration-file/src/main/java/org/springframework/integration/file/FileLocker.java
index c0a12d0ac1..e96883d806 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/locking/FileLocker.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileLocker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.file.locking;
+package org.springframework.integration.file;
 
 import java.io.File;
 
@@ -25,7 +25,7 @@ import java.io.File;
  * contract, defining these guarantees is up to the implementation.
  *
  * If a filter that respects locks is required extend
- * {@link AbstractFileLockerFilter} instead.
+ * {@link org.springframework.integration.file.locking.AbstractFileLockerFilter} instead.
  * 
  * @author Iwein Fuld
  * @since 2.0
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java
index a00b2725f7..97984c483f 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java
@@ -22,7 +22,6 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.aggregator.ResequencingMessageGroupProcessor;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
-import org.springframework.integration.file.locking.FileLocker;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessageSource;
 import org.springframework.util.Assert;
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/locking/AbstractFileLockerFilter.java b/spring-integration-file/src/main/java/org/springframework/integration/file/locking/AbstractFileLockerFilter.java
index b42e5178bc..7804468f75 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/locking/AbstractFileLockerFilter.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/locking/AbstractFileLockerFilter.java
@@ -17,6 +17,7 @@
 package org.springframework.integration.file.locking;
 
 import org.springframework.integration.file.AbstractFileListFilter;
+import org.springframework.integration.file.FileLocker;
 
 import java.io.File;
 
diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java
index 350fa3d2aa..6dd07a92bd 100644
--- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java
+++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java
@@ -22,7 +22,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.integration.core.Message;
-import org.springframework.integration.file.locking.FileLocker;
 
 import java.io.File;
 import java.io.IOException;