diff --git a/mvn-build/sandbox/pom.xml b/mvn-build/sandbox/pom.xml
index 0ce6ecc9..490e52e9 100644
--- a/mvn-build/sandbox/pom.xml
+++ b/mvn-build/sandbox/pom.xml
@@ -26,6 +26,13 @@
 	</build>
 
 	<dependencies>
+        <!-- External Dependencies -->
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>ldapbp</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
 		<!-- Spring LDAP Dependencies -->
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/control/VirtualListViewControlAggregateDirContextProcessor.java b/mvn-build/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlAggregateDirContextProcessor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/control/VirtualListViewControlAggregateDirContextProcessor.java
rename to mvn-build/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlAggregateDirContextProcessor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java b/mvn-build/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java
rename to mvn-build/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java
diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java b/mvn-build/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
similarity index 100%
rename from mvn-build/core/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
rename to mvn-build/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewResultsCookie.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/control/ControlArrayMatcher.java b/mvn-build/sandbox/src/test/java/org/springframework/ldap/control/ControlArrayMatcher.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/control/ControlArrayMatcher.java
rename to mvn-build/sandbox/src/test/java/org/springframework/ldap/control/ControlArrayMatcher.java
diff --git a/mvn-build/core/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTest.java b/mvn-build/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTest.java
similarity index 100%
rename from mvn-build/core/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTest.java
rename to mvn-build/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTest.java