diff --git a/src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java
index 0fd541695..dd0eb41b5 100644
--- a/src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
 
 /**
diff --git a/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java
index dcd0ee867..e2fab4444 100644
--- a/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java
@@ -17,7 +17,7 @@ package org.springframework.data.jdbc.core;
 
 import java.util.Map;
 
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
 
 /**
diff --git a/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java
index 10ac3128e..c1f0344b3 100644
--- a/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java
@@ -27,11 +27,11 @@ import java.util.stream.StreamSupport;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.NonTransientDataAccessException;
-import org.springframework.data.jdbc.mapping.model.BasicJdbcPersistentEntityInformation;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntityInformation;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.model.BasicJdbcPersistentEntityInformation;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntityInformation;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
 import org.springframework.data.jdbc.support.JdbcUtil;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.PropertyPath;
diff --git a/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java b/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java
index de4482129..bd1e9a026 100644
--- a/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java
+++ b/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java
@@ -24,8 +24,8 @@ import org.springframework.data.jdbc.core.conversion.DbAction.DeleteAll;
 import org.springframework.data.jdbc.core.conversion.DbAction.Insert;
 import org.springframework.data.jdbc.core.conversion.DbAction.Update;
 import org.springframework.data.jdbc.core.conversion.Interpreter;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java
index 34e75a67b..91a360b66 100644
--- a/src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java
@@ -17,7 +17,7 @@ package org.springframework.data.jdbc.core;
 
 import java.util.Map;
 
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java b/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java
index a914fed45..1a11c33d0 100644
--- a/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java
+++ b/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java
@@ -26,9 +26,9 @@ import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.convert.ClassGeneratingEntityInstantiator;
 import org.springframework.data.convert.EntityInstantiator;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
diff --git a/src/main/java/org/springframework/data/jdbc/core/JdbcEntityOperations.java b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateOperations.java
similarity index 96%
rename from src/main/java/org/springframework/data/jdbc/core/JdbcEntityOperations.java
rename to src/main/java/org/springframework/data/jdbc/core/JdbcAggregateOperations.java
index f638fd7a0..f94f173cc 100644
--- a/src/main/java/org/springframework/data/jdbc/core/JdbcEntityOperations.java
+++ b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateOperations.java
@@ -21,7 +21,7 @@ package org.springframework.data.jdbc.core;
  * @author Jens Schauder
  * @since 1.0
  */
