diff --git a/sandbox/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java b/sandbox/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java
index c4af7888..13f742d2 100644
--- a/sandbox/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java
+++ b/sandbox/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java
@@ -30,7 +30,6 @@ 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.control.SortControlDirContextProcessor;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**
diff --git a/sandbox/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateVirtualListViewSearchITest.java b/sandbox/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateVirtualListViewSearchITest.java
index b27cc5a4..4f4d33aa 100644
--- a/sandbox/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateVirtualListViewSearchITest.java
+++ b/sandbox/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateVirtualListViewSearchITest.java
@@ -25,8 +25,6 @@ import org.springframework.ldap.Person;
 import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.CollectingNameClassPairCallbackHandler;
 import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.ldap.support.control.VirtualListViewRequestControl;
-import org.springframework.ldap.support.control.VirtualListViewResultsCookie;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/control/SortControlDirContextProcessor.java b/sandbox/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java
similarity index 96%
rename from sandbox/src/main/java/org/springframework/ldap/support/control/SortControlDirContextProcessor.java
rename to sandbox/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java
index 82163664..55eb2d70 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/control/SortControlDirContextProcessor.java
+++ b/sandbox/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.control;
+package org.springframework.ldap.control;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewRequestControl.java b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewRequestControl.java
similarity index 96%
rename from sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewRequestControl.java
rename to sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewRequestControl.java
index a2c593fa..b20c403b 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewRequestControl.java
+++ b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewRequestControl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.control;
+package org.springframework.ldap.control;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewResultsCookie.java b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
similarity index 92%
rename from sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewResultsCookie.java
rename to sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
index d457721a..2b130c01 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewResultsCookie.java
+++ b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.support.control;
+package org.springframework.ldap.control;
 
 import com.sun.jndi.ldap.ctl.VirtualListViewControl;
 
diff --git a/sandbox/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java b/sandbox/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java
index 68e8c6f9..99ba9eba 100644
--- a/sandbox/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java
@@ -24,7 +24,6 @@ import javax.naming.ldap.PagedResultsControl;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.ldap.support.control.SortControlDirContextProcessor;
 
 import com.sun.jndi.ldap.Ber;
 import com.sun.jndi.ldap.BerDecoder;