diff --git a/src/main/java/org/springframework/data/mapping/context/EntityProjection.java b/src/main/java/org/springframework/data/projection/EntityProjection.java
similarity index 99%
rename from src/main/java/org/springframework/data/mapping/context/EntityProjection.java
rename to src/main/java/org/springframework/data/projection/EntityProjection.java
index 61e5c6873..d9038d295 100644
--- a/src/main/java/org/springframework/data/mapping/context/EntityProjection.java
+++ b/src/main/java/org/springframework/data/projection/EntityProjection.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping.context;
+package org.springframework.data.projection;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,7 +24,6 @@ import java.util.Map;
 import java.util.function.Consumer;
 
 import org.springframework.data.mapping.PropertyPath;
-import org.springframework.data.projection.ProjectionInformation;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.Streamable;
 import org.springframework.data.util.TypeInformation;
diff --git a/src/main/java/org/springframework/data/mapping/context/EntityProjectionIntrospector.java b/src/main/java/org/springframework/data/projection/EntityProjectionIntrospector.java
similarity index 96%
rename from src/main/java/org/springframework/data/mapping/context/EntityProjectionIntrospector.java
rename to src/main/java/org/springframework/data/projection/EntityProjectionIntrospector.java
index 5b51dca5d..c380a4884 100644
--- a/src/main/java/org/springframework/data/mapping/context/EntityProjectionIntrospector.java
+++ b/src/main/java/org/springframework/data/projection/EntityProjectionIntrospector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping.context;
+package org.springframework.data.projection;
 
 import java.beans.PropertyDescriptor;
 import java.util.ArrayList;
@@ -25,9 +25,8 @@ import java.util.Set;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
-import org.springframework.data.mapping.context.EntityProjection.ProjectionType;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.projection.ProjectionInformation;
+import org.springframework.data.projection.EntityProjection.ProjectionType;
+import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Nullable;
@@ -88,7 +87,7 @@ public class EntityProjectionIntrospector {
 	 * @param mappedType must not be {@literal null}.
 	 * @param domainType must not be {@literal null}.
 	 * @return the introspection result.
-	 * @see org.springframework.data.mapping.context.EntityProjection.ContainerPropertyProjection
+	 * @see EntityProjection.ContainerPropertyProjection
 	 */
 	public <M, D> EntityProjection<M, D> introspect(Class<M> mappedType, Class<D> domainType) {
 
diff --git a/src/test/java/org/springframework/data/mapping/context/EntityProjectionIntrospectorUnitTests.java b/src/test/java/org/springframework/data/mapping/context/EntityProjectionIntrospectorUnitTests.java
index 5a1254249..ad48d3804 100644
--- a/src/test/java/org/springframework/data/mapping/context/EntityProjectionIntrospectorUnitTests.java
+++ b/src/test/java/org/springframework/data/mapping/context/EntityProjectionIntrospectorUnitTests.java
@@ -28,6 +28,8 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
+import org.springframework.data.projection.EntityProjection;
+import org.springframework.data.projection.EntityProjectionIntrospector;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 
 /**