-public interface JdbcEntityOperations {
+public interface JdbcAggregateOperations {
 
 	<T> void save(T instance, Class<T> domainType);
 
diff --git a/src/main/java/org/springframework/data/jdbc/core/JdbcEntityTemplate.java b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java
similarity index 84%
rename from src/main/java/org/springframework/data/jdbc/core/JdbcEntityTemplate.java
rename to src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java
index 928fb4b65..853355add 100644
--- a/src/main/java/org/springframework/data/jdbc/core/JdbcEntityTemplate.java
+++ b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java
@@ -23,24 +23,24 @@ import org.springframework.data.jdbc.core.conversion.AggregateChange.Kind;
 import org.springframework.data.jdbc.core.conversion.Interpreter;
 import org.springframework.data.jdbc.core.conversion.JdbcEntityDeleteWriter;
 import org.springframework.data.jdbc.core.conversion.JdbcEntityWriter;
-import org.springframework.data.jdbc.mapping.event.AfterDeleteEvent;
-import org.springframework.data.jdbc.mapping.event.AfterLoadEvent;
-import org.springframework.data.jdbc.mapping.event.AfterSaveEvent;
-import org.springframework.data.jdbc.mapping.event.BeforeDeleteEvent;
-import org.springframework.data.jdbc.mapping.event.BeforeSaveEvent;
-import org.springframework.data.jdbc.mapping.event.Identifier;
-import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntityInformation;
+import org.springframework.data.jdbc.core.mapping.event.AfterDeleteEvent;
+import org.springframework.data.jdbc.core.mapping.event.AfterLoadEvent;
+import org.springframework.data.jdbc.core.mapping.event.AfterSaveEvent;
+import org.springframework.data.jdbc.core.mapping.event.BeforeDeleteEvent;
+import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent;
+import org.springframework.data.jdbc.core.mapping.event.Identifier;
+import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntityInformation;
 
 /**
- * {@link JdbcEntityOperations} implementation, storing aggregates in and obtaining them from a JDBC data store.
+ * {@link JdbcAggregateOperations} implementation, storing aggregates in and obtaining them from a JDBC data store.
  *
  * @author Jens Schauder
  * @author Mark Paluch
  * @since 1.0
  */
-public class JdbcEntityTemplate implements JdbcEntityOperations {
+public class JdbcAggregateTemplate implements JdbcAggregateOperations {
 
 	private final ApplicationEventPublisher publisher;
 	private final JdbcMappingContext context;
@@ -51,8 +51,8 @@ public class JdbcEntityTemplate implements JdbcEntityOperations {
 
 	private final DataAccessStrategy accessStrategy;
 
-	public JdbcEntityTemplate(ApplicationEventPublisher publisher, JdbcMappingContext context,
-			DataAccessStrategy dataAccessStrategy) {
+	public JdbcAggregateTemplate(ApplicationEventPublisher publisher, JdbcMappingContext context,
+								 DataAccessStrategy dataAccessStrategy) {
 
 		this.publisher = publisher;
 		this.context = context;
diff --git a/src/main/java/org/springframework/data/jdbc/core/SelectBuilder.java b/src/main/java/org/springframework/data/jdbc/core/SelectBuilder.java
index 25c8ffd89..bd7f68fce 100644
--- a/src/main/java/org/springframework/data/jdbc/core/SelectBuilder.java
+++ b/src/main/java/org/springframework/data/jdbc/core/SelectBuilder.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 /**
  * Builder for creating Select-statements. Not intended for general purpose, but only for the needs of the
- * {@link JdbcEntityTemplate}.
+ * {@link JdbcAggregateTemplate}.
  *
  * @author Jens Schauder
  * @since 1.0
diff --git a/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java b/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java
index 9e32d070e..a78c9cc58 100644
--- a/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java
+++ b/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java
@@ -15,10 +15,10 @@
  */
 package org.springframework.data.jdbc.core;
 
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
-import org.springframework.data.jdbc.repository.SimpleJdbcRepository;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.repository.support.SimpleJdbcRepository;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.util.Lazy;
diff --git a/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java b/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java
index d70c830f5..c32de536c 100644
--- a/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java
+++ b/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java
@@ -20,7 +20,7 @@ import lombok.RequiredArgsConstructor;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
 
 /**
  * Provides {@link SqlGenerator}s per domain type. Instances get cached, so when asked multiple times for the same domain
diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriter.java b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriter.java
index d73f93f20..d6711e9f6 100644
--- a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriter.java
+++ b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriter.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.jdbc.core.conversion;
 
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
 
 /**
  * Converts an entity that is about to be deleted into {@link DbAction}s inside a {@link AggregateChange} that need to be
diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java
index 4ce1c6bbd..b96ed81ad 100644
--- a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java
+++ b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java
@@ -25,10 +25,10 @@ import java.util.stream.Stream;
 
 import org.springframework.data.jdbc.core.conversion.DbAction.Insert;
 import org.springframework.data.jdbc.core.conversion.DbAction.Update;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntityInformation;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntityInformation;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.util.StreamUtils;
diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterSupport.java b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterSupport.java
index afe0ccc32..f8968ce87 100644
--- a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterSupport.java
+++ b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterSupport.java
@@ -16,7 +16,7 @@
 package org.springframework.data.jdbc.core.conversion;
 
 import org.springframework.data.convert.EntityWriter;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
 
 /**
  * Common infrastructure needed by different implementations of {@link EntityWriter}<Object, AggregateChange>.
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterDeleteEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterDeleteEvent.java
similarity index 91%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/AfterDeleteEvent.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterDeleteEvent.java
index d7599c97d..2ed8b4fc8 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterDeleteEvent.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterDeleteEvent.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
 import java.util.Optional;
 
 import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
+import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
 
 /**
  * Gets published after deletion of an entity. It will have a {@link Specified} identifier. If the entity is empty or
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterLoadEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterLoadEvent.java
similarity index 89%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/AfterLoadEvent.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterLoadEvent.java
index 956bf5bc9..1d30a1ee5 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterLoadEvent.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterLoadEvent.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
-import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
+import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
 
 /**
  * Gets published after instantiation and setting of all the properties of an entity. This allows to do some
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterSaveEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterSaveEvent.java
similarity index 90%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/AfterSaveEvent.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterSaveEvent.java
index 9a9bb05c4..ffa7cc2e7 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterSaveEvent.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterSaveEvent.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
 import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
+import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
 
 /**
  * Subclasses of this get published after a new instance or a changed instance was saved in the database.
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDeleteEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeDeleteEvent.java
similarity index 90%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDeleteEvent.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeDeleteEvent.java
index 9b8b17bb9..f2034a02d 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDeleteEvent.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeDeleteEvent.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
 import java.util.Optional;
 
 import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
+import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
 
 /**
  * Gets published when an entity is about to get deleted.
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSaveEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeSaveEvent.java
similarity index 95%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSaveEvent.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeSaveEvent.java
index 722ce741d..2b62127fe 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSaveEvent.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeSaveEvent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
 import org.springframework.data.jdbc.core.conversion.AggregateChange;
 
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/Identifier.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/Identifier.java
similarity index 97%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/Identifier.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/Identifier.java
index d599076db..7ab52e12b 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/Identifier.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/Identifier.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEvent.java
similarity index 94%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEvent.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEvent.java
index 63aaec060..de66270fe 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEvent.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEvent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithEntity.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithEntity.java
similarity index 95%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithEntity.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithEntity.java
index 4ff53fec3..6e7fe136a 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithEntity.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithEntity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithId.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithId.java
similarity index 85%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithId.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithId.java
index 4e817e6d2..00ad2b354 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithId.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithId.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
 import java.util.Optional;
 
 import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
+import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
 
 /**
  * A {@link SimpleJdbcEvent} guaranteed to have an identifier.
@@ -41,7 +41,7 @@ public class JdbcEventWithId extends SimpleJdbcEvent implements WithId {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.mapping.event.JdbcEvent#getId()
+	 * @see org.springframework.data.jdbc.core.mapping.event.JdbcEvent#getId()
 	 */
 	@Override
 	public Specified getId() {
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithIdAndEntity.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithIdAndEntity.java
similarity index 89%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithIdAndEntity.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithIdAndEntity.java
index 99a7227ff..b40a215e5 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithIdAndEntity.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithIdAndEntity.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
 import lombok.Getter;
 
 import java.util.Optional;
 
 import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
+import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
 
 /**
  * A {@link SimpleJdbcEvent} which is guaranteed to have an identifier and an entity.
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/SimpleJdbcEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/SimpleJdbcEvent.java
similarity index 88%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/SimpleJdbcEvent.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/SimpleJdbcEvent.java
index 8f7babda5..f06ac86db 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/SimpleJdbcEvent.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/SimpleJdbcEvent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
 import java.util.Optional;
 
@@ -45,7 +45,7 @@ class SimpleJdbcEvent extends ApplicationEvent implements JdbcEvent {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.mapping.event.JdbcEvent#getId()
+	 * @see org.springframework.data.jdbc.core.mapping.event.JdbcEvent#getId()
 	 */
 	@Override
 	public Identifier getId() {
@@ -54,7 +54,7 @@ class SimpleJdbcEvent extends ApplicationEvent implements JdbcEvent {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.mapping.event.JdbcEvent#getOptionalEntity()
+	 * @see org.springframework.data.jdbc.core.mapping.event.JdbcEvent#getOptionalEntity()
 	 */
 	@Override
 	public Optional<Object> getOptionalEntity() {
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/SpecifiedIdentifier.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/SpecifiedIdentifier.java
similarity index 82%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/SpecifiedIdentifier.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/SpecifiedIdentifier.java
index 932249a43..f23ad1003 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/SpecifiedIdentifier.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/SpecifiedIdentifier.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
 import lombok.Value;
 
 import java.util.Optional;
 
-import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
+import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
 
 /**
  * Simple value object for {@link Specified}.
@@ -35,7 +35,7 @@ class SpecifiedIdentifier implements Specified {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.mapping.event.Identifier#getOptionalValue()
+	 * @see org.springframework.data.jdbc.core.mapping.event.Identifier#getOptionalValue()
 	 */
 	@Override
 	public Optional<? extends Object> getOptionalValue() {
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/Unset.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/Unset.java
similarity index 86%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/Unset.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/Unset.java
index 0509aff42..436db34fb 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/Unset.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/Unset.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
 import java.util.Optional;
 
@@ -30,7 +30,7 @@ enum Unset implements Identifier {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.mapping.event.Identifier#getOptionalValue()
+	 * @see org.springframework.data.jdbc.core.mapping.event.Identifier#getOptionalValue()
 	 */
 	@Override
 	public Optional<Object> getOptionalValue() {
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/WithEntity.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/WithEntity.java
similarity index 94%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/WithEntity.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/WithEntity.java
index fa3f29e4f..324a26500 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/WithEntity.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/WithEntity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
 /**
  * Interface for {@link SimpleJdbcEvent}s which are guaranteed to have an entity. Allows direct access to that entity,
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/WithId.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/WithId.java
similarity index 87%
rename from src/main/java/org/springframework/data/jdbc/mapping/event/WithId.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/WithId.java
index e3c06ecd0..be03ed532 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/event/WithId.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/WithId.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.event;
+package org.springframework.data.jdbc.core.mapping.event;
 
-import org.springframework.data.jdbc.mapping.event.Identifier.Specified;
+import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
 
 /**
  * Interface for {@link SimpleJdbcEvent}s which are guaranteed to have a {@link Specified} identifier. Offers direct
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentEntityInformation.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformation.java
similarity index 90%
rename from src/main/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentEntityInformation.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformation.java
index b9563f646..08a575767 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentEntityInformation.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 import org.springframework.data.domain.Persistable;
 import org.springframework.data.repository.core.support.PersistentEntityInformation;
@@ -49,7 +49,7 @@ public class BasicJdbcPersistentEntityInformation<T, ID> extends PersistentEntit
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.mapping.model.JdbcPersistentEntityInformation#setId(java.lang.Object, java.util.Optional)
+	 * @see org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntityInformation#setId(java.lang.Object, java.util.Optional)
 	 */
 	@Override
 	public void setId(T instance, Object value) {
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentProperty.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentProperty.java
similarity index 96%
rename from src/main/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentProperty.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentProperty.java
index 9b603f170..42d21e655 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentProperty.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentProperty.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 import java.time.ZonedDateTime;
 import java.time.temporal.Temporal;
@@ -83,7 +83,7 @@ public class BasicJdbcPersistentProperty extends AnnotationBasedPersistentProper
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty#getColumnName()
+	 * @see org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty#getColumnName()
 	 */
 	public String getColumnName() {
 		return columnName.get().orElseGet(() -> context.getNamingStrategy().getColumnName(this));
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/ConversionCustomizer.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/ConversionCustomizer.java
similarity index 93%
rename from src/main/java/org/springframework/data/jdbc/mapping/model/ConversionCustomizer.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/ConversionCustomizer.java
index 23b2a6300..13f932dfd 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/model/ConversionCustomizer.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/ConversionCustomizer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 import org.springframework.core.convert.support.GenericConversionService;
 
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/DelimiterNamingStrategy.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategy.java
similarity index 97%
rename from src/main/java/org/springframework/data/jdbc/mapping/model/DelimiterNamingStrategy.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategy.java
index 1cbb8e620..1520130a6 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/model/DelimiterNamingStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 import org.springframework.data.util.ParsingUtils;
 
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContext.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContext.java
similarity index 98%
rename from src/main/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContext.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContext.java
index 940265d2b..4c39705b2 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContext.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 import static java.util.Arrays.*;
 
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntity.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntity.java
similarity index 95%
rename from src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntity.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntity.java
index 04cda1f77..fa203d05b 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntity.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 import org.springframework.data.mapping.model.MutablePersistentEntity;
 
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntityImpl.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityImpl.java
similarity index 93%
rename from src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntityImpl.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityImpl.java
index 3a2607b64..b6c7d4c95 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntityImpl.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 import java.util.Optional;
 
@@ -58,7 +58,7 @@ class JdbcPersistentEntityImpl<T> extends BasicPersistentEntity<T, JdbcPersisten
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity#getIdColumn()
+	 * @see org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity#getIdColumn()
 	 */
 	@Override
 	public String getIdColumn() {
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntityInformation.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityInformation.java
similarity index 95%
rename from src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntityInformation.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityInformation.java
index 015911797..4b39682b8 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntityInformation.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityInformation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 import org.springframework.data.repository.core.EntityInformation;
 
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentProperty.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentProperty.java
similarity index 96%
rename from src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentProperty.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentProperty.java
index 83082a27d..8caf0a2e0 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentProperty.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentProperty.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 import org.springframework.data.mapping.PersistentProperty;
 
diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/NamingStrategy.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/NamingStrategy.java
similarity index 97%
rename from src/main/java/org/springframework/data/jdbc/mapping/model/NamingStrategy.java
rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/NamingStrategy.java
index 28b3f3922..93b9cbb6d 100644
--- a/src/main/java/org/springframework/data/jdbc/mapping/model/NamingStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/NamingStrategy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 /**
  * Interface and default implementation of a naming strategy. Defaults to no schema, table name based on {@link Class}
diff --git a/src/main/java/org/springframework/data/jdbc/domain/support/JdbcAuditingEventListener.java b/src/main/java/org/springframework/data/jdbc/domain/support/JdbcAuditingEventListener.java
index f9eab54dd..671a3ea24 100644
--- a/src/main/java/org/springframework/data/jdbc/domain/support/JdbcAuditingEventListener.java
+++ b/src/main/java/org/springframework/data/jdbc/domain/support/JdbcAuditingEventListener.java
@@ -19,7 +19,7 @@ import lombok.RequiredArgsConstructor;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.data.auditing.AuditingHandler;
-import org.springframework.data.jdbc.mapping.event.BeforeSaveEvent;
+import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
 import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntityInformation;
 import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing;
diff --git a/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java
index 9087f688d..5c8f4b2a5 100644
--- a/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java
@@ -27,8 +27,8 @@ import org.springframework.data.jdbc.core.DataAccessStrategy;
 import org.springframework.data.jdbc.core.DefaultDataAccessStrategy;
 import org.springframework.data.jdbc.core.DelegatingDataAccessStrategy;
 import org.springframework.data.jdbc.core.SqlGeneratorSource;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.util.Assert;
diff --git a/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java b/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
index bcd29cf70..8f9f3bfb7 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
@@ -19,9 +19,11 @@ import java.util.Optional;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jdbc.mapping.model.ConversionCustomizer;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.NamingStrategy;
+import org.springframework.data.jdbc.core.mapping.model.ConversionCustomizer;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.NamingStrategy;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 
 /**
  * Beans that must be registered for Spring Data JDBC to work.
diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java
index f17ff547b..d34037f9e 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java
@@ -20,7 +20,7 @@ import java.lang.reflect.Method;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
 import org.springframework.data.jdbc.core.EntityRowMapper;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
 import org.springframework.data.jdbc.repository.RowMapperMap;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.core.NamedQueries;
diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactory.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactory.java
index 5df09c386..809e2484b 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactory.java
@@ -19,11 +19,10 @@ import java.util.Optional;
 
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
-import org.springframework.data.jdbc.core.JdbcEntityTemplate;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntityInformation;
+import org.springframework.data.jdbc.core.JdbcAggregateTemplate;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntityInformation;
 import org.springframework.data.jdbc.repository.RowMapperMap;
-import org.springframework.data.jdbc.repository.SimpleJdbcRepository;
 import org.springframework.data.repository.core.EntityInformation;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.RepositoryMetadata;
@@ -98,7 +97,7 @@ public class JdbcRepositoryFactory extends RepositoryFactorySupport {
 		JdbcPersistentEntityInformation<?, ?> persistentEntityInformation = context
 				.getRequiredPersistentEntityInformation(repositoryInformation.getDomainType());
 
-		JdbcEntityTemplate template = new JdbcEntityTemplate(publisher, context, accessStrategy);
+		JdbcAggregateTemplate template = new JdbcAggregateTemplate(publisher, context, accessStrategy);
 
 		return new SimpleJdbcRepository<>(template, persistentEntityInformation);
 	}
diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java
index 331836953..940abd82b 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java
@@ -23,7 +23,7 @@ import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
 import org.springframework.data.jdbc.core.DefaultDataAccessStrategy;
 import org.springframework.data.jdbc.core.SqlGeneratorSource;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
 import org.springframework.data.jdbc.repository.RowMapperMap;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java
index f0f9e7e60..929d4f44d 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java
@@ -17,7 +17,7 @@ package org.springframework.data.jdbc.repository.support;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
diff --git a/src/main/java/org/springframework/data/jdbc/repository/SimpleJdbcRepository.java b/src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java
similarity index 85%
rename from src/main/java/org/springframework/data/jdbc/repository/SimpleJdbcRepository.java
rename to src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java
index 13cd83e21..95c19c9e3 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/SimpleJdbcRepository.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.repository;
+package org.springframework.data.jdbc.repository.support;
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
@@ -22,8 +22,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import org.springframework.data.jdbc.core.JdbcEntityOperations;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntityInformation;
+import org.springframework.data.jdbc.core.JdbcAggregateOperations;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntityInformation;
 import org.springframework.data.repository.CrudRepository;
 
 /**
@@ -34,8 +34,19 @@ import org.springframework.data.repository.CrudRepository;
 @RequiredArgsConstructor
 public class SimpleJdbcRepository<T, ID> implements CrudRepository<T, ID> {
 
-	private final @NonNull JdbcEntityOperations entityOperations;
-	private final @NonNull JdbcPersistentEntityInformation<T, ID> entityInformation;
+	private final JdbcPersistentEntityInformation<T, ID> entityInformation;
+
+	private final JdbcAggregateOperations entityOperations;
+
+	/**
+	 * Creates a new {@link SimpleJdbcRepository}.
+	 */
+	public SimpleJdbcRepository(JdbcAggregateTemplate entityOperations,
+			JdbcPersistentEntityInformation<T, ID> entityInformation) {
+
+		this.entityOperations = entityOperations;
+		this.entityInformation = entityInformation;
+	}
 
 	/*
 	 * (non-Javadoc)
diff --git a/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java
index 2313da7ae..7061bfd6f 100644
--- a/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java
@@ -25,7 +25,7 @@ import java.util.Collections;
 
 import org.junit.Test;
 import org.springframework.data.jdbc.core.FunctionCollector.CombinedDataAccessException;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
 
 /**
  * Unit tests for {@link CascadingDataAccessStrategy}.
diff --git a/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java
index 3b67d0f37..cfe017a47 100644
--- a/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java
@@ -26,7 +26,8 @@ import java.util.HashMap;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.NamingStrategy;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.jdbc.support.KeyHolder;
diff --git a/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java
index b02edb9f5..714e9ee84 100644
--- a/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java
@@ -28,9 +28,10 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.jdbc.core.conversion.DbAction;
 import org.springframework.data.jdbc.core.conversion.DbAction.Insert;
 import org.springframework.data.jdbc.core.conversion.JdbcPropertyPath;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
-import org.springframework.data.jdbc.mapping.model.NamingStrategy;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.model.NamingStrategy;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 
 /**
  * Unit tests for {@link DefaultJdbcInterpreter}
diff --git a/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java
index 779c588e0..c4fcfb10e 100644
--- a/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java
@@ -41,10 +41,11 @@ import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.convert.Jsr310Converters;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
-import org.springframework.data.jdbc.mapping.model.NamingStrategy;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.model.NamingStrategy;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.util.Assert;
 
 /**
diff --git a/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java
index e2f0bfe6f..f0e7877f1 100644
--- a/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java
@@ -31,7 +31,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
 import org.springframework.data.jdbc.testing.TestConfiguration;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.rules.SpringClassRule;
@@ -39,7 +39,7 @@ import org.springframework.test.context.junit4.rules.SpringMethodRule;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
- * Integration tests for {@link JdbcEntityTemplate}.
+ * Integration tests for {@link JdbcAggregateTemplate}.
  *
  * @author Jens Schauder
  */
@@ -49,7 +49,8 @@ public class JdbcEntityTemplateIntegrationTests {
 
 	@ClassRule public static final SpringClassRule classRule = new SpringClassRule();
 	@Rule public SpringMethodRule methodRule = new SpringMethodRule();
-	@Autowired JdbcEntityOperations template;
+	@Autowired
+	JdbcAggregateOperations template;
 
 	LegoSet legoSet = createLegoSet();
 
@@ -250,8 +251,8 @@ public class JdbcEntityTemplateIntegrationTests {
 		}
 
 		@Bean
-		JdbcEntityOperations operations(ApplicationEventPublisher publisher, JdbcMappingContext context, DataAccessStrategy dataAccessStrategy) {
-			return new JdbcEntityTemplate(publisher, context, dataAccessStrategy);
+		JdbcAggregateOperations operations(ApplicationEventPublisher publisher, JdbcMappingContext context, DataAccessStrategy dataAccessStrategy) {
+			return new JdbcAggregateTemplate(publisher, context, dataAccessStrategy);
 		}
 	}
 }
diff --git a/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java
index 3c9a57c23..998177486 100644
--- a/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java
@@ -27,7 +27,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
 import org.springframework.data.jdbc.mybatis.MyBatisContext;
 import org.springframework.data.jdbc.mybatis.MyBatisDataAccessStrategy;
 import org.springframework.data.mapping.PropertyPath;
diff --git a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java
index 1d90f0f2d..a40f84656 100644
--- a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java
@@ -24,9 +24,9 @@ import java.util.function.Consumer;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.Test;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity;
-import org.springframework.data.jdbc.mapping.model.NamingStrategy;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity;
+import org.springframework.data.jdbc.core.mapping.model.NamingStrategy;
 import org.springframework.data.mapping.PropertyPath;
 
 /**
diff --git a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java
index 394b6f0f5..07c81d599 100644
--- a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java
@@ -20,10 +20,10 @@ import static org.assertj.core.api.Assertions.*;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.Test;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
-import org.springframework.data.jdbc.mapping.model.NamingStrategy;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.model.NamingStrategy;
 import org.springframework.data.mapping.PropertyPath;
 
 /**
diff --git a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java
index f9012b5c2..97b627e81 100644
--- a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java
@@ -24,10 +24,10 @@ import org.assertj.core.api.SoftAssertions;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity;
-import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
-import org.springframework.data.jdbc.mapping.model.NamingStrategy;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity;
+import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.model.NamingStrategy;
 import org.springframework.data.mapping.PropertyPath;
 
 /**
diff --git a/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriterUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriterUnitTests.java
index c3308ee43..2f415dc53 100644
--- a/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriterUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriterUnitTests.java
@@ -25,7 +25,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.jdbc.core.conversion.AggregateChange.Kind;
 import org.springframework.data.jdbc.core.conversion.DbAction.Delete;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
 
 /**
  * Unit tests for the {@link JdbcEntityDeleteWriter}
diff --git a/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterUnitTests.java
index 329262d53..c2b35425c 100644
--- a/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterUnitTests.java
@@ -34,7 +34,7 @@ import org.springframework.data.jdbc.core.conversion.AggregateChange.Kind;
 import org.springframework.data.jdbc.core.conversion.DbAction.Delete;
 import org.springframework.data.jdbc.core.conversion.DbAction.Insert;
 import org.springframework.data.jdbc.core.conversion.DbAction.Update;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
 
 /**
  * Unit tests for the {@link JdbcEntityWriter}
diff --git a/src/test/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java
similarity index 97%
rename from src/test/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java
rename to src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java
index 19c3efebd..7d23de0fb 100644
--- a/src/test/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 import static org.assertj.core.api.Assertions.*;
 
diff --git a/src/test/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentPropertyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentPropertyUnitTests.java
similarity index 97%
rename from src/test/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentPropertyUnitTests.java
rename to src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentPropertyUnitTests.java
index 27a4697f1..feb28e149 100644
--- a/src/test/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentPropertyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentPropertyUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 import static org.assertj.core.api.Assertions.*;
 
diff --git a/src/test/java/org/springframework/data/jdbc/mapping/model/DelimiterNamingStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategyUnitTests.java
similarity index 97%
rename from src/test/java/org/springframework/data/jdbc/mapping/model/DelimiterNamingStrategyUnitTests.java
rename to src/test/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategyUnitTests.java
index c9c8ec7e2..eabf42c8e 100644
--- a/src/test/java/org/springframework/data/jdbc/mapping/model/DelimiterNamingStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategyUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 import static org.assertj.core.api.Assertions.*;
 
diff --git a/src/test/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContextUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContextUnitTests.java
similarity index 96%
rename from src/test/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContextUnitTests.java
rename to src/test/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContextUnitTests.java
index 9a36dc6e2..2094a37e2 100644
--- a/src/test/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContextUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContextUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.mapping.model;
+package org.springframework.data.jdbc.core.mapping.model;
 
 import static org.assertj.core.api.Assertions.*;
 
diff --git a/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java
index e367c7bbe..edf59b689 100644
--- a/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java
@@ -31,7 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
 import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import org.springframework.data.jdbc.testing.TestConfiguration;
 import org.springframework.data.repository.CrudRepository;
diff --git a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java
index b9d4e4b28..3d1351ed5 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java
@@ -29,9 +29,10 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.mapping.model.NamingStrategy;
+import org.springframework.data.jdbc.core.mapping.model.NamingStrategy;
 import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
+import org.springframework.data.jdbc.repository.support.SimpleJdbcRepository;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java
index 3bc888cb9..c094d129d 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java
@@ -38,8 +38,8 @@ import org.springframework.context.annotation.Import;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.PersistenceConstructor;
 import org.springframework.data.jdbc.core.conversion.DbAction;
-import org.springframework.data.jdbc.mapping.event.BeforeDeleteEvent;
-import org.springframework.data.jdbc.mapping.event.BeforeSaveEvent;
+import org.springframework.data.jdbc.core.mapping.event.BeforeDeleteEvent;
+import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import org.springframework.data.jdbc.testing.TestConfiguration;
 import org.springframework.data.repository.CrudRepository;
diff --git a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java
index cf09a7b4f..47d7b408c 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java
@@ -39,7 +39,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.jdbc.mapping.event.BeforeSaveEvent;
+import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
 import org.springframework.data.jdbc.testing.TestConfiguration;
 import org.springframework.data.repository.CrudRepository;
diff --git a/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java
index 6b77ba792..4bfadb99b 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java
@@ -36,15 +36,16 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.jdbc.core.DefaultDataAccessStrategy;
 import org.springframework.data.jdbc.core.SqlGeneratorSource;
-import org.springframework.data.jdbc.mapping.event.AfterDeleteEvent;
-import org.springframework.data.jdbc.mapping.event.AfterLoadEvent;
-import org.springframework.data.jdbc.mapping.event.AfterSaveEvent;
-import org.springframework.data.jdbc.mapping.event.BeforeDeleteEvent;
-import org.springframework.data.jdbc.mapping.event.BeforeSaveEvent;
-import org.springframework.data.jdbc.mapping.event.Identifier;
-import org.springframework.data.jdbc.mapping.event.JdbcEvent;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.event.AfterDeleteEvent;
+import org.springframework.data.jdbc.core.mapping.event.AfterLoadEvent;
+import org.springframework.data.jdbc.core.mapping.event.AfterSaveEvent;
+import org.springframework.data.jdbc.core.mapping.event.BeforeDeleteEvent;
+import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent;
+import org.springframework.data.jdbc.core.mapping.event.Identifier;
+import org.springframework.data.jdbc.core.mapping.event.JdbcEvent;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
 import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
+import org.springframework.data.jdbc.repository.support.SimpleJdbcRepository;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
diff --git a/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java
index 317f76756..08e9b6380 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java
@@ -39,7 +39,7 @@ import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.auditing.DateTimeProvider;
 import org.springframework.data.domain.AuditorAware;
-import org.springframework.data.jdbc.mapping.model.NamingStrategy;
+import org.springframework.data.jdbc.core.mapping.model.NamingStrategy;
 import org.springframework.data.repository.CrudRepository;
 
 /**
diff --git a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java
index 6abd28ea5..3b7d8d3f8 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java
@@ -24,7 +24,7 @@ import java.text.NumberFormat;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
 import org.springframework.data.jdbc.repository.RowMapperMap;
 import org.springframework.data.jdbc.repository.config.ConfigurableRowMapperMap;
 import org.springframework.data.jdbc.repository.query.Query;
diff --git a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java
index 4fd6beb54..cdce7a9bc 100644
--- a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java
@@ -28,7 +28,7 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
 import org.springframework.data.jdbc.core.DefaultDataAccessStrategy;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
 import org.springframework.data.jdbc.repository.RowMapperMap;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.test.util.ReflectionTestUtils;
diff --git a/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java b/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java
index 70257be2e..e47915e54 100644
--- a/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java
+++ b/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java
@@ -28,9 +28,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
 import org.springframework.data.jdbc.core.DefaultDataAccessStrategy;
 import org.springframework.data.jdbc.core.SqlGeneratorSource;
-import org.springframework.data.jdbc.mapping.model.ConversionCustomizer;
-import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
-import org.springframework.data.jdbc.mapping.model.NamingStrategy;
+import org.springframework.data.jdbc.core.mapping.model.ConversionCustomizer;
+import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.model.NamingStrategy;
 import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;