diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/exception/UnsupportedCassandraOperationException.java b/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java
similarity index 88%
rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/exception/UnsupportedCassandraOperationException.java
rename to spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java
index 2a12a7942..b59266fe2 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/exception/UnsupportedCassandraOperationException.java
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java
@@ -1,4 +1,4 @@
-package org.springframework.data.cassandra.exception;
+package org.springframework.cassandra.support.exception;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntity.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntity.java
index 74fb9fd2c..a525fee58 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntity.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntity.java
@@ -16,11 +16,11 @@
 package org.springframework.data.cassandra.mapping;
 
 import org.springframework.beans.BeansException;
+import org.springframework.cassandra.support.exception.UnsupportedCassandraOperationException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.expression.BeanFactoryAccessor;
 import org.springframework.context.expression.BeanFactoryResolver;
-import org.springframework.data.cassandra.exception.UnsupportedCassandraOperationException;
 import org.springframework.data.cassandra.util.CassandraNamingUtils;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.AssociationHandler;