diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/Keyspace.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/Keyspace.java
similarity index 96%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/Keyspace.java
rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/Keyspace.java
index 6149ce3f5..7135a475b 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/Keyspace.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/Keyspace.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cassandra.core;
+package org.springframework.data.cassandra.core;
 
 import com.datastax.driver.core.Session;
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/SpringDataKeyspace.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/SpringDataKeyspace.java
index 065d7f7f8..9e1aaa0e3 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/SpringDataKeyspace.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/SpringDataKeyspace.java
@@ -1,6 +1,5 @@
 package org.springframework.data.cassandra.core;
 
-import org.springframework.cassandra.core.Keyspace;
 import org.springframework.data.cassandra.convert.CassandraConverter;
 import org.springframework.util.Assert;