diff --git a/sandbox/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java b/spring-ldap/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java
similarity index 100%
rename from sandbox/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java
rename to spring-ldap/src/itest-openldap/java/org/springframework/ldap/control/LdapTemplateSortedSearchITest.java
diff --git a/sandbox/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java b/spring-ldap/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java
similarity index 100%
rename from sandbox/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java
rename to spring-ldap/src/main/java/org/springframework/ldap/control/SortControlDirContextProcessor.java
diff --git a/sandbox/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java b/spring-ldap/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java
similarity index 100%
rename from sandbox/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java
rename to spring-ldap/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTest.java