diff --git a/sandbox/src/itest/java/conf/ldapTemplateTransactionTestContext.xml b/sandbox/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
index 2ea9108f..4ace8ad8 100644
--- a/sandbox/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
+++ b/sandbox/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
@@ -32,7 +32,7 @@
 	-->
 
 	<bean id="contextSource"
-		class="org.springframework.ldap.support.transaction.TransactionAwareContextSourceProxy">
+		class="org.springframework.ldap.transaction.core.TransactionAwareContextSourceProxy">
 		<constructor-arg ref="contextSourceTarget" />
 	</bean>
 
@@ -48,7 +48,7 @@
 		</bean>
 	-->
 	<bean id="ldapTransactionManager"
-		class="org.springframework.ldap.support.transaction.ContextSourceTransactionManager">
+		class="org.springframework.ldap.transaction.core.ContextSourceTransactionManager">
 		<property name="contextSource" ref="contextSourceTarget" />
 	</bean>
 	<!-- 
@@ -59,7 +59,7 @@
 	-->
 
 	<bean name="dummyDaoTarget"
-		class="org.springframework.ldap.support.transaction.DummyDaoImpl">
+		class="org.springframework.ldap.transaction.core.DummyDaoImpl">
 		<property name="ldapTemplate" ref="ldapTemplate" />
 		<!-- 
 			<property name="jdbcTemplate" ref="jdbcTemplate" />
