diff --git a/sandbox/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml b/sandbox/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
index 97224bc0..df48a532 100644
--- a/sandbox/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
+++ b/sandbox/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
@@ -9,11 +9,11 @@
 		<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="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/sandbox/src/itest/java/conf/ldapTemplateAcegiTestContext.xml b/sandbox/src/itest/java/conf/ldapTemplateAcegiTestContext.xml
index 0d49b793..c8e57f25 100644
--- a/sandbox/src/itest/java/conf/ldapTemplateAcegiTestContext.xml
+++ b/sandbox/src/itest/java/conf/ldapTemplateAcegiTestContext.xml
@@ -12,15 +12,15 @@
 	</bean>
 
 	<bean id="contextSource"
-		class="org.springframework.ldap.support.LdapContextSource">
+		class="org.springframework.ldap.core.support.LdapContextSource">
 		<property name="urls" value="${urls}" />
 
 		<property name="authenticationSource">
 			<bean
-				class="org.springframework.ldap.support.authentication.AcegiAuthenticationSource" />
+				class="org.springframework.ldap.authentication.AcegiAuthenticationSource" />
 		</property>
 		<property name="dirObjectFactory"
-			value="org.springframework.ldap.support.DefaultDirObjectFactory" />
+			value="org.springframework.ldap.core.DefaultDirObjectFactory" />
 	</bean>
 
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
diff --git a/sandbox/src/itest/java/conf/ldapTemplateBaseSuffixTestContext.xml b/sandbox/src/itest/java/conf/ldapTemplateBaseSuffixTestContext.xml
index 1028244e..ba716cb8 100644
--- a/sandbox/src/itest/java/conf/ldapTemplateBaseSuffixTestContext.xml
+++ b/sandbox/src/itest/java/conf/ldapTemplateBaseSuffixTestContext.xml
@@ -10,11 +10,11 @@
 		<property name="location" value="classpath:/conf/ldap.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="dirObjectFactory" value="org.springframework.ldap.support.DefaultDirObjectFactory" />
+		<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
 		<property name="base" value="${base}" />
 	</bean>
 	
diff --git a/sandbox/src/itest/java/conf/ldapTemplateTestContext.xml b/sandbox/src/itest/java/conf/ldapTemplateTestContext.xml
index 313c86f3..8bb7cc87 100644
--- a/sandbox/src/itest/java/conf/ldapTemplateTestContext.xml
+++ b/sandbox/src/itest/java/conf/ldapTemplateTestContext.xml
@@ -10,11 +10,11 @@
 		<property name="location" value="classpath:/conf/ldap.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="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/sandbox/src/itest/java/conf/ldapTemplateTransactionTestContext.xml b/sandbox/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
index 75d8560c..59f9410b 100644
--- a/sandbox/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
+++ b/sandbox/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
@@ -12,14 +12,14 @@
 	</bean>
 
 	<bean id="contextSourceTarget"
-		class="org.springframework.ldap.support.LdapContextSource">
+		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="pooled" value="false" />
 		<property name="dirObjectFactory"
-			value="org.springframework.ldap.support.DefaultDirObjectFactory" />
+			value="org.springframework.ldap.core.DefaultDirObjectFactory" />
 	</bean>
 
 	<bean id="contextSource"
