diff --git a/pom.xml b/pom.xml
index ddeb43d54..d83db4c97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,6 @@
 		<module>spring-data-commons-parent</module>
 		<module>spring-data-commons-core</module>
 		<module>spring-data-commons-aspects</module>
-		<module>spring-data-commons-extensions</module>
 	</modules>
 
 	<developers>
diff --git a/spring-data-commons-core/pom.xml b/spring-data-commons-core/pom.xml
index 9614b8343..9b8c48dab 100644
--- a/spring-data-commons-core/pom.xml
+++ b/spring-data-commons-core/pom.xml
@@ -21,6 +21,18 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- Logging -->
     <dependency>
diff --git a/spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/converter/DomainClassConverter.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/DomainClassConverter.java
similarity index 98%
rename from spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/converter/DomainClassConverter.java
rename to spring-data-commons-core/src/main/java/org/springframework/data/repository/support/DomainClassConverter.java
index 82e505814..aa655d2da 100644
--- a/spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/converter/DomainClassConverter.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/DomainClassConverter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.extensions.converter;
+package org.springframework.data.repository.support;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/beans/DomainClassPropertyEditor.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditor.java
similarity index 98%
rename from spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/beans/DomainClassPropertyEditor.java
rename to spring-data-commons-core/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditor.java
index ffbff98fd..22125a024 100644
--- a/spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/beans/DomainClassPropertyEditor.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.extensions.beans;
+package org.springframework.data.repository.support;
 
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorSupport;
diff --git a/spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/beans/DomainClassPropertyEditorRegistrar.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditorRegistrar.java
similarity index 98%
rename from spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/beans/DomainClassPropertyEditorRegistrar.java
rename to spring-data-commons-core/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditorRegistrar.java
index d5d09f1d0..30a0870e3 100644
--- a/spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/beans/DomainClassPropertyEditorRegistrar.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/DomainClassPropertyEditorRegistrar.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.extensions.beans;
+package org.springframework.data.repository.support;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/web/PageableArgumentResolver.java b/spring-data-commons-core/src/main/java/org/springframework/data/web/PageableArgumentResolver.java
similarity index 99%
rename from spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/web/PageableArgumentResolver.java
rename to spring-data-commons-core/src/main/java/org/springframework/data/web/PageableArgumentResolver.java
index 92b04bcbf..eac582878 100644
--- a/spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/web/PageableArgumentResolver.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/web/PageableArgumentResolver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.extensions.web;
+package org.springframework.data.web;
 
 import java.beans.PropertyEditorSupport;
 import java.lang.annotation.Annotation;
diff --git a/spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/web/PageableDefaults.java b/spring-data-commons-core/src/main/java/org/springframework/data/web/PageableDefaults.java
similarity index 96%
rename from spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/web/PageableDefaults.java
rename to spring-data-commons-core/src/main/java/org/springframework/data/web/PageableDefaults.java
index e59ce51bc..1dcc56f6e 100644
--- a/spring-data-commons-extensions/src/main/java/org/springframework/data/extensions/web/PageableDefaults.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/web/PageableDefaults.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.extensions.web;
+package org.springframework.data.web;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-data-commons-extensions/src/test/java/org/springframework/data/extensions/conversion/DomainClassConverterUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/DomainClassConverterUnitTests.java
similarity index 97%
rename from spring-data-commons-extensions/src/test/java/org/springframework/data/extensions/conversion/DomainClassConverterUnitTests.java
rename to spring-data-commons-core/src/test/java/org/springframework/data/repository/support/DomainClassConverterUnitTests.java
index bcad2bc22..043fe22e7 100644
--- a/spring-data-commons-extensions/src/test/java/org/springframework/data/extensions/conversion/DomainClassConverterUnitTests.java
+++ b/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/DomainClassConverterUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.extensions.conversion;
+package org.springframework.data.repository.support;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
@@ -33,7 +33,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.data.extensions.converter.DomainClassConverter;
+import org.springframework.data.repository.support.DomainClassConverter;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.support.EntityInformation;
 import org.springframework.data.repository.support.RepositoryFactoryInformation;
