diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/transaction/ChangeSetBackedTransactionSynchronization.java b/spring-data-commons-core/src/main/java/org/springframework/data/persistence/ChangeSetBackedTransactionSynchronization.java
similarity index 97%
rename from spring-data-commons-core/src/main/java/org/springframework/data/transaction/ChangeSetBackedTransactionSynchronization.java
rename to spring-data-commons-core/src/main/java/org/springframework/data/persistence/ChangeSetBackedTransactionSynchronization.java
index d8239e213..8523efe22 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/transaction/ChangeSetBackedTransactionSynchronization.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/persistence/ChangeSetBackedTransactionSynchronization.java
@@ -1,4 +1,4 @@
-package org.springframework.data.transaction;
+package org.springframework.data.persistence;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/transaction/NaiveDoubleTransactionManager.java b/spring-data-commons-core/src/main/java/org/springframework/data/transaction/NaiveDoubleTransactionManager.java
deleted file mode 100644
index aed1f4bc0..000000000
--- a/spring-data-commons-core/src/main/java/org/springframework/data/transaction/NaiveDoubleTransactionManager.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.springframework.data.transaction;
-
-import java.util.IdentityHashMap;
-import java.util.Map;
-
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionException;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.DefaultTransactionStatus;
-
-public class NaiveDoubleTransactionManager implements PlatformTransactionManager {
-	Map<TransactionStatus, TransactionStatus> status = new IdentityHashMap<TransactionStatus, TransactionStatus>();
-	private final PlatformTransactionManager a;
-
-	private final PlatformTransactionManager b;
-
-	public NaiveDoubleTransactionManager(PlatformTransactionManager a, PlatformTransactionManager b) {
-		System.err.println("WARNING: Naive JTA/Neo4j Spring transaction manager--must implement properly");
-		this.a = a;
-		this.b = b;
-	}
-
-	public void commit(TransactionStatus ts) throws TransactionException {
-		try {
-			final TransactionStatus tsb = copyTransactionStatus(status.get(ts));
-			try {
-				a.commit(ts);
-			} catch (Throwable t) {
-				System.err.println("Continuing to commit tx despite this:" + t);
-			}
-			try {
-				b.commit(tsb);
-			} catch (Throwable t) {
-				System.err.println("Can't commit tx" + t);
-				throw new TransactionException(t.getMessage(), t) {
-				};
-			}
-		} finally {
-			status.remove(ts);
-		}
-	}
-
-	private TransactionStatus copyTransactionStatus(TransactionStatus ts) {
-		Object t = (ts instanceof DefaultTransactionStatus) ? ((DefaultTransactionStatus) ts).getTransaction() : null;
-		return new DefaultTransactionStatus(t, ts.isNewTransaction(), false, false, false, null);
-	}
-
-	public TransactionStatus getTransaction(TransactionDefinition td) throws TransactionException {
-		TransactionStatus atx = a.getTransaction(td);
-		TransactionStatus btx = b.getTransaction(td);
-		status.put(atx, btx);
-		return atx;
-	}
-
-	public void rollback(TransactionStatus ts) throws TransactionException {
-		final TransactionStatus tsb = copyTransactionStatus(status.remove(ts));
-		try {
-			a.rollback(ts);
-		} catch (Throwable t) {
-			System.err.println("Continuing to rollback tx despite this:" + t);
-		}
-		try {
-			b.rollback(tsb);
-		} catch (Throwable t) {
-			System.err.println("Can't rollback tx" + t);
-			throw new TransactionException(t.getMessage(), t) {
-			};
-		}
-	}
-
-}