diff --git a/core/src/main/java/org/acegisecurity/providers/ldap/authenticator/LdapUserSearch.java b/core/src/main/java/org/acegisecurity/providers/ldap/LdapUserSearch.java
similarity index 96%
rename from core/src/main/java/org/acegisecurity/providers/ldap/authenticator/LdapUserSearch.java
rename to core/src/main/java/org/acegisecurity/providers/ldap/LdapUserSearch.java
index ffe84619fc..81de142c2a 100644
--- a/core/src/main/java/org/acegisecurity/providers/ldap/authenticator/LdapUserSearch.java
+++ b/core/src/main/java/org/acegisecurity/providers/ldap/LdapUserSearch.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.ldap.authenticator;
+package org.acegisecurity.providers.ldap;
 
 import org.acegisecurity.providers.ldap.LdapUserInfo;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/ldap/authenticator/AbstractLdapAuthenticator.java b/core/src/main/java/org/acegisecurity/providers/ldap/authenticator/AbstractLdapAuthenticator.java
index 6ce6d42796..ef56357ae8 100644
--- a/core/src/main/java/org/acegisecurity/providers/ldap/authenticator/AbstractLdapAuthenticator.java
+++ b/core/src/main/java/org/acegisecurity/providers/ldap/authenticator/AbstractLdapAuthenticator.java
@@ -17,6 +17,7 @@ package org.acegisecurity.providers.ldap.authenticator;
 
 import org.acegisecurity.providers.ldap.LdapAuthenticator;
 import org.acegisecurity.providers.ldap.InitialDirContextFactory;
+import org.acegisecurity.providers.ldap.LdapUserSearch;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/ldap/authenticator/FilterBasedLdapUserSearch.java b/core/src/main/java/org/acegisecurity/providers/ldap/search/FilterBasedLdapUserSearch.java
similarity index 99%
rename from core/src/main/java/org/acegisecurity/providers/ldap/authenticator/FilterBasedLdapUserSearch.java
rename to core/src/main/java/org/acegisecurity/providers/ldap/search/FilterBasedLdapUserSearch.java
index e4d01374a5..039bb91813 100644
--- a/core/src/main/java/org/acegisecurity/providers/ldap/authenticator/FilterBasedLdapUserSearch.java
+++ b/core/src/main/java/org/acegisecurity/providers/ldap/search/FilterBasedLdapUserSearch.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.ldap.authenticator;
+package org.acegisecurity.providers.ldap.search;
 
 import org.acegisecurity.providers.ldap.*;
 import org.acegisecurity.userdetails.UsernameNotFoundException;
diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/MockUserSearch.java b/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/MockUserSearch.java
index 864d790c56..ad936ff0d3 100644
--- a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/MockUserSearch.java
+++ b/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/MockUserSearch.java
@@ -1,6 +1,7 @@
 package org.acegisecurity.providers.ldap.authenticator;
 
 import org.acegisecurity.providers.ldap.LdapUserInfo;
+import org.acegisecurity.providers.ldap.LdapUserSearch;
 
 /**
  * @author Luke Taylor
diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/FilterBasedLdapUserSearchTests.java b/core/src/test/java/org/acegisecurity/providers/ldap/search/FilterBasedLdapUserSearchTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/providers/ldap/authenticator/FilterBasedLdapUserSearchTests.java
rename to core/src/test/java/org/acegisecurity/providers/ldap/search/FilterBasedLdapUserSearchTests.java
index 0058928d31..9ccf580352 100644
--- a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/FilterBasedLdapUserSearchTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/ldap/search/FilterBasedLdapUserSearchTests.java
@@ -1,8 +1,9 @@
-package org.acegisecurity.providers.ldap.authenticator;
+package org.acegisecurity.providers.ldap.search;
 
 import org.acegisecurity.providers.ldap.AbstractLdapServerTestCase;
 import org.acegisecurity.providers.ldap.DefaultInitialDirContextFactory;
 import org.acegisecurity.providers.ldap.LdapUserInfo;
+import org.acegisecurity.providers.ldap.search.FilterBasedLdapUserSearch;
 import org.acegisecurity.userdetails.UsernameNotFoundException;
 import org.acegisecurity.BadCredentialsException;