@@ -54,6 +54,7 @@ public class DomainClassConverterUnitTests {
     TypeDescriptor sourceDescriptor;
     TypeDescriptor targetDescriptor;
 
+    @SuppressWarnings("rawtypes")
     Map<String, RepositoryFactoryInformation> providers;
 
     @Mock
diff --git a/spring-data-commons-extensions/src/test/java/org/springframework/data/extensions/beans/DomainClassPropertyEditorRegistrarUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/DomainClassPropertyEditorRegistrarUnitTests.java
similarity index 98%
rename from spring-data-commons-extensions/src/test/java/org/springframework/data/extensions/beans/DomainClassPropertyEditorRegistrarUnitTests.java
rename to spring-data-commons-core/src/test/java/org/springframework/data/repository/support/DomainClassPropertyEditorRegistrarUnitTests.java
index 3fa638901..aae600371 100644
--- a/spring-data-commons-extensions/src/test/java/org/springframework/data/extensions/beans/DomainClassPropertyEditorRegistrarUnitTests.java
+++ b/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/DomainClassPropertyEditorRegistrarUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.extensions.beans;
+package org.springframework.data.repository.support;
 
 import static org.hamcrest.Matchers.*;
 import static org.mockito.Matchers.*;
diff --git a/spring-data-commons-extensions/src/test/java/org/springframework/data/extensions/beans/DomainClassPropertyEditorUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/DomainClassPropertyEditorUnitTests.java
similarity index 98%
rename from spring-data-commons-extensions/src/test/java/org/springframework/data/extensions/beans/DomainClassPropertyEditorUnitTests.java
rename to spring-data-commons-core/src/test/java/org/springframework/data/repository/support/DomainClassPropertyEditorUnitTests.java
index 1bb58ae77..6657ed46c 100644
--- a/spring-data-commons-extensions/src/test/java/org/springframework/data/extensions/beans/DomainClassPropertyEditorUnitTests.java
+++ b/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/DomainClassPropertyEditorUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.extensions.beans;
+package org.springframework.data.repository.support;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
diff --git a/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/RepositoryFactorySupportUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/RepositoryFactorySupportUnitTests.java
index 875df7a76..4173a663c 100644
--- a/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/RepositoryFactorySupportUnitTests.java
+++ b/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/RepositoryFactorySupportUnitTests.java
@@ -67,6 +67,7 @@ public class RepositoryFactorySupportUnitTests {
          * @see org.springframework.data.repository.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
          */
         @Override
+        @SuppressWarnings("unchecked")
         public <T, ID extends Serializable> EntityInformation<T, ID> getEntityInformation(
                 Class<T> domainClass) {
         
diff --git a/spring-data-commons-core/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java
index de3817fb5..7b08c1f5f 100644
--- a/spring-data-commons-core/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java
+++ b/spring-data-commons-core/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java
@@ -112,6 +112,7 @@ public class ClassTypeInformationUnitTests {
     
   }
   
+  @SuppressWarnings("unused")
   private class MapContainer<T> {
     Map<String, T> genericMap;
     Map<String, Calendar> map;
@@ -121,6 +122,7 @@ public class ClassTypeInformationUnitTests {
     
   }
   
+  @SuppressWarnings({"unused", "rawtypes"})
   private class CollectionContainer<T> {
     
     T[] array;
@@ -129,11 +131,13 @@ public class ClassTypeInformationUnitTests {
     Set rawSet;
   }
 
+  @SuppressWarnings("unused")
   private class GenericTypeWithBound<T extends Person> {
 
     T person;
   }
 
+  @SuppressWarnings("unused")
   private class AnotherGenericType<T extends Person, S extends GenericTypeWithBound<T>> {
 
     S nested;
@@ -151,6 +155,7 @@ public class ClassTypeInformationUnitTests {
     }
   }
 
+  @SuppressWarnings("unused")
   private class GenericType<T, S> {
 
     Long index;
@@ -161,6 +166,7 @@ public class ClassTypeInformationUnitTests {
 
   }
 
+  @SuppressWarnings("unused")
   private class GenericWrapper<S> {
 
     GenericType<S, Object> wrapped;
diff --git a/spring-data-commons-extensions/src/test/java/org/springframework/data/extensions/web/PageableArgumentResolverUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/web/PageableArgumentResolverUnitTests.java
similarity index 99%
rename from spring-data-commons-extensions/src/test/java/org/springframework/data/extensions/web/PageableArgumentResolverUnitTests.java
rename to spring-data-commons-core/src/test/java/org/springframework/data/web/PageableArgumentResolverUnitTests.java
index 4124801ec..83d53fee1 100644
--- a/spring-data-commons-extensions/src/test/java/org/springframework/data/extensions/web/PageableArgumentResolverUnitTests.java
+++ b/spring-data-commons-core/src/test/java/org/springframework/data/web/PageableArgumentResolverUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.extensions.web;
+package org.springframework.data.web;
 
 import static org.junit.Assert.*;
 
diff --git a/spring-data-commons-core/template.mf b/spring-data-commons-core/template.mf
index 6f1dcb8fe..f55c1819d 100644
--- a/spring-data-commons-core/template.mf
+++ b/spring-data-commons-core/template.mf
@@ -5,23 +5,25 @@ Bundle-ManifestVersion: 2
 Import-Package: 
  sun.reflect;version="0";resolution:=optional
 Import-Template:
- org.springframework.aop.*;version="[3.0.0, 4.0.0)", 
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
- org.springframework.core.*;version="[3.0.0, 4.0.0)",
- org.springframework.context.*;version="[3.0.0, 4.0.0)",
- org.springframework.dao.*;version="[3.0.0, 4.0.0)",
- org.springframework.util.*;version="[3.0.0, 4.0.0)",
- org.springframework.expression.*;version="[3.0.0, 4.0.0)",
- org.springframework.expression.spel.standard.*;version="[3.0.0, 4.0.0)",
- org.springframework.expression.spel.support.*;version="[3.0.0, 4.0.0)",
- org.springframework.transaction.*;version="[3.0.0, 4.0.0)",
- org.springframework.validation.*;version="[3.0.0, 4.0.0)",
+ org.springframework.aop.*;version="${org.springframework.version:[=.=.=,+1.0.0)}", 
+ org.springframework.beans.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
+ org.springframework.core.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
+ org.springframework.context.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
+ org.springframework.dao.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
+ org.springframework.util.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
+ org.springframework.expression.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
+ org.springframework.expression.spel.standard.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
+ org.springframework.expression.spel.support.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
+ org.springframework.transaction.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
+ org.springframework.validation.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
  org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
  org.springframework.data.persistence.*;version="[1.0.0, 2.0.0)",
+ org.springframework.web.*;version="${org.springframework.version:[=.=.=,+1.0.0)}";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.joda.time.*;version="[1.6.0,2.0.0)",
  org.slf4j.*;version="[1.5.0,1.6.0)",
+ javax.servlet.*;version="[2.5.0, 3.0.0)";resolution:=optional,
  org.w3c.dom.*;version="0"
 
 
diff --git a/spring-data-commons-extensions/pom.xml b/spring-data-commons-extensions/pom.xml
deleted file mode 100644
index 44d281223..000000000
--- a/spring-data-commons-extensions/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.data</groupId>
-		<artifactId>spring-data-commons-parent</artifactId>
-		<version>1.0.0.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-data-commons-parent/pom.xml</relativePath>
-	</parent>
-	<artifactId>spring-data-commons-extensions</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Data Commons Extensions</name>
-	<dependencies>
-	
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-data-commons-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<!--  Spring -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		
-		
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>jsr250-api</artifactId>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>1.6</version>
-			<optional>true</optional>
-		</dependency>
-
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>com.springsource.bundlor</groupId>
-					<artifactId>com.springsource.bundlor.maven</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/spring-data-commons-extensions/template.mf b/spring-data-commons-extensions/template.mf
deleted file mode 100644
index 9979faab1..000000000
--- a/spring-data-commons-extensions/template.mf
+++ /dev/null
@@ -1,16 +0,0 @@
-Bundle-SymbolicName: org.springframework.data.extensions
-Bundle-Name: Spring Data Commons Extensions
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Export-Template: 
- org.springframework.data.extensions.*;version="${project.version:[=.=.=,+1.0.0)}"
-Import-Template:
- org.springframework.data.*;version="${project.version:[=.=.=,+1.0.0)}",
- org.springframework.core.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.beans.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.context.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.util.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.validation.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.web.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- javax.servlet.*;version="[2.5.0, 3.0.0)"
- 
\ No newline at end of file