diff --git a/spring-ldap/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml b/spring-ldap/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
index e6b739a5..adbd39e5 100644
--- a/spring-ldap/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
+++ b/spring-ldap/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
@@ -9,12 +9,12 @@
 		<property name="location" value="classpath:/conf/ldap-openldap.properties" />
 	</bean>
 	
-	<bean id="contextSource" class="org.springframework.ldap.support.LdapContextSource" >
+	<bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource" >
 		<property name="urls" value="${urls}" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="base" value="${base}" />
-		<property name="dirObjectFactory" value="org.springframework.ldap.support.DefaultDirObjectFactory" />
+		<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
 	</bean>
 	
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
diff --git a/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java b/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java
index 26e71ea7..bd40fbfb 100644
--- a/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java
+++ b/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java
@@ -21,9 +21,9 @@ import javax.naming.directory.Attributes;
 
 import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.ContextMapper;
+import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.ldap.support.DirContextAdapter;
-import org.springframework.ldap.support.DistinguishedName;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**
@@ -42,7 +42,7 @@ public class LdapTemplateLookupOpenLdapITest extends
     }
 
     /**
-     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.support.DefaultDirObjectFactory})
+     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
      * being set in the ContextSource.
      */
     public void testLookup_Plain() {
@@ -134,7 +134,7 @@ public class LdapTemplateLookupOpenLdapITest extends
     }
 
     /**
-     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.support.DefaultDirObjectFactory})
+     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
      * being set in the ContextSource.
      */
     public void testLookup_ContextMapper() {
diff --git a/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplatePagedSearchITest.java b/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplatePagedSearchITest.java
index f5acb700..afc0baf3 100644
--- a/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplatePagedSearchITest.java
+++ b/spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplatePagedSearchITest.java
@@ -23,12 +23,12 @@ import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.SearchControls;
 
+import org.springframework.ldap.control.PagedResultsCookie;
+import org.springframework.ldap.control.PagedResultsRequestControl;
 import org.springframework.ldap.core.CollectingNameClassPairCallbackHandler;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.core.SearchExecutor;
-import org.springframework.ldap.support.DistinguishedName;
-import org.springframework.ldap.support.control.PagedResultsCookie;
-import org.springframework.ldap.support.control.PagedResultsRequestControl;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**