diff --git a/sandbox/src/itest/java/org/springframework/ldap/LdapServerManager.java b/sandbox/src/itest/java/org/springframework/ldap/LdapServerManager.java
index c6dda912..7513e319 100644
--- a/sandbox/src/itest/java/org/springframework/ldap/LdapServerManager.java
+++ b/sandbox/src/itest/java/org/springframework/ldap/LdapServerManager.java
@@ -34,8 +34,8 @@ import org.apache.directory.server.jndi.ServerContextFactory;
 import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
 import org.springframework.beans.factory.DisposableBean;
 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;
 
 /**
  * Utility class to initialize the apache directory server for use in the
diff --git a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDaoImpl.java b/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDaoImpl.java
index 666e2830..ae340035 100644
--- a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDaoImpl.java
+++ b/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDaoImpl.java
@@ -1,8 +1,8 @@
 package org.springframework.ldap.support.transaction;
 
+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;
 
 public class DummyDaoImpl {
     private LdapTemplate ldapTemplate;
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/TlsContextSource.java b/sandbox/src/main/java/org/springframework/ldap/support/TlsContextSource.java
index e933bf9a..a16e196a 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/TlsContextSource.java
+++ b/sandbox/src/main/java/org/springframework/ldap/support/TlsContextSource.java
@@ -12,7 +12,7 @@ import javax.naming.ldap.StartTlsResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.ldap.support.LdapContextSource;
+import org.springframework.ldap.core.support.LdapContextSource;
 
 /**
  * ContextSource implementation which overrides setupAuthenticatedEnvironment to
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewRequestControl.java b/sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewRequestControl.java
index 91e3ccc4..d6293678 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewRequestControl.java
+++ b/sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewRequestControl.java
@@ -143,7 +143,7 @@ public class VirtualListViewRequestControl implements DirContextProcessor {
     }
 
     /*
-     * @see org.springframework.ldap.support.control.AbstractRequestControlDirContextProcessor#createRequestControl()
+     * @see org.springframework.ldap.control.AbstractRequestControlDirContextProcessor#createRequestControl()
      */
     public Control createRequestControl() {
         try {
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/BindRollbackOperation.java b/sandbox/src/main/java/org/springframework/ldap/support/transaction/BindRollbackOperation.java
index 0df8383e..3f38f93b 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/BindRollbackOperation.java
+++ b/sandbox/src/main/java/org/springframework/ldap/support/transaction/BindRollbackOperation.java
@@ -19,8 +19,8 @@ import javax.naming.Name;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.DirContextOperations;
 
 /**
  * A {@link CompensatingTransactionRollbackOperation} to rollback an unbind
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/LdapUtils.java b/sandbox/src/main/java/org/springframework/ldap/support/transaction/LdapUtils.java
index f50663ea..f92baea7 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/LdapUtils.java
+++ b/sandbox/src/main/java/org/springframework/ldap/support/transaction/LdapUtils.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.support.DistinguishedName;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindRecordingOperation.java b/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindRecordingOperation.java
index 1e806861..cb308638 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindRecordingOperation.java
+++ b/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindRecordingOperation.java
@@ -19,8 +19,8 @@ import javax.naming.Name;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.DirContextAdapter;
 
 /**
  * A {@link CompensatingTransactionRecordingOperation} keeping track of a rebind
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindRollbackOperation.java b/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindRollbackOperation.java
index 075a7a3f..83c61d4d 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindRollbackOperation.java
+++ b/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindRollbackOperation.java
@@ -19,8 +19,8 @@ import javax.naming.Name;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.DirContextOperations;
 
 /**
  * A {@link CompensatingTransactionRollbackOperation} to rollback a rebind
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindRecordingOperation.java b/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindRecordingOperation.java
index 82242a05..e438b8f7 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindRecordingOperation.java
+++ b/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindRecordingOperation.java
@@ -17,8 +17,8 @@ package org.springframework.ldap.support.transaction;
 
 import javax.naming.Name;
 
+import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.DirContextAdapter;
 
 /**
  * {@link CompensatingTransactionRecordingOperation} to keep track of unbind
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/BindRecordingOperationTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/BindRecordingOperationTest.java
index 0a33a1cc..a796b1ba 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/BindRecordingOperationTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/support/transaction/BindRecordingOperationTest.java
@@ -3,8 +3,8 @@ package org.springframework.ldap.support.transaction;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.DistinguishedName;
 
 public class BindRecordingOperationTest extends TestCase {
     private MockControl ldapOperationsControl;
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/BindRollbackOperationTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/BindRollbackOperationTest.java
index 489c909c..aaefe3f9 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/BindRollbackOperationTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/support/transaction/BindRollbackOperationTest.java
@@ -3,9 +3,9 @@ package org.springframework.ldap.support.transaction;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
+import org.springframework.ldap.core.DirContextOperations;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.DirContextOperations;
-import org.springframework.ldap.support.DistinguishedName;
 
 public class BindRollbackOperationTest extends TestCase {
     private MockControl ldapOperationsControl;
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesRecordingOperationTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesRecordingOperationTest.java
index 5207a43b..f28d8668 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesRecordingOperationTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesRecordingOperationTest.java
@@ -12,8 +12,8 @@ import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.ldap.core.AttributesMapper;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.DistinguishedName;
 
 public class ModifyAttributesRecordingOperationTest extends TestCase {
     private MockControl ldapOperationsControl;
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesRollbackOperationTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesRollbackOperationTest.java
index 5e229541..0c22eb82 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesRollbackOperationTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesRollbackOperationTest.java
@@ -4,8 +4,8 @@ import javax.naming.Name;
 import javax.naming.directory.ModificationItem;
 
 import org.easymock.MockControl;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.DistinguishedName;
 
 import junit.framework.TestCase;
 
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindRecordingOperationTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindRecordingOperationTest.java
index 3afb0b1d..8f5abf47 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindRecordingOperationTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindRecordingOperationTest.java
@@ -3,9 +3,9 @@ package org.springframework.ldap.support.transaction;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
+import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.DirContextAdapter;
-import org.springframework.ldap.support.DistinguishedName;
 
 public class RebindRecordingOperationTest extends TestCase {
     private MockControl ldapOperationsControl;
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindRollbackOperationTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindRollbackOperationTest.java
index c6d91117..199268d3 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindRollbackOperationTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindRollbackOperationTest.java
@@ -3,9 +3,9 @@ package org.springframework.ldap.support.transaction;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
+import org.springframework.ldap.core.DirContextOperations;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.DirContextOperations;
-import org.springframework.ldap.support.DistinguishedName;
 
 public class RebindRollbackOperationTest extends TestCase {
 
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RenameRollbackOperationTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/RenameRollbackOperationTest.java
index 6a0f0188..afac7451 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RenameRollbackOperationTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/support/transaction/RenameRollbackOperationTest.java
@@ -1,8 +1,8 @@
 package org.springframework.ldap.support.transaction;
 
 import org.easymock.MockControl;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.DistinguishedName;
 
 import junit.framework.TestCase;
 
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindRecordingOperationTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindRecordingOperationTest.java
index d1c98306..7388bab9 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindRecordingOperationTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindRecordingOperationTest.java
@@ -1,9 +1,9 @@
 package org.springframework.ldap.support.transaction;
 
 import org.easymock.MockControl;
+import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.DirContextAdapter;
-import org.springframework.ldap.support.DistinguishedName;
 
 import junit.framework.TestCase;
 
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindRollbackOperationTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindRollbackOperationTest.java
index bf9a5013..fee98bf7 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindRollbackOperationTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindRollbackOperationTest.java
@@ -3,8 +3,8 @@ package org.springframework.ldap.support.transaction;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.DistinguishedName;
 
 public class UnbindRollbackOperationTest extends TestCase {
     private MockControl ldapOperationsControl;