diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/LdapServerManager.java b/spring-ldap-person/src/main/java/org/springframework/ldap/LdapServerManager.java
index ff3f5d95..d398bfa7 100644
--- a/spring-ldap-person/src/main/java/org/springframework/ldap/LdapServerManager.java
+++ b/spring-ldap-person/src/main/java/org/springframework/ldap/LdapServerManager.java
@@ -30,8 +30,8 @@ import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 
 import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.support.DefaultDirObjectFactory;
-import org.springframework.ldap.support.DistinguishedName;
+import org.springframework.ldap.core.DefaultDirObjectFactory;
+import org.springframework.ldap.core.DistinguishedName;
 
 import org.apache.directory.server.core.configuration.ShutdownConfiguration;
 import org.apache.directory.server.jndi.ServerContextFactory;
diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/GroupContextMapper.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/GroupContextMapper.java
index 0d376444..796856e9 100644
--- a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/GroupContextMapper.java
+++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/GroupContextMapper.java
@@ -20,8 +20,8 @@ import java.util.List;
 import java.util.TreeSet;
 
 import org.springframework.ldap.core.ContextMapper;
+import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.samples.person.domain.Group;
-import org.springframework.ldap.support.DirContextOperations;
 
 /**
  * Maps from DirContextOperations (DirContextAdapters, really) to Group objects.
diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/GroupDaoImpl.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/GroupDaoImpl.java
index 54ffe09a..52b4c521 100644
--- a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/GroupDaoImpl.java
+++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/GroupDaoImpl.java
@@ -18,15 +18,15 @@ package org.springframework.ldap.samples.person.dao;
 import java.util.List;
 
 import org.springframework.ldap.core.ContextMapper;
+import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.ldap.core.DirContextOperations;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.filter.AndFilter;
+import org.springframework.ldap.filter.EqualsFilter;
+import org.springframework.ldap.filter.WhitespaceWildcardsFilter;
 import org.springframework.ldap.samples.person.domain.Group;
 import org.springframework.ldap.samples.person.domain.SearchCriteria;
-import org.springframework.ldap.support.DirContextAdapter;
-import org.springframework.ldap.support.DirContextOperations;
-import org.springframework.ldap.support.DistinguishedName;
-import org.springframework.ldap.support.filter.AndFilter;
-import org.springframework.ldap.support.filter.EqualsFilter;
-import org.springframework.ldap.support.filter.WhitespaceWildcardsFilter;
 
 /**
  * Default implementation of GroupDao. This implementation uses
diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonContextMapper.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonContextMapper.java
index cd50877a..132254aa 100644
--- a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonContextMapper.java
+++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonContextMapper.java
@@ -18,10 +18,10 @@ package org.springframework.ldap.samples.person.dao;
 import javax.naming.NamingException;
 
 import org.springframework.ldap.core.ContextMapper;
+import org.springframework.ldap.core.DirContextOperations;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.samples.person.domain.Person;
 import org.springframework.ldap.support.DefaultNamingExceptionTranslator;
-import org.springframework.ldap.support.DirContextOperations;
-import org.springframework.ldap.support.DistinguishedName;
 import org.springframework.ldap.support.NamingExceptionTranslator;
 import org.springframework.util.Assert;
 
diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonDaoImpl.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonDaoImpl.java
index 00fb803c..2c6f1bcc 100644
--- a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonDaoImpl.java
+++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonDaoImpl.java
@@ -18,15 +18,15 @@ package org.springframework.ldap.samples.person.dao;
 import java.util.List;
 
 import org.springframework.ldap.core.ContextMapper;
+import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.ldap.core.DirContextOperations;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.filter.AndFilter;
+import org.springframework.ldap.filter.EqualsFilter;
+import org.springframework.ldap.filter.WhitespaceWildcardsFilter;
 import org.springframework.ldap.samples.person.domain.Person;
 import org.springframework.ldap.samples.person.domain.SearchCriteria;
-import org.springframework.ldap.support.DirContextAdapter;
-import org.springframework.ldap.support.DirContextOperations;
-import org.springframework.ldap.support.DistinguishedName;
-import org.springframework.ldap.support.filter.AndFilter;
-import org.springframework.ldap.support.filter.EqualsFilter;
-import org.springframework.ldap.support.filter.WhitespaceWildcardsFilter;
 
 /**
  * Default implementation of PersonDao. This implementation uses
diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/TraditionalPersonDaoImpl.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/TraditionalPersonDaoImpl.java
index f26fc5a0..782c85da 100644
--- a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/TraditionalPersonDaoImpl.java
+++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/TraditionalPersonDaoImpl.java
@@ -30,8 +30,8 @@ import javax.naming.directory.InitialDirContext;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
-import org.springframework.ldap.support.DirContextAdapter;
-import org.springframework.ldap.support.DirContextOperations;
+import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.ldap.core.DirContextOperations;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.ldap.samples.person.domain.Person;
diff --git a/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext.xml b/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext.xml
index 8b3b181d..e3ab2fed 100644
--- a/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/spring-ldap-person/src/main/webapp/WEB-INF/applicationContext.xml
@@ -12,21 +12,21 @@
 
 	<!-- Authenticate using a fixed user -->
 	<!--
-	<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="base" value="${base}" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
-		<property name="dirObjectFactory" value="org.springframework.ldap.support.DefaultDirObjectFactory" />
+		<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
 	</bean>
 	 -->	
 
 	<!-- Authenticate using the currently logged in user, retrieved by Acegi Security -->
-	<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="base" value="${base}" />
 		<property name="authenticationSource" ref="acegiAuthenticationSource" />
-		<property name="dirObjectFactory" value="org.springframework.ldap.support.DefaultDirObjectFactory" />
+		<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
 		<!--
 		Disable pooling if you want to test changing the password after a user has logged in,
 		perhaps in order to verify that AcegiAuthenticationSource works correctly.
@@ -35,7 +35,7 @@
 		-->
 	</bean>
 	
-	<bean id="acegiAuthenticationSource" class="org.springframework.ldap.support.authentication.AcegiAuthenticationSource" />
+	<bean id="acegiAuthenticationSource" class="org.springframework.ldap.authentication.AcegiAuthenticationSource" />
 	
 	<bean id="ldapOperations" class="org.springframework.ldap.core.LdapTemplate">
 		<constructor-arg ref="contextSource" />
diff --git a/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/GroupDaoImplTest.java b/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/GroupDaoImplTest.java
index 756cfbaf..be84e72a 100644
--- a/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/GroupDaoImplTest.java
+++ b/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/GroupDaoImplTest.java
@@ -24,11 +24,11 @@ import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.ldap.core.ContextMapper;
+import org.springframework.ldap.core.DirContextOperations;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
 import org.springframework.ldap.samples.person.domain.Group;
 import org.springframework.ldap.samples.person.domain.SearchCriteria;
-import org.springframework.ldap.support.DirContextOperations;
-import org.springframework.ldap.support.DistinguishedName;
 
 /**
  * Unit tests for the GroupDaoImpl class.
diff --git a/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/PersonDaoImplTest.java b/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/PersonDaoImplTest.java
index 26bb37e4..e7a4ee76 100644
--- a/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/PersonDaoImplTest.java
+++ b/spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/PersonDaoImplTest.java
@@ -24,11 +24,11 @@ import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.ldap.core.ContextMapper;
+import org.springframework.ldap.core.DirContextOperations;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
 import org.springframework.ldap.samples.person.domain.Person;
 import org.springframework.ldap.samples.person.domain.SearchCriteria;
-import org.springframework.ldap.support.DirContextOperations;
-import org.springframework.ldap.support.DistinguishedName;
 
 /**
  * Unit tests for the PersonDaoImpl class.