diff --git a/README.md b/README.md
index a13d16471..f8947ca56 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,8 @@ managing associations.
 
 To use the Spring Data Rest exporter, first package your domain classes and repositories into a JAR
 file. Include some Spring XML configuration files in the `META-INF/spring-data-rest` directory (the
-file name should end with "-export.xml" to be picked up by the scanner) in that JAR file that include
-an applicable EntityManager and DataSource and the Repository configuration (using the special JPA
+file name should end with "-export.xml" to be picked up by the scanner). In that JAR file include
+an applicable EntityManager and DataSource and Repository configuration (using the special JPA
 Repository namespace).
 
 You can either deploy this JAR file into your Servlet container in a "shared" configuration, or you
@@ -73,7 +73,8 @@ The configuration used in testing looks like this:
 
       <import resource="shared.xml"/>
 
-      <jpa:repositories base-package="org.springframework.data.rest.test.mvc"/>
+      <!-- Search for Repositories under this package name -->
+      <jpa:repositories base-package="org.springframework.data.rest.test.webmvc"/>
 
     </beans>
 
diff --git a/build.gradle b/build.gradle
index 959ad4e53..3b7f19521 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,32 +7,23 @@ allprojects {
   group = "org.springframework.data.rest"
   version = "$sdRestVersion"
 
-  releaseBuild = version.endsWith("RELEASE")
-  snapshotBuild = version.endsWith("SNAPSHOT")
-
-  sourceCompatibility = 6
-  targetCompatibility = 6
-
   configurations.all {
     exclude group: "commons-logging"
     exclude module: "slf4j-log4j12"
     exclude module: "groovy-all", version: "1.8.0-beta-3-SNAPSHOT"
   }
 
-}
-
-subprojects {
-
   repositories {
     mavenCentral(artifactUrls: [
-        "http://maven.springframework.org/release",
-        "http://maven.springframework.org/milestone",
-        //"http://repository.jboss.org/maven2/",
-        //"http://download.java.net/maven/2/"
+        "http://repo.springframework.org/release",
+        "http://repo.springframework.org/milestone"
     ])
     mavenLocal()
   }
 
+}
+
+subprojects {
   apply plugin: "java"
   apply plugin: "groovy"
 
@@ -66,7 +57,7 @@ subprojects {
 
 }
 
-task wrapper(type: Wrapper) { gradleVersion = "1.0-milestone-8" }
+task wrapper(type: Wrapper) { gradleVersion = "1.0-milestone-9" }
 
 idea {
   project.ipr.withXml { provider ->
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 1182d0584..ce16961d3 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 12d9a1cac..30bd8bdbc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Mar 08 09:45:33 CST 2012
+#Tue Mar 27 08:53:14 CDT 2012
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://repo.gradle.org/gradle/distributions/gradle-1.0-milestone-8-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-9-bin.zip
diff --git a/rest/build.gradle b/rest/build.gradle
index 37e3fdc8b..ef2de149b 100644
--- a/rest/build.gradle
+++ b/rest/build.gradle
@@ -21,4 +21,4 @@ dependencies {
   // Repository Exporter support
   compile project(":repository")
 
-}
\ No newline at end of file
+}
diff --git a/rest/src/main/java/org/springframework/data/rest/mvc/JsonView.java b/rest/src/main/java/org/springframework/data/rest/webmvc/JsonView.java
similarity index 98%
rename from rest/src/main/java/org/springframework/data/rest/mvc/JsonView.java
rename to rest/src/main/java/org/springframework/data/rest/webmvc/JsonView.java
index bbe4a4400..f4a9cb787 100644
--- a/rest/src/main/java/org/springframework/data/rest/mvc/JsonView.java
+++ b/rest/src/main/java/org/springframework/data/rest/webmvc/JsonView.java
@@ -1,4 +1,4 @@
-package org.springframework.data.rest.mvc;
+package org.springframework.data.rest.webmvc;
 
 import java.io.ByteArrayOutputStream;
 import java.util.Map;
diff --git a/rest/src/main/java/org/springframework/data/rest/mvc/RepositoryRestConfiguration.java b/rest/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestConfiguration.java
similarity index 98%
rename from rest/src/main/java/org/springframework/data/rest/mvc/RepositoryRestConfiguration.java
rename to rest/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestConfiguration.java
index 4d6b09c2c..22bec30a2 100644
--- a/rest/src/main/java/org/springframework/data/rest/mvc/RepositoryRestConfiguration.java
+++ b/rest/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestConfiguration.java
@@ -1,4 +1,4 @@
-package org.springframework.data.rest.mvc;
+package org.springframework.data.rest.webmvc;
 
 import java.net.URI;
 import java.util.ArrayList;
diff --git a/rest/src/main/java/org/springframework/data/rest/mvc/RepositoryRestController.java b/rest/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java
similarity index 99%
rename from rest/src/main/java/org/springframework/data/rest/mvc/RepositoryRestController.java
rename to rest/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java
index 6fa634700..61d1892c8 100644
--- a/rest/src/main/java/org/springframework/data/rest/mvc/RepositoryRestController.java
+++ b/rest/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java
@@ -1,4 +1,4 @@
-package org.springframework.data.rest.mvc;
+package org.springframework.data.rest.webmvc;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/rest/src/main/java/org/springframework/data/rest/mvc/RepositoryRestMvcConfiguration.java b/rest/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestMvcConfiguration.java
similarity index 98%
rename from rest/src/main/java/org/springframework/data/rest/mvc/RepositoryRestMvcConfiguration.java
rename to rest/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestMvcConfiguration.java
index 6b4350ded..ed1abc001 100644
--- a/rest/src/main/java/org/springframework/data/rest/mvc/RepositoryRestMvcConfiguration.java
+++ b/rest/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestMvcConfiguration.java
@@ -1,4 +1,4 @@
-package org.springframework.data.rest.mvc;
+package org.springframework.data.rest.webmvc;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/rest/src/main/java/org/springframework/data/rest/mvc/ServerHttpRequestMethodArgumentResolver.java b/rest/src/main/java/org/springframework/data/rest/webmvc/ServerHttpRequestMethodArgumentResolver.java
similarity index 96%
rename from rest/src/main/java/org/springframework/data/rest/mvc/ServerHttpRequestMethodArgumentResolver.java
rename to rest/src/main/java/org/springframework/data/rest/webmvc/ServerHttpRequestMethodArgumentResolver.java
index 6f292f9fb..8a00ab4e8 100644
--- a/rest/src/main/java/org/springframework/data/rest/mvc/ServerHttpRequestMethodArgumentResolver.java
+++ b/rest/src/main/java/org/springframework/data/rest/webmvc/ServerHttpRequestMethodArgumentResolver.java
@@ -1,4 +1,4 @@
-package org.springframework.data.rest.mvc;
+package org.springframework.data.rest.webmvc;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/rest/src/main/java/org/springframework/data/rest/mvc/UriListView.java b/rest/src/main/java/org/springframework/data/rest/webmvc/UriListView.java
similarity index 97%
rename from rest/src/main/java/org/springframework/data/rest/mvc/UriListView.java
rename to rest/src/main/java/org/springframework/data/rest/webmvc/UriListView.java
index 79f5563fb..c0ee3ea2c 100644
--- a/rest/src/main/java/org/springframework/data/rest/mvc/UriListView.java
+++ b/rest/src/main/java/org/springframework/data/rest/webmvc/UriListView.java
@@ -1,4 +1,4 @@
-package org.springframework.data.rest.mvc;
+package org.springframework.data.rest.webmvc;
 
 import java.io.PrintWriter;
 import java.util.List;
diff --git a/rest/src/test/groovy/org/springframework/data/rest/mvc/spec/RepositoryRestControllerSpec.groovy b/rest/src/test/groovy/org/springframework/data/rest/webmvc/spec/RepositoryRestControllerSpec.groovy
similarity index 94%
rename from rest/src/test/groovy/org/springframework/data/rest/mvc/spec/RepositoryRestControllerSpec.groovy
rename to rest/src/test/groovy/org/springframework/data/rest/webmvc/spec/RepositoryRestControllerSpec.groovy
index 830245b9e..764934297 100644
--- a/rest/src/test/groovy/org/springframework/data/rest/mvc/spec/RepositoryRestControllerSpec.groovy
+++ b/rest/src/test/groovy/org/springframework/data/rest/webmvc/spec/RepositoryRestControllerSpec.groovy
@@ -1,13 +1,13 @@
-package org.springframework.data.rest.mvc.spec
+package org.springframework.data.rest.webmvc.spec
 
 import org.codehaus.jackson.map.ObjectMapper
 import org.codehaus.jackson.map.ser.CustomSerializerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.data.rest.core.SimpleLink
 import org.springframework.data.rest.core.util.FluentBeanSerializer
-import org.springframework.data.rest.mvc.RepositoryRestConfiguration
-import org.springframework.data.rest.mvc.RepositoryRestController
-import org.springframework.data.rest.mvc.RepositoryRestMvcConfiguration
+import org.springframework.data.rest.webmvc.RepositoryRestConfiguration
+import org.springframework.data.rest.webmvc.RepositoryRestController
+import org.springframework.data.rest.webmvc.RepositoryRestMvcConfiguration
 import org.springframework.http.HttpStatus
 import org.springframework.http.server.ServletServerHttpRequest
 import org.springframework.mock.web.MockHttpServletRequest
diff --git a/rest/src/test/java/org/springframework/data/rest/test/mvc/Address.java b/rest/src/test/java/org/springframework/data/rest/test/webmvc/Address.java
similarity index 95%
rename from rest/src/test/java/org/springframework/data/rest/test/mvc/Address.java
rename to rest/src/test/java/org/springframework/data/rest/test/webmvc/Address.java
index 9b5bfb546..2b2109518 100644
--- a/rest/src/test/java/org/springframework/data/rest/test/mvc/Address.java
+++ b/rest/src/test/java/org/springframework/data/rest/test/webmvc/Address.java
@@ -1,4 +1,4 @@
-package org.springframework.data.rest.test.mvc;
+package org.springframework.data.rest.test.webmvc;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/rest/src/test/java/org/springframework/data/rest/test/mvc/AddressRepository.java b/rest/src/test/java/org/springframework/data/rest/test/webmvc/AddressRepository.java
similarity index 78%
rename from rest/src/test/java/org/springframework/data/rest/test/mvc/AddressRepository.java
rename to rest/src/test/java/org/springframework/data/rest/test/webmvc/AddressRepository.java
index 3e970fe16..82a4191db 100644
--- a/rest/src/test/java/org/springframework/data/rest/test/mvc/AddressRepository.java
+++ b/rest/src/test/java/org/springframework/data/rest/test/webmvc/AddressRepository.java
@@ -1,4 +1,4 @@
-package org.springframework.data.rest.test.mvc;
+package org.springframework.data.rest.test.webmvc;
 
 import org.springframework.data.repository.CrudRepository;
 
diff --git a/rest/src/test/java/org/springframework/data/rest/test/mvc/Person.java b/rest/src/test/java/org/springframework/data/rest/test/webmvc/Person.java
similarity index 96%
rename from rest/src/test/java/org/springframework/data/rest/test/mvc/Person.java
rename to rest/src/test/java/org/springframework/data/rest/test/webmvc/Person.java
index 3d21b718a..9dd395c96 100644
--- a/rest/src/test/java/org/springframework/data/rest/test/mvc/Person.java
+++ b/rest/src/test/java/org/springframework/data/rest/test/webmvc/Person.java
@@ -1,4 +1,4 @@
-package org.springframework.data.rest.test.mvc;
+package org.springframework.data.rest.test.webmvc;
 
 import java.util.List;
 import java.util.Map;
diff --git a/rest/src/test/java/org/springframework/data/rest/test/mvc/PersonLoader.java b/rest/src/test/java/org/springframework/data/rest/test/webmvc/PersonLoader.java
similarity index 97%
rename from rest/src/test/java/org/springframework/data/rest/test/mvc/PersonLoader.java
rename to rest/src/test/java/org/springframework/data/rest/test/webmvc/PersonLoader.java
index d563839ce..7b5396a3c 100644
--- a/rest/src/test/java/org/springframework/data/rest/test/mvc/PersonLoader.java
+++ b/rest/src/test/java/org/springframework/data/rest/test/webmvc/PersonLoader.java
@@ -1,4 +1,4 @@
-package org.springframework.data.rest.test.mvc;
+package org.springframework.data.rest.test.webmvc;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/rest/src/test/java/org/springframework/data/rest/test/mvc/PersonRepository.java b/rest/src/test/java/org/springframework/data/rest/test/webmvc/PersonRepository.java
similarity index 78%
rename from rest/src/test/java/org/springframework/data/rest/test/mvc/PersonRepository.java
rename to rest/src/test/java/org/springframework/data/rest/test/webmvc/PersonRepository.java
index 2a24995b2..01a516270 100644
--- a/rest/src/test/java/org/springframework/data/rest/test/mvc/PersonRepository.java
+++ b/rest/src/test/java/org/springframework/data/rest/test/webmvc/PersonRepository.java
@@ -1,4 +1,4 @@
-package org.springframework.data.rest.test.mvc;
+package org.springframework.data.rest.test.webmvc;
 
 import org.springframework.data.repository.CrudRepository;
 
diff --git a/rest/src/test/java/org/springframework/data/rest/test/mvc/Profile.java b/rest/src/test/java/org/springframework/data/rest/test/webmvc/Profile.java
similarity index 96%
rename from rest/src/test/java/org/springframework/data/rest/test/mvc/Profile.java
rename to rest/src/test/java/org/springframework/data/rest/test/webmvc/Profile.java
index 80ecb82bc..8f8c9cac1 100644
--- a/rest/src/test/java/org/springframework/data/rest/test/mvc/Profile.java
+++ b/rest/src/test/java/org/springframework/data/rest/test/webmvc/Profile.java
@@ -1,4 +1,4 @@
-package org.springframework.data.rest.test.mvc;
+package org.springframework.data.rest.test.webmvc;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/rest/src/test/java/org/springframework/data/rest/test/mvc/ProfileRepository.java b/rest/src/test/java/org/springframework/data/rest/test/webmvc/ProfileRepository.java
similarity index 78%
rename from rest/src/test/java/org/springframework/data/rest/test/mvc/ProfileRepository.java
rename to rest/src/test/java/org/springframework/data/rest/test/webmvc/ProfileRepository.java
index f1fba83bb..761f7c0a7 100644
--- a/rest/src/test/java/org/springframework/data/rest/test/mvc/ProfileRepository.java
+++ b/rest/src/test/java/org/springframework/data/rest/test/webmvc/ProfileRepository.java
@@ -1,4 +1,4 @@
-package org.springframework.data.rest.test.mvc;
+package org.springframework.data.rest.test.webmvc;
 
 import org.springframework.data.repository.CrudRepository;
 
diff --git a/rest/src/test/resouces/META-INF/persistence.xml b/rest/src/test/resources/META-INF/persistence.xml
similarity index 76%
rename from rest/src/test/resouces/META-INF/persistence.xml
rename to rest/src/test/resources/META-INF/persistence.xml
index d41aed326..ed9d22292 100644
--- a/rest/src/test/resouces/META-INF/persistence.xml
+++ b/rest/src/test/resources/META-INF/persistence.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
   <persistence-unit name="jpa.sample">
-    <class>org.springframework.data.rest.test.mvc.Person</class>
-    <class>org.springframework.data.rest.test.mvc.Profile</class>
-    <class>org.springframework.data.rest.test.mvc.Address</class>
+    <class>org.springframework.data.rest.test.webmvc.Person</class>
+    <class>org.springframework.data.rest.test.webmvc.Profile</class>
+    <class>org.springframework.data.rest.test.webmvc.Address</class>
     <properties>
       <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
       <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:spring"/>
diff --git a/rest/src/test/resouces/META-INF/spring-data-rest/repositories-export.xml b/rest/src/test/resources/META-INF/spring-data-rest/repositories-export.xml
similarity index 90%
rename from rest/src/test/resouces/META-INF/spring-data-rest/repositories-export.xml
rename to rest/src/test/resources/META-INF/spring-data-rest/repositories-export.xml
index 57ceb44e3..bc986472b 100644
--- a/rest/src/test/resouces/META-INF/spring-data-rest/repositories-export.xml
+++ b/rest/src/test/resources/META-INF/spring-data-rest/repositories-export.xml
@@ -7,9 +7,9 @@
 
   <import resource="shared.xml"/>
 
-  <jpa:repositories base-package="org.springframework.data.rest.test.mvc"/>
+  <jpa:repositories base-package="org.springframework.data.rest.test.webmvc"/>
 
-  <bean class="org.springframework.data.rest.test.mvc.PersonLoader">
+  <bean class="org.springframework.data.rest.test.webmvc.PersonLoader">
     <property name="personRepository" ref="personRepository"/>
     <property name="profileRepository" ref="profileRepository"/>
     <property name="addressRepository" ref="addressRepository"/>
diff --git a/rest/src/test/resouces/META-INF/spring-data-rest/shared.xml b/rest/src/test/resources/META-INF/spring-data-rest/shared.xml
similarity index 100%
rename from rest/src/test/resouces/META-INF/spring-data-rest/shared.xml
rename to rest/src/test/resources/META-INF/spring-data-rest/shared.xml
diff --git a/rest/src/test/resouces/logback.xml b/rest/src/test/resources/logback.xml
similarity index 100%
rename from rest/src/test/resouces/logback.xml
rename to rest/src/test/resources/logback.xml