diff --git a/spring-data-commons-core/src/main/java/org/springframework/datastore/annotation/Indexed.java b/spring-data-commons-core/src/main/java/org/springframework/data/annotation/Indexed.java
similarity index 83%
rename from spring-data-commons-core/src/main/java/org/springframework/datastore/annotation/Indexed.java
rename to spring-data-commons-core/src/main/java/org/springframework/data/annotation/Indexed.java
index a692f122f..2d020d4b6 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/datastore/annotation/Indexed.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/annotation/Indexed.java
@@ -1,4 +1,4 @@
-package org.springframework.datastore.annotation;
+package org.springframework.data.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-data-commons-core/src/main/java/org/springframework/datastore/serialization/SerializationStore.java b/spring-data-commons-core/src/main/java/org/springframework/data/serialization/SerializationStore.java
similarity index 80%
rename from spring-data-commons-core/src/main/java/org/springframework/datastore/serialization/SerializationStore.java
rename to spring-data-commons-core/src/main/java/org/springframework/data/serialization/SerializationStore.java
index 0c430c311..dd4bd317c 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/datastore/serialization/SerializationStore.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/serialization/SerializationStore.java
@@ -1,4 +1,4 @@
-package org.springframework.datastore.serialization;
+package org.springframework.data.serialization;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.RetentionPolicy;