diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..24633650
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.project
+.classpath
+.springBeans
+.settings/
+target/
\ No newline at end of file
diff --git a/README.md b/README.md
index 22190abd..b219ab09 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,16 @@
-spring-data-examples
-====================
+# Spring Data Examples
-Spring Data Example Projects
+This repository contains example projects for the different Spring Data modules to showcase the API and how to use the features provided by the modules.
+
+We have separate folders for the samples of individual modules:
+
+## Spring Data JPA
+
+* `spring-data-jpa-example` - Probably the project you want to have a look at first. Contains a variety of sample packages, showcasing the different levels at which you can use Spring Data JPA. Have a look at the `simple` package for the most basic setup.
+* `java8-auditing` - Example of how to use Spring Data JPA auditing with Java 8 date time types.
+* `spring-data-jpa-showcase` - Refactoring show case of how to improve a plain-JPA-based persistence layer by using Spring Data JPA (read: removing close to all of the implementation code). Follow the `demo.txt` file for detailed instructions.
+* `spring-data-jpa-interceptors` - Example of how to enrich the repositories with AOP.
+
+## Spring Data MongoDB
+
+* `spring-data-mongodb-example` - Example project for general repository functionality as well as aggregation framework support.
diff --git a/jpa/pom.xml b/jpa/pom.xml
new file mode 100644
index 00000000..dd351060
--- /dev/null
+++ b/jpa/pom.xml
@@ -0,0 +1,50 @@
+
+ 4.0.0
+
+ spring-data-jpa-examples
+ pom
+
+
+ org.springframework.data.examples
+ spring-data-examples
+ 1.0.0.BUILD-SNAPSHOT
+
+
+ Spring Data JPA - Examples
+ Sample projects for Spring Data JPA
+ http://www.springframework.org/spring-data
+ 2011
+
+
+ spring-data-jpa-example
+ spring-data-jpa-showcase
+ spring-data-jpa-interceptors
+ spring-data-jpa-java8-auditing
+
+
+
+ 1.5.0.RC1
+ 4.3.1.Final
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
+
+
+ joda-time
+ joda-time
+
+
+
+ org.hsqldb
+ hsqldb
+
+
+
+
+
\ No newline at end of file
diff --git a/jpa/spring-data-jpa-example/pom.xml b/jpa/spring-data-jpa-example/pom.xml
new file mode 100644
index 00000000..9115e231
--- /dev/null
+++ b/jpa/spring-data-jpa-example/pom.xml
@@ -0,0 +1,40 @@
+
+ 4.0.0
+
+ spring-data-jpa-example
+
+
+ org.springframework.data.examples
+ spring-data-jpa-examples
+ 1.0.0.BUILD-SNAPSHOT
+ ../pom.xml
+
+
+ Spring Data JPA - Example
+ Small sample project showing the usage of Spring Data JPA.
+
+
+
+
+ org.springframework
+ spring-aspects
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ **/*.java
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jpa/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/auditing/AuditableUser.java b/jpa/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/auditing/AuditableUser.java
new file mode 100644
index 00000000..4884c91d
--- /dev/null
+++ b/jpa/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/auditing/AuditableUser.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.data.jpa.example.repository.auditing;
+
+import javax.persistence.Entity;
+
+import org.springframework.data.domain.Auditable;
+import org.springframework.data.jpa.domain.AbstractAuditable;
+
+/**
+ * User domain class that uses auditing functionality of Spring Data that can either be aquired implementing
+ * {@link Auditable} or extend {@link AbstractAuditable}.
+ *
+ * @author Oliver Gierke
+ * @author Thomas Darimont
+ */
+@Entity
+public class AuditableUser extends AbstractAuditable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String username;
+
+ /**
+ * Set's the user's name.
+ *
+ * @param username the username to set
+ */
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ /**
+ * Returns the user's name.
+ *
+ * @return the username
+ */
+ public String getUsername() {
+ return username;
+ }
+}
diff --git a/jpa/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/auditing/AuditableUserRepository.java b/jpa/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/auditing/AuditableUserRepository.java
new file mode 100644
index 00000000..c3984527
--- /dev/null
+++ b/jpa/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/auditing/AuditableUserRepository.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.data.jpa.example.repository.auditing;
+
+import org.springframework.data.repository.CrudRepository;
+
+/**
+ * @author Oliver Gierke
+ */
+public interface AuditableUserRepository extends CrudRepository {
+
+}
diff --git a/jpa/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/auditing/AuditingConfiguration.java b/jpa/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/auditing/AuditingConfiguration.java
new file mode 100644
index 00000000..0fd712ab
--- /dev/null
+++ b/jpa/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/auditing/AuditingConfiguration.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.data.jpa.example.repository.auditing;
+
+import javax.sql.DataSource;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.Database;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+
+/**
+ * @author Oliver Gierke
+ */
+@Configuration
+@EnableAutoConfiguration
+@EnableJpaAuditing
+@EnableJpaRepositories
+// TODO: Remove once Boot can work with Codd
+class AuditingConfiguration {
+
+ /**
+ * We need to configure a {@link LocalContainerEntityManagerFactoryBean} manually here as Spring does not
+ * automatically add the {@code orm.xml} if a {@code persistence.xml} is located right beside it. This is
+ * necessary to get the {@link org.springframework.data.jpa.example.repository.basics.BasicFactorySetup} sample
+ * working. However, in a {code persistence.xml}-less codebase you can rely on Spring Boot on setting the correct
+ * defaults.
+ *
+ * @return
+ */
+ @Bean
+ LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource) {
+
+ HibernateJpaVendorAdapter adapter = new HibernateJpaVendorAdapter();
+ adapter.setDatabase(Database.HSQL);
+ adapter.setGenerateDdl(true);
+
+ LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean();
+ factoryBean.setPackagesToScan(getClass().getPackage().getName());
+ factoryBean.setMappingResources("META-INF/orm.xml");
+ factoryBean.setJpaVendorAdapter(adapter);
+ factoryBean.setDataSource(dataSource);
+
+ return factoryBean;
+ }
+
+ @Bean
+ AuditorAwareImpl auditorAware() {
+ return new AuditorAwareImpl();
+ }
+}
diff --git a/jpa/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/auditing/AuditorAwareImpl.java b/jpa/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/auditing/AuditorAwareImpl.java
new file mode 100644
index 00000000..2ee7fd6b
--- /dev/null
+++ b/jpa/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/auditing/AuditorAwareImpl.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.data.jpa.example.repository.auditing;
+
+import org.springframework.data.domain.AuditorAware;
+
+/**
+ * Dummy implementation of {@link AuditorAware}. It will return the configured {@link AuditableUser} as auditor on every
+ * call to {@link #getCurrentAuditor()}. Normally you would access the applications security subsystem to return the
+ * current user.
+ *
+ * TODO: change back to {@code AuditorAware} after SD Commons 1.7 RC1 as generic autowiring with Spring 4
+ * will work with that version again.
+ *
+ * @author Oliver Gierke
+ * @author Thomas Darimont
+ */
+public class AuditorAwareImpl implements AuditorAware