diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/kernel/RestConfig.java b/spring-data-neo4j-rest/src/main/java/org/neo4j/kernel/RestConfig.java
index 9ace494ba..a81f2de7f 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/kernel/RestConfig.java
+++ b/spring-data-neo4j-rest/src/main/java/org/neo4j/kernel/RestConfig.java
@@ -24,7 +24,7 @@ import org.neo4j.kernel.impl.transaction.LockManager;
 import org.neo4j.kernel.impl.transaction.TxModule;
 import org.neo4j.kernel.impl.transaction.xaframework.LogBufferFactory;
 import org.neo4j.kernel.impl.transaction.xaframework.TxIdGenerator;
-import org.neo4j.rest.graphdb.RestGraphDatabase;
+import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase;
 
 import javax.transaction.*;
 import javax.transaction.xa.XAResource;
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/JsonHelper.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/JsonHelper.java
similarity index 97%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/JsonHelper.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/JsonHelper.java
index 02c75ce73..166b351aa 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/JsonHelper.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/JsonHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 /**
  * @author mh
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/PropertiesMap.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/PropertiesMap.java
similarity index 98%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/PropertiesMap.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/PropertiesMap.java
index 375aa2b60..6b1e00314 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/PropertiesMap.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/PropertiesMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 /**
  * @author mh
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestEntity.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestEntity.java
similarity index 97%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestEntity.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestEntity.java
index 0e4be593b..dcaaa4239 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestEntity.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestEntity.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import com.sun.jersey.api.client.ClientResponse;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.NotFoundException;
 import org.neo4j.graphdb.PropertyContainer;
 import org.neo4j.helpers.collection.IterableWrapper;
-import org.neo4j.rest.graphdb.util.ArrayConverter;
+import org.springframework.data.graph.neo4j.rest.support.util.ArrayConverter;
 
 import javax.ws.rs.core.Response.Status;
 import java.net.URI;
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestGraphDatabase.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDatabase.java
similarity index 97%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestGraphDatabase.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDatabase.java
index 213c6462a..08cc70b1b 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestGraphDatabase.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDatabase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import com.sun.jersey.api.client.ClientResponse;
 import org.neo4j.graphdb.*;
@@ -25,7 +25,7 @@ import org.neo4j.graphdb.traversal.TraversalDescription;
 import org.neo4j.kernel.AbstractGraphDatabase;
 import org.neo4j.kernel.Config;
 import org.neo4j.kernel.RestConfig;
-import org.neo4j.rest.graphdb.index.RestIndexManager;
+import org.springframework.data.graph.neo4j.rest.support.index.RestIndexManager;
 import org.springframework.data.graph.core.GraphDatabase;
 import org.springframework.data.graph.core.Property;
 
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestNode.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestNode.java
similarity index 98%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestNode.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestNode.java
index 8f13aa2bd..414b300d8 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestNode.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestNode.java
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
-import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
 import org.neo4j.graphdb.*;
 import org.neo4j.graphdb.Traverser.Order;
 import org.neo4j.helpers.collection.IterableWrapper;
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestPathParser.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestPathParser.java
similarity index 97%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestPathParser.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestPathParser.java
index 6efabcbe2..036e1c89b 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestPathParser.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestPathParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Path;
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestRelationship.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestRelationship.java
similarity index 97%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestRelationship.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestRelationship.java
index 8828efff0..8a94a4105 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestRelationship.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestRelationship.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import org.neo4j.graphdb.*;
 
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestRequest.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestRequest.java
similarity index 98%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestRequest.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestRequest.java
index 14f0ed447..d60a70676 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestRequest.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestRequest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestTraversal.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraversal.java
similarity index 99%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestTraversal.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraversal.java
index 682eb36d9..bd3537067 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestTraversal.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraversal.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import com.sun.jersey.api.client.ClientResponse;
 import org.neo4j.graphdb.Direction;
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestTraversalDescription.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalDescription.java
similarity index 94%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestTraversalDescription.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalDescription.java
index c41999701..de71314c4 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestTraversalDescription.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalDescription.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import org.neo4j.graphdb.traversal.TraversalDescription;
 
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestTraverser.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraverser.java
similarity index 97%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestTraverser.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraverser.java
index 84c9b1b34..55c9ece78 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/RestTraverser.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraverser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Path;
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/SimplePath.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/SimplePath.java
similarity index 97%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/SimplePath.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/SimplePath.java
index e5f5fc4fd..5a6946e5d 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/SimplePath.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/SimplePath.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Path;
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestIndex.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestIndex.java
similarity index 93%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestIndex.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestIndex.java
index 7f87e8094..929c594ed 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestIndex.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestIndex.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb.index;
+package org.springframework.data.graph.neo4j.rest.support.index;
 
 import com.sun.jersey.api.client.ClientResponse;
 import org.neo4j.graphdb.PropertyContainer;
 import org.neo4j.graphdb.index.Index;
 import org.neo4j.graphdb.index.IndexHits;
-import org.neo4j.rest.graphdb.JsonHelper;
-import org.neo4j.rest.graphdb.RestEntity;
-import org.neo4j.rest.graphdb.RestGraphDatabase;
-import org.neo4j.rest.graphdb.RestRequest;
+import org.springframework.data.graph.neo4j.rest.support.JsonHelper;
+import org.springframework.data.graph.neo4j.rest.support.RestEntity;
+import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase;
+import org.springframework.data.graph.neo4j.rest.support.RestRequest;
 
 import javax.ws.rs.core.Response;
 import java.util.Collection;
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestIndexManager.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestIndexManager.java
similarity index 93%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestIndexManager.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestIndexManager.java
index 9976413eb..0efb2245e 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestIndexManager.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestIndexManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb.index;
+package org.springframework.data.graph.neo4j.rest.support.index;
 
 import com.sun.jersey.api.client.ClientResponse;
 import org.neo4j.graphdb.Node;
@@ -22,8 +22,8 @@ import org.neo4j.graphdb.PropertyContainer;
 import org.neo4j.graphdb.index.Index;
 import org.neo4j.graphdb.index.IndexManager;
 import org.neo4j.graphdb.index.RelationshipIndex;
-import org.neo4j.rest.graphdb.RestGraphDatabase;
-import org.neo4j.rest.graphdb.RestRequest;
+import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase;
+import org.springframework.data.graph.neo4j.rest.support.RestRequest;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestNodeIndex.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestNodeIndex.java
similarity index 81%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestNodeIndex.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestNodeIndex.java
index e1c26a283..e691db491 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestNodeIndex.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestNodeIndex.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb.index;
+package org.springframework.data.graph.neo4j.rest.support.index;
 
 import org.neo4j.graphdb.Node;
-import org.neo4j.rest.graphdb.RestGraphDatabase;
-import org.neo4j.rest.graphdb.RestNode;
-import org.neo4j.rest.graphdb.RestRequest;
+import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase;
+import org.springframework.data.graph.neo4j.rest.support.RestNode;
+import org.springframework.data.graph.neo4j.rest.support.RestRequest;
 
 import java.util.Map;
 
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestRelationshipIndex.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestRelationshipIndex.java
similarity index 87%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestRelationshipIndex.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestRelationshipIndex.java
index 7b8f83e42..be9289003 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestRelationshipIndex.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestRelationshipIndex.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb.index;
+package org.springframework.data.graph.neo4j.rest.support.index;
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.index.RelationshipIndex;
-import org.neo4j.rest.graphdb.RestGraphDatabase;
-import org.neo4j.rest.graphdb.RestRelationship;
-import org.neo4j.rest.graphdb.RestRequest;
+import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase;
+import org.springframework.data.graph.neo4j.rest.support.RestRelationship;
+import org.springframework.data.graph.neo4j.rest.support.RestRequest;
 
 import java.util.Map;
 
diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/util/ArrayConverter.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/util/ArrayConverter.java
similarity index 98%
rename from spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/util/ArrayConverter.java
rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/util/ArrayConverter.java
index 41968b3e8..1843d29f1 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/util/ArrayConverter.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/util/ArrayConverter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb.util;
+package org.springframework.data.graph.neo4j.rest.support.util;
 
 import java.lang.reflect.Array;
 import java.util.Collection;
diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestEntityPropertyValidationTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestEntityPropertyValidationTest.java
similarity index 92%
rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestEntityPropertyValidationTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestEntityPropertyValidationTest.java
index 7ef798829..b9f542cc8 100644
--- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestEntityPropertyValidationTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestEntityPropertyValidationTest.java
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest;
+package org.springframework.data.graph.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.neo4j.rest.graphdb.RestTestBase;
+import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
 import org.springframework.data.graph.neo4j.support.EntityPropertyValidationTest;
-import org.springframework.data.graph.neo4j.support.IndexTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestFinderTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestFinderTest.java
similarity index 93%
rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestFinderTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestFinderTest.java
index 22ccc124a..5b65d19db 100644
--- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestFinderTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestFinderTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest;
+package org.springframework.data.graph.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.neo4j.rest.graphdb.RestTestBase;
+import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
 import org.springframework.data.graph.neo4j.support.GraphRepositoryTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestIndexTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestIndexTest.java
similarity index 93%
rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestIndexTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestIndexTest.java
index 3de649ea3..71e9362c3 100644
--- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestIndexTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestIndexTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest;
+package org.springframework.data.graph.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.neo4j.rest.graphdb.RestTestBase;
+import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
 import org.springframework.data.graph.neo4j.support.IndexTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestNeo4jTemplateTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNeo4jTemplateTest.java
similarity index 92%
rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestNeo4jTemplateTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNeo4jTemplateTest.java
index 34f4479ff..ad0fb8a27 100644
--- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestNeo4jTemplateTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNeo4jTemplateTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest;
+package org.springframework.data.graph.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.neo4j.rest.graphdb.RestTestHelper;
+import org.springframework.data.graph.neo4j.rest.support.RestTestHelper;
 import org.springframework.data.graph.core.GraphDatabase;
 import org.springframework.data.graph.neo4j.template.Neo4jTemplateTest;
 import org.springframework.transaction.PlatformTransactionManager;
diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestNodeEntityRelationshipTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNodeEntityRelationshipTest.java
similarity index 87%
rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestNodeEntityRelationshipTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNodeEntityRelationshipTest.java
index 42b9b3ab2..42abea450 100644
--- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestNodeEntityRelationshipTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNodeEntityRelationshipTest.java
@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest;
+package org.springframework.data.graph.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.neo4j.rest.graphdb.RestTestBase;
-import org.springframework.data.graph.neo4j.fieldaccess.NodeRelationshipFieldAccessorFactory;
+import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
 import org.springframework.data.graph.neo4j.support.NodeEntityRelationshipTest;
-import org.springframework.data.graph.neo4j.support.NodeEntityTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -31,8 +29,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
 import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
 
-import java.net.NoRouteToHostException;
-
 /**
 * @author mh
 * @since 28.03.11
diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestNodeEntityTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNodeEntityTest.java
similarity index 94%
rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestNodeEntityTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNodeEntityTest.java
index 61d56df9d..23ab60b4d 100644
--- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestNodeEntityTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNodeEntityTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest;
+package org.springframework.data.graph.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.runner.RunWith;
-import org.neo4j.rest.graphdb.RestTestBase;
+import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
 import org.springframework.data.graph.neo4j.support.NodeEntityTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestProjectionTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestProjectionTest.java
similarity index 93%
rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestProjectionTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestProjectionTest.java
index 7fd9dda96..f98bb6e47 100644
--- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestProjectionTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestProjectionTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest;
+package org.springframework.data.graph.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.neo4j.rest.graphdb.RestTestBase;
+import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
 import org.springframework.data.graph.neo4j.support.ProjectionTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestPropertyTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestPropertyTest.java
similarity index 91%
rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestPropertyTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestPropertyTest.java
index 9f7a84ec5..78f2bade6 100644
--- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestPropertyTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestPropertyTest.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest;
+package org.springframework.data.graph.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.neo4j.rest.graphdb.RestTestBase;
-import org.springframework.data.graph.neo4j.support.NodeEntityRelationshipTest;
+import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
 import org.springframework.data.graph.neo4j.support.PropertyTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestRelationshipEntityTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestRelationshipEntityTest.java
similarity index 92%
rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestRelationshipEntityTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestRelationshipEntityTest.java
index 2c5a86c85..620dff1f8 100644
--- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestRelationshipEntityTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestRelationshipEntityTest.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest;
+package org.springframework.data.graph.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.neo4j.rest.graphdb.RestTestBase;
-import org.springframework.data.graph.neo4j.support.PropertyTest;
+import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
 import org.springframework.data.graph.neo4j.support.RelationshipEntityTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestTraversalTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestTraversalTest.java
similarity index 93%
rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestTraversalTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestTraversalTest.java
index 9dde40e76..a9e3e3d36 100644
--- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/RestTraversalTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestTraversalTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest;
+package org.springframework.data.graph.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.neo4j.rest.graphdb.RestTestBase;
+import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
 import org.springframework.data.graph.neo4j.support.TraversalTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/IsRelationshipToNodeMatcher.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/IsRelationshipToNodeMatcher.java
similarity index 96%
rename from spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/IsRelationshipToNodeMatcher.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/IsRelationshipToNodeMatcher.java
index 0adcbeea6..5265f7211 100644
--- a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/IsRelationshipToNodeMatcher.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/IsRelationshipToNodeMatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import org.hamcrest.Description;
 import org.junit.internal.matchers.TypeSafeMatcher;
diff --git a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/LocalTestServer.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/LocalTestServer.java
similarity index 97%
rename from spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/LocalTestServer.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/LocalTestServer.java
index 6c4ec1026..c48ce8734 100644
--- a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/LocalTestServer.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/LocalTestServer.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
-import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.kernel.AbstractGraphDatabase;
 import org.neo4j.server.AddressResolver;
 import org.neo4j.server.NeoServerWithEmbeddedWebServer;
diff --git a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/Neo4jDatabaseCleaner.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/Neo4jDatabaseCleaner.java
similarity index 97%
rename from spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/Neo4jDatabaseCleaner.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/Neo4jDatabaseCleaner.java
index dd8cf7c93..7d6dcda4d 100644
--- a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/Neo4jDatabaseCleaner.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/Neo4jDatabaseCleaner.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import org.neo4j.graphdb.Direction;
 import org.neo4j.graphdb.Node;
diff --git a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestEntityTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestEntityTest.java
similarity index 98%
rename from spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestEntityTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestEntityTest.java
index aac59dfb9..b06c082c9 100644
--- a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestEntityTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestEntityTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestGraphDbTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDbTest.java
similarity index 98%
rename from spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestGraphDbTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDbTest.java
index 2c05d2df2..4d3582d1e 100644
--- a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestGraphDbTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDbTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestIndexTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestIndexTest.java
similarity index 98%
rename from spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestIndexTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestIndexTest.java
index aeccdb8c1..05df4ca57 100644
--- a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestIndexTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestIndexTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestTestBase.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTestBase.java
similarity index 97%
rename from spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestTestBase.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTestBase.java
index db998525b..0c19a74e1 100644
--- a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestTestBase.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTestBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 
 import org.apache.log4j.BasicConfigurator;
diff --git a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestTestHelper.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTestHelper.java
similarity index 96%
rename from spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestTestHelper.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTestHelper.java
index 6dd7b19cb..79975a3c5 100644
--- a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestTestHelper.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTestHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 
 import org.apache.log4j.BasicConfigurator;
diff --git a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestTraversalDescriptionTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalDescriptionTest.java
similarity index 93%
rename from spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestTraversalDescriptionTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalDescriptionTest.java
index 378c24428..8e74cf425 100644
--- a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestTraversalDescriptionTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalDescriptionTest.java
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.neo4j.kernel.Uniqueness;
+import org.springframework.data.graph.neo4j.rest.support.RestTraversal;
+import org.springframework.data.graph.neo4j.rest.support.RestTraversalDescription;
 
 import java.util.Map;
 
diff --git a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestTraversalExecutionTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalExecutionTest.java
similarity index 96%
rename from spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestTraversalExecutionTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalExecutionTest.java
index d94958d99..970a4e478 100644
--- a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/RestTraversalExecutionTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalExecutionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/SpringPluginInitializerTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/SpringPluginInitializerTest.java
similarity index 97%
rename from spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/SpringPluginInitializerTest.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/SpringPluginInitializerTest.java
index a0f6488f9..e41e0d86e 100644
--- a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/SpringPluginInitializerTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/SpringPluginInitializerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
@@ -23,7 +23,6 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.neo4j.helpers.Pair;
 import org.springframework.data.graph.neo4j.server.SpringPluginInitializer;
 
 import javax.ws.rs.POST;
diff --git a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/TestInterface.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/TestInterface.java
similarity index 92%
rename from spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/TestInterface.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/TestInterface.java
index 908aca052..8a9d742da 100644
--- a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/TestInterface.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/TestInterface.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 public interface TestInterface {
     void thisIsARecording();
diff --git a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/Type.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/Type.java
similarity index 92%
rename from spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/Type.java
rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/Type.java
index 92f183033..6b3ac8b58 100644
--- a/spring-data-neo4j-rest/src/test/java/org/neo4j/rest/graphdb/Type.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/Type.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.neo4j.rest.graphdb;
+package org.springframework.data.graph.neo4j.rest.support;
 
 import org.neo4j.graphdb.RelationshipType;
 
diff --git a/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.PluginLifecycle b/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.PluginLifecycle
index 1b1b94e19..e32447946 100644
--- a/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.PluginLifecycle
+++ b/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.PluginLifecycle
@@ -1 +1 @@
-org.neo4j.rest.graphdb.SpringPluginInitializerTest
\ No newline at end of file
+org.springframework.data.graph.neo4j.rest.support.SpringPluginInitializerTest
diff --git a/spring-data-neo4j-rest/src/test/resources/RestTest-context.xml b/spring-data-neo4j-rest/src/test/resources/RestTest-context.xml
index 55a727d6f..f88fa98b4 100644
--- a/spring-data-neo4j-rest/src/test/resources/RestTest-context.xml
+++ b/spring-data-neo4j-rest/src/test/resources/RestTest-context.xml
@@ -14,7 +14,7 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-    <bean id="graphDatabaseService" class="org.neo4j.rest.graphdb.RestGraphDatabase" scope="singleton">
+    <bean id="graphDatabaseService" class="org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase" scope="singleton">
          <constructor-arg index="0" value="http://localhost:7473/db/data" />
     </bean>
 </beans>
diff --git a/spring-data-neo4j-rest/src/test/resources/ServerTest-context.xml b/spring-data-neo4j-rest/src/test/resources/ServerTest-context.xml
index 4a41276cf..3dc0f2e91 100644
--- a/spring-data-neo4j-rest/src/test/resources/ServerTest-context.xml
+++ b/spring-data-neo4j-rest/src/test/resources/ServerTest-context.xml
@@ -14,6 +14,6 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-    <bean id="testObject" class="org.neo4j.rest.graphdb.SpringPluginInitializerTest" scope="singleton">
+    <bean id="testObject" class="org.springframework.data.graph.neo4j.rest.support.SpringPluginInitializerTest" scope="singleton">
     </bean>
 </beans>
diff --git a/spring-data-neo4j-rest/src/test/resources/server-test-db.properties b/spring-data-neo4j-rest/src/test/resources/server-test-db.properties
index 9fcca8e4b..59f00e8e6 100644
--- a/spring-data-neo4j-rest/src/test/resources/server-test-db.properties
+++ b/spring-data-neo4j-rest/src/test/resources/server-test-db.properties
@@ -1,2 +1,2 @@
 org.neo4j.server.database.location=target/test-db
-org.neo4j.server.thirdparty_jaxrs_classes=org.neo4j.rest.graphdb=/test
+org.neo4j.server.thirdparty_jaxrs_classes=org.springframework.data.graph.neo4j.rest.support=/test