diff --git a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerIntegrationTest.java b/sandbox/src/itest/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerIntegrationTest.java
similarity index 96%
rename from sandbox/src/itest/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerIntegrationTest.java
rename to sandbox/src/itest/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerIntegrationTest.java
index f731c85e..d03d2a15 100644
--- a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerIntegrationTest.java
+++ b/sandbox/src/itest/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
diff --git a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDao.java b/sandbox/src/itest/java/org/springframework/ldap/transaction/core/DummyDao.java
similarity index 91%
rename from sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDao.java
rename to sandbox/src/itest/java/org/springframework/ldap/transaction/core/DummyDao.java
index 2fc44c4a..33865442 100644
--- a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDao.java
+++ b/sandbox/src/itest/java/org/springframework/ldap/transaction/core/DummyDao.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 public interface DummyDao {
     void createWithException(String country, String company, String fullname,
diff --git a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDaoImpl.java b/sandbox/src/itest/java/org/springframework/ldap/transaction/core/DummyDaoImpl.java
similarity index 96%
rename from sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDaoImpl.java
rename to sandbox/src/itest/java/org/springframework/ldap/transaction/core/DummyDaoImpl.java
index 827f419c..f4e9b1fe 100644
--- a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDaoImpl.java
+++ b/sandbox/src/itest/java/org/springframework/ldap/transaction/core/DummyDaoImpl.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.ldap.core.DirContextAdapter;
diff --git a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyException.java b/sandbox/src/itest/java/org/springframework/ldap/transaction/core/DummyException.java
similarity index 68%
rename from sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyException.java
rename to sandbox/src/itest/java/org/springframework/ldap/transaction/core/DummyException.java
index 5a1f7ead..525688f7 100644
--- a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyException.java
+++ b/sandbox/src/itest/java/org/springframework/ldap/transaction/core/DummyException.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 public class DummyException extends RuntimeException {
     public DummyException(String message) {
diff --git a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyServiceImpl.java b/sandbox/src/itest/java/org/springframework/ldap/transaction/core/DummyServiceImpl.java
similarity index 73%
rename from sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyServiceImpl.java
rename to sandbox/src/itest/java/org/springframework/ldap/transaction/core/DummyServiceImpl.java
index eb648292..b791db69 100644
--- a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyServiceImpl.java
+++ b/sandbox/src/itest/java/org/springframework/ldap/transaction/core/DummyServiceImpl.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 public class DummyServiceImpl {
     private DummyDao dummyDaoImpl;
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/todo.txt b/sandbox/src/main/java/org/springframework/ldap/support/transaction/todo.txt
deleted file mode 100644
index ef26ab9b..00000000
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/todo.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-RollbackOperations are stored before the actual operation has succeeded - Fixed.
-------------------------------------------------------------------------
-The recording of operations take place before the actual operation is carried out.
-While this is needed (as we need the state as it was before the operation), this may cause
-problems if the operation in question fails, causing a rollback to be performed.
-The LdapCompensatingTransactionDataManager will then have a RollbackOperation to rollback
-the failing operation. Example:
-A rebind operation is recorded and the actual operation fails because the fromDn does not exist.
-If toDn is already bound, the rollback will rename toDn to fromDn, messing things up.
-
-We need to make sure that the RollbackOperation is not registered until the actual operation has
-succeeded.
-
-Invisible Attributes and rollback
----------------------------------
-When recording an unbind operation the attributes of the unbound DN is retrieved. It is however
-possible that some Attributes are not returned by that lookup, e.g. if they are operational
-attributes (in which case they will need to be asked for explicitly.
-This means that we might end up with inconsistent data after the rollback
-(i.e. the Attributes after the rollback won't contain the invisible Attributes).
\ No newline at end of file
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/CompensatingTransactionOperationExecutor.java b/sandbox/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationExecutor.java
similarity index 95%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/CompensatingTransactionOperationExecutor.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationExecutor.java
index f5e45bcf..7d809398 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/CompensatingTransactionOperationExecutor.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationExecutor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction;
 
 /**
  * Responsible for executing a single recorded operation as well as committing
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/CompensatingTransactionOperationFactory.java b/sandbox/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationFactory.java
similarity index 73%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/CompensatingTransactionOperationFactory.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationFactory.java
index c413afa9..5f558cbb 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/CompensatingTransactionOperationFactory.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationFactory.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction;
 
 public interface CompensatingTransactionOperationFactory {
     public CompensatingTransactionOperationRecorder createRecordingOperation(
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/CompensatingTransactionOperationManager.java b/sandbox/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationManager.java
similarity index 94%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/CompensatingTransactionOperationManager.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationManager.java
index dbe5cf7c..197902e3 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/CompensatingTransactionOperationManager.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction;
 
 /**
  * A CompensatingTransactionOperationManager implementation records and performs
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/CompensatingTransactionOperationRecorder.java b/sandbox/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationRecorder.java
similarity index 92%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/CompensatingTransactionOperationRecorder.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationRecorder.java
index e83c0b02..151605b9 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/CompensatingTransactionOperationRecorder.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/CompensatingTransactionOperationRecorder.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction;
 
 /**
  * An implementation of this interface is responsible for recording data and
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/DefaultCompensatingTransactionOperationManager.java b/sandbox/src/main/java/org/springframework/ldap/transaction/DefaultCompensatingTransactionOperationManager.java
similarity index 95%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/DefaultCompensatingTransactionOperationManager.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/DefaultCompensatingTransactionOperationManager.java
index b27f3bb2..74344d44 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/DefaultCompensatingTransactionOperationManager.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/DefaultCompensatingTransactionOperationManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction;
 
 import java.util.Stack;
 
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/BindOperationExecutor.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/BindOperationExecutor.java
similarity index 93%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/BindOperationExecutor.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/BindOperationExecutor.java
index e6d5acf8..43b326fe 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/BindOperationExecutor.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/BindOperationExecutor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.Name;
 import javax.naming.directory.Attributes;
@@ -21,6 +21,7 @@ import javax.naming.directory.Attributes;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
 
 /**
  * A {@link CompensatingTransactionOperationExecutor} to manage a bind
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/BindOperationRecorder.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/BindOperationRecorder.java
similarity index 89%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/BindOperationRecorder.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/BindOperationRecorder.java
index e2990882..f7e52b3e 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/BindOperationRecorder.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/BindOperationRecorder.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.Name;
 import javax.naming.directory.Attributes;
 
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
 
 /**
  * A {@link CompensatingTransactionOperationRecorder} to manage LDAP bind
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManager.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManager.java
similarity index 96%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManager.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManager.java
index e52bb9c5..47db7b80 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManager.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/ContextSourceTransactionObject.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionObject.java
similarity index 93%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/ContextSourceTransactionObject.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionObject.java
index d6e83f06..92f538b7 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/ContextSourceTransactionObject.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/ContextSourceTransactionObject.java
@@ -12,7 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */package org.springframework.ldap.support.transaction;
+ */package org.springframework.ldap.transaction.core;
 
 /**
  * Transaction object for ContextSourceTransactionManager. Keeps a reference to
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/DefaultTempEntryRenamingStrategy.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategy.java
similarity index 95%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/DefaultTempEntryRenamingStrategy.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategy.java
index e6aae2ae..5c31e0f8 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/DefaultTempEntryRenamingStrategy.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import java.util.List;
 
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/DifferentSubtreeTempEntryRenamingStrategy.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategy.java
similarity index 95%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/DifferentSubtreeTempEntryRenamingStrategy.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategy.java
index 27dcaa65..05a545c7 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/DifferentSubtreeTempEntryRenamingStrategy.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategy.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import java.util.List;
 
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/DirContextHolder.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/DirContextHolder.java
similarity index 90%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/DirContextHolder.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/DirContextHolder.java
index d4a1c7cd..ccf88221 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/DirContextHolder.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/DirContextHolder.java
@@ -13,10 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.directory.DirContext;
 
+import org.springframework.ldap.transaction.CompensatingTransactionOperationFactory;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationManager;
+import org.springframework.ldap.transaction.DefaultCompensatingTransactionOperationManager;
 import org.springframework.transaction.support.ResourceHolderSupport;
 
 /**
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/DirContextProxy.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/DirContextProxy.java
similarity index 92%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/DirContextProxy.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/DirContextProxy.java
index 9ab2b7ad..0ff0d744 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/DirContextProxy.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/DirContextProxy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.directory.DirContext;
 
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/LdapCompensatingTransactionOperationFactory.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactory.java
similarity index 93%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/LdapCompensatingTransactionOperationFactory.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactory.java
index fc659b2c..3ad98cf7 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/LdapCompensatingTransactionOperationFactory.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactory.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
@@ -14,6 +14,8 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.LdapOperations;
 import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationFactory;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
 
 public class LdapCompensatingTransactionOperationFactory implements
         CompensatingTransactionOperationFactory {
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/LdapUtils.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/LdapUtils.java
similarity index 95%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/LdapUtils.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/LdapUtils.java
index c61d00c4..8182b3c5 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/LdapUtils.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/LdapUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -27,6 +27,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.DistinguishedName;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationManager;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/ModifyAttributesOperationExecutor.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutor.java
similarity index 93%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/ModifyAttributesOperationExecutor.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutor.java
index 99a51ded..f8c4bcdb 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/ModifyAttributesOperationExecutor.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.Name;
 import javax.naming.directory.ModificationItem;
@@ -21,6 +21,7 @@ import javax.naming.directory.ModificationItem;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
 
 /**
  * A {@link CompensatingTransactionOperationExecutor} to manage a
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/ModifyAttributesOperationRecorder.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorder.java
similarity index 94%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/ModifyAttributesOperationRecorder.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorder.java
index 25fc58bf..24209663 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/ModifyAttributesOperationRecorder.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -28,6 +28,8 @@ import javax.naming.directory.ModificationItem;
 
 import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
 import org.springframework.util.Assert;
 
 /**
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/NullOperationExecutor.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/NullOperationExecutor.java
similarity index 88%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/NullOperationExecutor.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/NullOperationExecutor.java
index 74689c2d..dd04d62e 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/NullOperationExecutor.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/NullOperationExecutor.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
 
 /**
  * A {@link CompensatingTransactionOperationExecutor} that performs nothing.
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/NullOperationRecorder.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/NullOperationRecorder.java
similarity index 80%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/NullOperationRecorder.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/NullOperationRecorder.java
index e81628c0..7e2f82ff 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/NullOperationRecorder.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/NullOperationRecorder.java
@@ -13,7 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
+
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationManager;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
 
 /**
  * A {@link CompensatingTransactionOperationRecorder} performing nothing,
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationExecutor.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/RebindOperationExecutor.java
similarity index 94%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationExecutor.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/RebindOperationExecutor.java
index 83f9fb50..1f105a4d 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationExecutor.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/RebindOperationExecutor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.Name;
 import javax.naming.directory.Attributes;
@@ -21,6 +21,7 @@ import javax.naming.directory.Attributes;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
 
 /**
  * A {@link CompensatingTransactionOperationExecutor} to manage a rebind
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationRecorder.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/RebindOperationRecorder.java
similarity index 90%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationRecorder.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/RebindOperationRecorder.java
index 89d945b8..709974c6 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationRecorder.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/RebindOperationRecorder.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.Name;
 import javax.naming.directory.Attributes;
 
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
 
 /**
  * A {@link CompensatingTransactionOperationRecorder} keeping track of a rebind
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RenameOperationExecutor.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/RenameOperationExecutor.java
similarity index 92%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/RenameOperationExecutor.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/RenameOperationExecutor.java
index f0b88991..af14b3f7 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RenameOperationExecutor.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/RenameOperationExecutor.java
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.Name;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
 
 /**
  * A {@link CompensatingTransactionOperationExecutor} to manage a rename
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RenameOperationRecorder.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/RenameOperationRecorder.java
similarity index 88%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/RenameOperationRecorder.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/RenameOperationRecorder.java
index 09c8c2ea..fa8ccbf4 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RenameOperationRecorder.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/RenameOperationRecorder.java
@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.Name;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
 import org.springframework.util.Assert;
 
 /**
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/TempEntryRenamingStrategy.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/TempEntryRenamingStrategy.java
similarity index 92%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/TempEntryRenamingStrategy.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/TempEntryRenamingStrategy.java
index 4033fe6a..869378f8 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/TempEntryRenamingStrategy.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/TempEntryRenamingStrategy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.Name;
 
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/TransactionAwareContextSourceProxy.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxy.java
similarity index 95%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/TransactionAwareContextSourceProxy.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxy.java
index fef9d5ec..283810ff 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/TransactionAwareContextSourceProxy.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareContextSourceProxy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import java.lang.reflect.Proxy;
 
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/TransactionAwareDirContextInvocationHandler.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareDirContextInvocationHandler.java
similarity index 95%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/TransactionAwareDirContextInvocationHandler.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareDirContextInvocationHandler.java
index 41e894bc..bbad4ac8 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/TransactionAwareDirContextInvocationHandler.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/TransactionAwareDirContextInvocationHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationExecutor.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationExecutor.java
similarity index 93%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationExecutor.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationExecutor.java
index fc28e284..d47f1127 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationExecutor.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationExecutor.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 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.transaction.CompensatingTransactionOperationExecutor;
 
 /**
  * A {@link CompensatingTransactionOperationExecutor} to manage an unbind
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationRecorder.java b/sandbox/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationRecorder.java
similarity index 89%
rename from sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationRecorder.java
rename to sandbox/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationRecorder.java
index a0c322e9..084b20fa 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationRecorder.java
+++ b/sandbox/src/main/java/org/springframework/ldap/transaction/core/UnbindOperationRecorder.java
@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.Name;
 
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
 
 /**
  * {@link CompensatingTransactionOperationRecorder} to keep track of unbind
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/DefaultCompensatingTransactionOperationManagerTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/DefaultCompensatingTransactionOperationManagerTest.java
similarity index 87%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/DefaultCompensatingTransactionOperationManagerTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/DefaultCompensatingTransactionOperationManagerTest.java
index 0dce7bef..f22ca6f3 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/DefaultCompensatingTransactionOperationManagerTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/DefaultCompensatingTransactionOperationManagerTest.java
@@ -1,10 +1,14 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction;
 
 import java.util.Stack;
 
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationFactory;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
+import org.springframework.ldap.transaction.DefaultCompensatingTransactionOperationManager;
 
 public class DefaultCompensatingTransactionOperationManagerTest extends
         TestCase {
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/BindOperationExecutorTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/BindOperationExecutorTest.java
similarity index 92%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/BindOperationExecutorTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/BindOperationExecutorTest.java
index 7476c6a8..466ee492 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/BindOperationExecutorTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/BindOperationExecutorTest.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.directory.BasicAttributes;
 
@@ -7,6 +7,7 @@ import junit.framework.TestCase;
 import org.easymock.MockControl;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.core.BindOperationExecutor;
 
 public class BindOperationExecutorTest extends TestCase {
     private MockControl ldapOperationsControl;
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/BindOperationRecorderTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/BindOperationRecorderTest.java
similarity index 89%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/BindOperationRecorderTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/BindOperationRecorderTest.java
index b00c788e..8db3074e 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/BindOperationRecorderTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/BindOperationRecorderTest.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.directory.BasicAttributes;
 
@@ -7,6 +7,9 @@ import junit.framework.TestCase;
 import org.easymock.MockControl;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
+import org.springframework.ldap.transaction.core.BindOperationExecutor;
+import org.springframework.ldap.transaction.core.BindOperationRecorder;
 
 public class BindOperationRecorderTest extends TestCase {
     private MockControl ldapOperationsControl;
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerTest.java
similarity index 90%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerTest.java
index 7b3d44e4..8846f12f 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/ContextSourceTransactionManagerTest.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.directory.DirContext;
 
@@ -6,8 +6,12 @@ import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.support.transaction.ContextSourceTransactionManager;
-import org.springframework.ldap.support.transaction.DirContextHolder;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationManager;
+import org.springframework.ldap.transaction.core.ContextSourceTransactionManager;
+import org.springframework.ldap.transaction.core.ContextSourceTransactionObject;
+import org.springframework.ldap.transaction.core.DirContextHolder;
+import org.springframework.ldap.transaction.core.TempEntryRenamingStrategy;
+import org.springframework.ldap.transaction.core.TransactionAwareContextSourceProxy;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.support.DefaultTransactionStatus;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/DefaultTempEntryRenamingStrategyTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategyTest.java
similarity index 87%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/DefaultTempEntryRenamingStrategyTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategyTest.java
index e0fc35aa..934c6d6d 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/DefaultTempEntryRenamingStrategyTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/DefaultTempEntryRenamingStrategyTest.java
@@ -1,8 +1,9 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.Name;
 
 import org.springframework.ldap.core.DistinguishedName;
+import org.springframework.ldap.transaction.core.DefaultTempEntryRenamingStrategy;
 
 import junit.framework.TestCase;
 
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/DifferentSubtreeTempEntryRenamingStrategyTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategyTest.java
similarity index 82%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/DifferentSubtreeTempEntryRenamingStrategyTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategyTest.java
index 56d67167..8e946c1f 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/DifferentSubtreeTempEntryRenamingStrategyTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/DifferentSubtreeTempEntryRenamingStrategyTest.java
@@ -1,8 +1,9 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.Name;
 
 import org.springframework.ldap.core.DistinguishedName;
+import org.springframework.ldap.transaction.core.DifferentSubtreeTempEntryRenamingStrategy;
 
 import junit.framework.TestCase;
 
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/LdapCompensatingTransactionOperationFactoryTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactoryTest.java
similarity index 85%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/LdapCompensatingTransactionOperationFactoryTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactoryTest.java
index 0b3d7207..e90d0626 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/LdapCompensatingTransactionOperationFactoryTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/LdapCompensatingTransactionOperationFactoryTest.java
@@ -1,9 +1,17 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationRecorder;
+import org.springframework.ldap.transaction.core.BindOperationRecorder;
+import org.springframework.ldap.transaction.core.LdapCompensatingTransactionOperationFactory;
+import org.springframework.ldap.transaction.core.ModifyAttributesOperationRecorder;
+import org.springframework.ldap.transaction.core.RebindOperationRecorder;
+import org.springframework.ldap.transaction.core.RenameOperationRecorder;
+import org.springframework.ldap.transaction.core.TempEntryRenamingStrategy;
+import org.springframework.ldap.transaction.core.UnbindOperationRecorder;
 
 public class LdapCompensatingTransactionOperationFactoryTest extends TestCase {
     private MockControl ldapOperationsControl;
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesOperationExecutorTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutorTest.java
similarity index 92%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesOperationExecutorTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutorTest.java
index a7187ed3..f57c52a9 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesOperationExecutorTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationExecutorTest.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.Name;
 import javax.naming.directory.ModificationItem;
@@ -6,6 +6,7 @@ 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.transaction.core.ModifyAttributesOperationExecutor;
 
 import junit.framework.TestCase;
 
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesOperationRecorderTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorderTest.java
similarity index 94%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesOperationRecorderTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorderTest.java
index 41904094..f9f4b1af 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesOperationRecorderTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/ModifyAttributesOperationRecorderTest.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
@@ -14,6 +14,9 @@ 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.transaction.CompensatingTransactionOperationExecutor;
+import org.springframework.ldap.transaction.core.ModifyAttributesOperationExecutor;
+import org.springframework.ldap.transaction.core.ModifyAttributesOperationRecorder;
 
 public class ModifyAttributesOperationRecorderTest extends TestCase {
     private MockControl ldapOperationsControl;
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationExecutorTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/RebindOperationExecutorTest.java
similarity index 93%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationExecutorTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/RebindOperationExecutorTest.java
index acec6219..759aa280 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationExecutorTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/RebindOperationExecutorTest.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.directory.BasicAttributes;
 
@@ -7,6 +7,7 @@ import junit.framework.TestCase;
 import org.easymock.MockControl;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.core.RebindOperationExecutor;
 
 public class RebindOperationExecutorTest extends TestCase {
 
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationRecorderTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/RebindOperationRecorderTest.java
similarity index 86%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationRecorderTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/RebindOperationRecorderTest.java
index 5b2e88d8..774647e3 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationRecorderTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/RebindOperationRecorderTest.java
@@ -1,4 +1,4 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import javax.naming.directory.BasicAttributes;
 
@@ -7,6 +7,10 @@ import junit.framework.TestCase;
 import org.easymock.MockControl;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
+import org.springframework.ldap.transaction.core.RebindOperationExecutor;
+import org.springframework.ldap.transaction.core.RebindOperationRecorder;
+import org.springframework.ldap.transaction.core.TempEntryRenamingStrategy;
 
 public class RebindOperationRecorderTest extends TestCase {
     private MockControl ldapOperationsControl;
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RenameOperationExecutorTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/RenameOperationExecutorTest.java
similarity index 92%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/RenameOperationExecutorTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/RenameOperationExecutorTest.java
index 11965691..e1296fe4 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RenameOperationExecutorTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/RenameOperationExecutorTest.java
@@ -1,8 +1,9 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import org.easymock.MockControl;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.core.RenameOperationExecutor;
 
 import junit.framework.TestCase;
 
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RenameOperationRecorderTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/RenameOperationRecorderTest.java
similarity index 81%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/RenameOperationRecorderTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/RenameOperationRecorderTest.java
index 0c3d649b..ffc5eb8e 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RenameOperationRecorderTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/RenameOperationRecorderTest.java
@@ -1,9 +1,12 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
+import org.springframework.ldap.transaction.core.RenameOperationExecutor;
+import org.springframework.ldap.transaction.core.RenameOperationRecorder;
 
 public class RenameOperationRecorderTest extends TestCase {
 
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationExecutorTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationExecutorTest.java
similarity index 92%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationExecutorTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationExecutorTest.java
index 8f501168..4db0726a 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationExecutorTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationExecutorTest.java
@@ -1,10 +1,11 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.core.UnbindOperationExecutor;
 
 public class UnbindOperationExecutorTest extends TestCase {
     private MockControl ldapOperationsControl;
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationRecorderTest.java b/sandbox/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationRecorderTest.java
similarity index 84%
rename from sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationRecorderTest.java
rename to sandbox/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationRecorderTest.java
index 6d96e8ee..3f357612 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationRecorderTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/transaction/core/UnbindOperationRecorderTest.java
@@ -1,10 +1,14 @@
-package org.springframework.ldap.support.transaction;
+package org.springframework.ldap.transaction.core;
 
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.transaction.CompensatingTransactionOperationExecutor;
+import org.springframework.ldap.transaction.core.TempEntryRenamingStrategy;
+import org.springframework.ldap.transaction.core.UnbindOperationExecutor;
+import org.springframework.ldap.transaction.core.UnbindOperationRecorder;
 
 public class UnbindOperationRecorderTest extends TestCase {
     private MockControl ldapOperationsControl;