diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterFactoryBean.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraClusterFactoryBean.java
similarity index 97%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterFactoryBean.java
rename to spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraClusterFactoryBean.java
index f6a27af01..ea21b424c 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterFactoryBean.java
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraClusterFactoryBean.java
@@ -13,14 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cassandra.config.xml;
+package org.springframework.cassandra.config;
 
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.cassandra.config.CompressionType;
-import org.springframework.cassandra.config.PoolingOptionsConfig;
-import org.springframework.cassandra.config.SocketOptionsConfig;
 import org.springframework.cassandra.support.CassandraExceptionTranslator;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionFactoryBean.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraSessionFactoryBean.java
similarity index 98%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionFactoryBean.java
rename to spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraSessionFactoryBean.java
index 01396dee3..2a5168db7 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionFactoryBean.java
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraSessionFactoryBean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cassandra.config.xml;
+package org.springframework.cassandra.config;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateFactoryBean.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java
similarity index 97%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateFactoryBean.java
rename to spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java
index cccaad77e..660ac9c85 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateFactoryBean.java
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cassandra.config.xml;
+package org.springframework.cassandra.config;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterParser.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterParser.java
index 4158dedca..e454049c0 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterParser.java
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterParser.java
@@ -23,6 +23,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.cassandra.config.CassandraClusterFactoryBean;
 import org.springframework.cassandra.config.CompressionType;
 import org.springframework.cassandra.config.PoolingOptionsConfig;
 import org.springframework.cassandra.config.SocketOptionsConfig;
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionParser.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionParser.java
index 94ee88a22..7b8c05d92 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionParser.java
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionParser.java
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.cassandra.config.CassandraSessionFactoryBean;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateParser.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateParser.java
index 2fa5d35ad..c796ec9b2 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateParser.java
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateParser.java
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.cassandra.config.CassandraTemplateFactoryBean;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java
index 61bde9db6..79cf57d42 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java
@@ -1,6 +1,6 @@
 package org.springframework.data.cassandra.test.integration.config;
 
-import org.springframework.cassandra.config.xml.CassandraSessionFactoryBean;
+import org.springframework.cassandra.config.CassandraSessionFactoryBean;
 import org.springframework.cassandra.core.CassandraOperations;
 import org.springframework.cassandra.core.CassandraTemplate;
 import org.springframework.context.annotation.Bean;