diff --git a/persistence-modules/hbase/README.md b/persistence-modules/hbase/README.md
index df2683b27a..ea76c4ec4b 100644
--- a/persistence-modules/hbase/README.md
+++ b/persistence-modules/hbase/README.md
@@ -1,3 +1,3 @@
 ### Relevant articles
 
-- [HBase with Java](http://www.baeldung.com/hbase)
+- [HBase with Java](https://www.baeldung.com/hbase)
diff --git a/persistence-modules/hbase/src/main/java/org/baeldung/hbase/HBaseClientOperations.java b/persistence-modules/hbase/src/main/java/com/baeldung/hbase/HBaseClientOperations.java
similarity index 99%
rename from persistence-modules/hbase/src/main/java/org/baeldung/hbase/HBaseClientOperations.java
rename to persistence-modules/hbase/src/main/java/com/baeldung/hbase/HBaseClientOperations.java
index c78eacc834..f889e2eb56 100644
--- a/persistence-modules/hbase/src/main/java/org/baeldung/hbase/HBaseClientOperations.java
+++ b/persistence-modules/hbase/src/main/java/com/baeldung/hbase/HBaseClientOperations.java
@@ -1,4 +1,4 @@
-package org.baeldung.hbase;
+package com.baeldung.hbase;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HColumnDescriptor;
diff --git a/persistence-modules/hbase/src/main/java/org/baeldung/hbase/HbaseClientExample.java b/persistence-modules/hbase/src/main/java/com/baeldung/hbase/HbaseClientExample.java
similarity index 97%
rename from persistence-modules/hbase/src/main/java/org/baeldung/hbase/HbaseClientExample.java
rename to persistence-modules/hbase/src/main/java/com/baeldung/hbase/HbaseClientExample.java
index 07cb7df480..5546f15e36 100644
--- a/persistence-modules/hbase/src/main/java/org/baeldung/hbase/HbaseClientExample.java
+++ b/persistence-modules/hbase/src/main/java/com/baeldung/hbase/HbaseClientExample.java
@@ -1,4 +1,4 @@
-package org.baeldung.hbase;
+package com.baeldung.hbase;
 
 
 import com.google.protobuf.ServiceException;
diff --git a/persistence-modules/querydsl/README.md b/persistence-modules/querydsl/README.md
index 77b9fd6baf..03e113795d 100644
--- a/persistence-modules/querydsl/README.md
+++ b/persistence-modules/querydsl/README.md
@@ -1,3 +1,3 @@
 ### Relevant Articles:
-- [Intro to Querydsl](http://www.baeldung.com/intro-to-querydsl)
-- [A Guide to Querydsl with JPA](http://www.baeldung.com/querydsl-with-jpa-tutorial)
+- [Intro to Querydsl](https://www.baeldung.com/intro-to-querydsl)
+- [A Guide to Querydsl with JPA](https://www.baeldung.com/querydsl-with-jpa-tutorial)
diff --git a/persistence-modules/querydsl/src/main/java/org/baeldung/dao/PersonDao.java b/persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDao.java
similarity index 88%
rename from persistence-modules/querydsl/src/main/java/org/baeldung/dao/PersonDao.java
rename to persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDao.java
index 7df4ebb22d..fb39821981 100644
--- a/persistence-modules/querydsl/src/main/java/org/baeldung/dao/PersonDao.java
+++ b/persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDao.java
@@ -1,9 +1,9 @@
-package org.baeldung.dao;
+package com.baeldung.dao;
 
 import java.util.List;
 import java.util.Map;
 
-import org.baeldung.entity.Person;
+import com.baeldung.entity.Person;
 
 public interface PersonDao {
 
diff --git a/persistence-modules/querydsl/src/main/java/org/baeldung/dao/PersonDaoImpl.java b/persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDaoImpl.java
similarity index 95%
rename from persistence-modules/querydsl/src/main/java/org/baeldung/dao/PersonDaoImpl.java
rename to persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDaoImpl.java
index 9acaf1dd18..20ebe0e3fe 100644
--- a/persistence-modules/querydsl/src/main/java/org/baeldung/dao/PersonDaoImpl.java
+++ b/persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDaoImpl.java
@@ -1,17 +1,15 @@
-package org.baeldung.dao;
+package com.baeldung.dao;
 
-import java.util.List;
-import java.util.Map;
+import com.baeldung.entity.Person;
+import com.baeldung.entity.QPerson;
+import com.querydsl.core.group.GroupBy;
+import com.querydsl.jpa.impl.JPAQuery;
+import org.springframework.stereotype.Repository;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-
-import org.baeldung.entity.Person;
-import org.baeldung.entity.QPerson;
-import org.springframework.stereotype.Repository;
-
-import com.querydsl.core.group.GroupBy;
-import com.querydsl.jpa.impl.JPAQuery;
+import java.util.List;
+import java.util.Map;
 
 @Repository
 public class PersonDaoImpl implements PersonDao {
diff --git a/persistence-modules/querydsl/src/main/java/org/baeldung/entity/Person.java b/persistence-modules/querydsl/src/main/java/com/baeldung/entity/Person.java
similarity index 97%
rename from persistence-modules/querydsl/src/main/java/org/baeldung/entity/Person.java
rename to persistence-modules/querydsl/src/main/java/com/baeldung/entity/Person.java
index 6f04210d90..310f21ab2a 100644
--- a/persistence-modules/querydsl/src/main/java/org/baeldung/entity/Person.java
+++ b/persistence-modules/querydsl/src/main/java/com/baeldung/entity/Person.java
@@ -1,4 +1,4 @@
-package org.baeldung.entity;
+package com.baeldung.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/persistence-modules/querydsl/src/main/java/org/baeldung/querydsl/intro/entities/BlogPost.java b/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/BlogPost.java
similarity index 95%
rename from persistence-modules/querydsl/src/main/java/org/baeldung/querydsl/intro/entities/BlogPost.java
rename to persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/BlogPost.java
index 241bc50b03..6712ad08d5 100644
--- a/persistence-modules/querydsl/src/main/java/org/baeldung/querydsl/intro/entities/BlogPost.java
+++ b/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/BlogPost.java
@@ -1,7 +1,7 @@
 /*
  * (c) Центр ИТ, 2016. Все права защищены.
  */
-package org.baeldung.querydsl.intro.entities;
+package com.baeldung.querydsl.intro.entities;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/persistence-modules/querydsl/src/main/java/org/baeldung/querydsl/intro/entities/User.java b/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/User.java
similarity index 95%
rename from persistence-modules/querydsl/src/main/java/org/baeldung/querydsl/intro/entities/User.java
rename to persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/User.java
index c0681e15d1..4111284d5a 100644
--- a/persistence-modules/querydsl/src/main/java/org/baeldung/querydsl/intro/entities/User.java
+++ b/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/User.java
@@ -1,7 +1,7 @@
 /*
  * (c) Центр ИТ, 2016. Все права защищены.
  */
-package org.baeldung.querydsl.intro.entities;
+package com.baeldung.querydsl.intro.entities;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/persistence-modules/querydsl/src/main/resources/META-INF/persistence.xml b/persistence-modules/querydsl/src/main/resources/META-INF/persistence.xml
index 2964382d48..4b51cb444b 100644
--- a/persistence-modules/querydsl/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/querydsl/src/main/resources/META-INF/persistence.xml
@@ -17,7 +17,7 @@
     </persistence-unit>
 
     <!-- PersistenceUnit for Intro to QueryDSL -->
-    <persistence-unit name="org.baeldung.querydsl.intro">
+    <persistence-unit name="com.baeldung.querydsl.intro">
         <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
         <properties>
             <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
diff --git a/persistence-modules/querydsl/src/test/java/org/baeldung/dao/PersonDaoIntegrationTest.java b/persistence-modules/querydsl/src/test/java/com/baeldung/dao/PersonDaoIntegrationTest.java
similarity index 97%
rename from persistence-modules/querydsl/src/test/java/org/baeldung/dao/PersonDaoIntegrationTest.java
rename to persistence-modules/querydsl/src/test/java/com/baeldung/dao/PersonDaoIntegrationTest.java
index a666aea8da..cf4e9ab872 100644
--- a/persistence-modules/querydsl/src/test/java/org/baeldung/dao/PersonDaoIntegrationTest.java
+++ b/persistence-modules/querydsl/src/test/java/com/baeldung/dao/PersonDaoIntegrationTest.java
@@ -1,8 +1,8 @@
-package org.baeldung.dao;
+package com.baeldung.dao;
 
 import java.util.Map;
 
-import org.baeldung.entity.Person;
+import com.baeldung.entity.Person;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/persistence-modules/querydsl/src/test/java/org/baeldung/querydsl/intro/QueryDSLIntegrationTest.java b/persistence-modules/querydsl/src/test/java/com/baeldung/querydsl/intro/QueryDSLIntegrationTest.java
similarity index 94%
rename from persistence-modules/querydsl/src/test/java/org/baeldung/querydsl/intro/QueryDSLIntegrationTest.java
rename to persistence-modules/querydsl/src/test/java/com/baeldung/querydsl/intro/QueryDSLIntegrationTest.java
index 15a32b8df5..7ae97c2880 100644
--- a/persistence-modules/querydsl/src/test/java/org/baeldung/querydsl/intro/QueryDSLIntegrationTest.java
+++ b/persistence-modules/querydsl/src/test/java/com/baeldung/querydsl/intro/QueryDSLIntegrationTest.java
@@ -1,17 +1,17 @@
 /*
  * (c) Центр ИТ, 2016. Все права защищены.
  */
-package org.baeldung.querydsl.intro;
+package com.baeldung.querydsl.intro;
 
+import com.baeldung.querydsl.intro.entities.BlogPost;
+import com.baeldung.querydsl.intro.entities.QBlogPost;
+import com.baeldung.querydsl.intro.entities.QUser;
+import com.baeldung.querydsl.intro.entities.User;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.NumberPath;
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import org.baeldung.querydsl.intro.entities.BlogPost;
-import org.baeldung.querydsl.intro.entities.QBlogPost;
-import org.baeldung.querydsl.intro.entities.QUser;
-import org.baeldung.querydsl.intro.entities.User;
 import org.junit.*;
 
 import javax.persistence.EntityManager;
@@ -31,7 +31,7 @@ public class QueryDSLIntegrationTest {
 
     @BeforeClass
     public static void populateDatabase() {
-        emf = Persistence.createEntityManagerFactory("org.baeldung.querydsl.intro");
+        emf = Persistence.createEntityManagerFactory("com.baeldung.querydsl.intro");
         EntityManager em = emf.createEntityManager();
 
         em.getTransaction().begin();
diff --git a/persistence-modules/querydsl/src/test/resources/test-context.xml b/persistence-modules/querydsl/src/test/resources/test-context.xml
index 13d823a857..1503364320 100644
--- a/persistence-modules/querydsl/src/test/resources/test-context.xml
+++ b/persistence-modules/querydsl/src/test/resources/test-context.xml
@@ -13,7 +13,7 @@
         >
 
     <tx:annotation-driven />
-    <context:component-scan base-package="org.baeldung" />
+    <context:component-scan base-package="com.baeldung" />
 
     <import resource="test-db.xml" />
 
diff --git a/persistence-modules/r2dbc/pom.xml b/persistence-modules/r2dbc/pom.xml
index 2c06931487..55197ad560 100644
--- a/persistence-modules/r2dbc/pom.xml
+++ b/persistence-modules/r2dbc/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.baeldung.examples.r2dbc</groupId>
+    <groupId>com.baeldung.examples.r2dbc</groupId>
     <artifactId>r2dbc-example</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>r2dbc-example</name>
diff --git a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/Account.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/Account.java
similarity index 96%
rename from persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/Account.java
rename to persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/Account.java
index 65bf33168e..0310cd94b6 100644
--- a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/Account.java
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/Account.java
@@ -1,4 +1,4 @@
-package org.baeldung.examples.r2dbc;
+package com.baeldung.examples.r2dbc;
 
 import java.math.BigDecimal;
 
diff --git a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/AccountResource.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/AccountResource.java
similarity index 87%
rename from persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/AccountResource.java
rename to persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/AccountResource.java
index 90816a7522..5b0d0cded3 100644
--- a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/AccountResource.java
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/AccountResource.java
@@ -1,12 +1,8 @@
 /**
  * 
  */
-package org.baeldung.examples.r2dbc;
+package com.baeldung.examples.r2dbc;
 
-import java.math.BigDecimal;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,8 +11,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import io.r2dbc.spi.Connection;
-import io.r2dbc.spi.ConnectionFactory;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
diff --git a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/DatasourceConfig.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/DatasourceConfig.java
similarity index 94%
rename from persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/DatasourceConfig.java
rename to persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/DatasourceConfig.java
index 5b695f39f5..21cc0bc6d3 100644
--- a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/DatasourceConfig.java
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/DatasourceConfig.java
@@ -1,16 +1,14 @@
-package org.baeldung.examples.r2dbc;
+package com.baeldung.examples.r2dbc;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
 
 import io.netty.util.internal.StringUtil;
 import io.r2dbc.spi.ConnectionFactories;
 import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import io.r2dbc.spi.ConnectionFactoryOptions.Builder;
-import io.r2dbc.spi.Option;
 import reactor.core.publisher.Flux;
 
 import static io.r2dbc.spi.ConnectionFactoryOptions.*;
diff --git a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/R2DBCConfigurationProperties.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/R2DBCConfigurationProperties.java
similarity index 96%
rename from persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/R2DBCConfigurationProperties.java
rename to persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/R2DBCConfigurationProperties.java
index 02733ebed9..b40c7ec2cd 100644
--- a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/R2DBCConfigurationProperties.java
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/R2DBCConfigurationProperties.java
@@ -1,4 +1,4 @@
-package org.baeldung.examples.r2dbc;
+package com.baeldung.examples.r2dbc;
 
 import javax.validation.constraints.NotEmpty;
 
diff --git a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/R2dbcExampleApplication.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/R2dbcExampleApplication.java
similarity index 92%
rename from persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/R2dbcExampleApplication.java
rename to persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/R2dbcExampleApplication.java
index 1147936e2d..11670a4154 100644
--- a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/R2dbcExampleApplication.java
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/R2dbcExampleApplication.java
@@ -1,4 +1,4 @@
-package org.baeldung.examples.r2dbc;
+package com.baeldung.examples.r2dbc;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/ReactiveAccountDao.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/ReactiveAccountDao.java
similarity index 95%
rename from persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/ReactiveAccountDao.java
rename to persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/ReactiveAccountDao.java
index f9717d4b9b..6a7974aeb1 100644
--- a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/ReactiveAccountDao.java
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/ReactiveAccountDao.java
@@ -1,9 +1,7 @@
-package org.baeldung.examples.r2dbc;
+package com.baeldung.examples.r2dbc;
 
 import java.math.BigDecimal;
 
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
 import io.r2dbc.spi.Connection;
diff --git a/persistence-modules/r2dbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/persistence-modules/r2dbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 55eb5659a7..79d401392c 100644
--- a/persistence-modules/r2dbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/persistence-modules/r2dbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1,5 +1,5 @@
 {"properties": [{
   "name": "r2dbc",
-  "type": "org.baeldung.examples.r2dbc.R2DBCConfigurationProperties",
+  "type": "com.baeldung.examples.r2dbc.R2DBCConfigurationProperties",
   "description": "R2DBC Connection properties"
 }]}
\ No newline at end of file
diff --git a/persistence-modules/r2dbc/src/test/java/org/baeldung/examples/r2dbc/R2dbcExampleApplicationTests.java b/persistence-modules/r2dbc/src/test/java/com/baeldung/examples/r2dbc/R2dbcExampleApplicationTests.java
similarity index 92%
rename from persistence-modules/r2dbc/src/test/java/org/baeldung/examples/r2dbc/R2dbcExampleApplicationTests.java
rename to persistence-modules/r2dbc/src/test/java/com/baeldung/examples/r2dbc/R2dbcExampleApplicationTests.java
index a1d433847b..3fb9e24a8e 100644
--- a/persistence-modules/r2dbc/src/test/java/org/baeldung/examples/r2dbc/R2dbcExampleApplicationTests.java
+++ b/persistence-modules/r2dbc/src/test/java/com/baeldung/examples/r2dbc/R2dbcExampleApplicationTests.java
@@ -1,19 +1,15 @@
-package org.baeldung.examples.r2dbc;
+package com.baeldung.examples.r2dbc;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import java.util.List;
 
-import org.hamcrest.core.IsNull;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.reactive.server.WebTestClient;
diff --git a/persistence-modules/spring-data-cassandra/README.md b/persistence-modules/spring-data-cassandra/README.md
index 456eefcf18..9c6745470b 100644
--- a/persistence-modules/spring-data-cassandra/README.md
+++ b/persistence-modules/spring-data-cassandra/README.md
@@ -1,8 +1,8 @@
 ## Spring Data Cassandra
 
 ### Relevant Articles:
-- [Introduction to Spring Data Cassandra](http://www.baeldung.com/spring-data-cassandra-tutorial)
-- [Using the CassandraTemplate from Spring Data](http://www.baeldung.com/spring-data-cassandratemplate-cqltemplate)
+- [Introduction to Spring Data Cassandra](https://www.baeldung.com/spring-data-cassandra-tutorial)
+- [Using the CassandraTemplate from Spring Data](https://www.baeldung.com/spring-data-cassandratemplate-cqltemplate)
 
 ### Build the Project with Tests Running
 ```
diff --git a/persistence-modules/spring-data-cassandra/src/main/java/org/baeldung/spring/data/cassandra/config/CassandraConfig.java b/persistence-modules/spring-data-cassandra/src/main/java/com/baeldung/spring/data/cassandra/config/CassandraConfig.java
similarity index 94%
rename from persistence-modules/spring-data-cassandra/src/main/java/org/baeldung/spring/data/cassandra/config/CassandraConfig.java
rename to persistence-modules/spring-data-cassandra/src/main/java/com/baeldung/spring/data/cassandra/config/CassandraConfig.java
index 2edd5551a5..3614c2a9f6 100644
--- a/persistence-modules/spring-data-cassandra/src/main/java/org/baeldung/spring/data/cassandra/config/CassandraConfig.java
+++ b/persistence-modules/spring-data-cassandra/src/main/java/com/baeldung/spring/data/cassandra/config/CassandraConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.cassandra.config;
+package com.baeldung.spring.data.cassandra.config;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -15,7 +15,7 @@ import org.springframework.data.cassandra.repository.config.EnableCassandraRepos
 
 @Configuration
 @PropertySource(value = { "classpath:cassandra.properties" })
-@EnableCassandraRepositories(basePackages = "org.baeldung.spring.data.cassandra.repository")
+@EnableCassandraRepositories(basePackages = "com.baeldung.spring.data.cassandra.repository")
 public class CassandraConfig extends AbstractCassandraConfiguration {
     private static final Log LOGGER = LogFactory.getLog(CassandraConfig.class);
 
diff --git a/persistence-modules/spring-data-cassandra/src/main/java/org/baeldung/spring/data/cassandra/model/Book.java b/persistence-modules/spring-data-cassandra/src/main/java/com/baeldung/spring/data/cassandra/model/Book.java
similarity index 97%
rename from persistence-modules/spring-data-cassandra/src/main/java/org/baeldung/spring/data/cassandra/model/Book.java
rename to persistence-modules/spring-data-cassandra/src/main/java/com/baeldung/spring/data/cassandra/model/Book.java
index a8ec81d6b5..d347a36184 100644
--- a/persistence-modules/spring-data-cassandra/src/main/java/org/baeldung/spring/data/cassandra/model/Book.java
+++ b/persistence-modules/spring-data-cassandra/src/main/java/com/baeldung/spring/data/cassandra/model/Book.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.cassandra.model;
+package com.baeldung.spring.data.cassandra.model;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/persistence-modules/spring-data-cassandra/src/main/java/org/baeldung/spring/data/cassandra/repository/BookRepository.java b/persistence-modules/spring-data-cassandra/src/main/java/com/baeldung/spring/data/cassandra/repository/BookRepository.java
similarity index 79%
rename from persistence-modules/spring-data-cassandra/src/main/java/org/baeldung/spring/data/cassandra/repository/BookRepository.java
rename to persistence-modules/spring-data-cassandra/src/main/java/com/baeldung/spring/data/cassandra/repository/BookRepository.java
index 66d656ac3a..ad144f3125 100644
--- a/persistence-modules/spring-data-cassandra/src/main/java/org/baeldung/spring/data/cassandra/repository/BookRepository.java
+++ b/persistence-modules/spring-data-cassandra/src/main/java/com/baeldung/spring/data/cassandra/repository/BookRepository.java
@@ -1,6 +1,6 @@
-package org.baeldung.spring.data.cassandra.repository;
+package com.baeldung.spring.data.cassandra.repository;
 
-import org.baeldung.spring.data.cassandra.model.Book;
+import com.baeldung.spring.data.cassandra.model.Book;
 import org.springframework.data.cassandra.repository.CassandraRepository;
 import org.springframework.data.cassandra.repository.Query;
 import org.springframework.stereotype.Repository;
diff --git a/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/SpringContextTest.java
similarity index 94%
rename from persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/SpringContextTest.java
rename to persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/SpringContextTest.java
index 89e729da86..22bd5c6551 100644
--- a/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/SpringContextTest.java
+++ b/persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,12 +1,12 @@
-package org.baeldung;
+package com.baeldung;
 
 import java.io.IOException;
 import java.util.HashMap;
 
 import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.thrift.transport.TTransportException;
-import org.baeldung.spring.data.cassandra.config.CassandraConfig;
-import org.baeldung.spring.data.cassandra.model.Book;
+import com.baeldung.spring.data.cassandra.config.CassandraConfig;
+import com.baeldung.spring.data.cassandra.model.Book;
 import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
 import org.junit.After;
 import org.junit.AfterClass;
diff --git a/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/spring/data/cassandra/repository/BookRepositoryIntegrationTest.java b/persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/spring/data/cassandra/repository/BookRepositoryIntegrationTest.java
similarity index 96%
rename from persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/spring/data/cassandra/repository/BookRepositoryIntegrationTest.java
rename to persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/spring/data/cassandra/repository/BookRepositoryIntegrationTest.java
index 8cbcdc3195..55e968d6f2 100644
--- a/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/spring/data/cassandra/repository/BookRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/spring/data/cassandra/repository/BookRepositoryIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.cassandra.repository;
+package com.baeldung.spring.data.cassandra.repository;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -6,12 +6,12 @@ import static org.junit.Assert.assertNotEquals;
 import java.io.IOException;
 import java.util.HashMap;
 
+import com.baeldung.spring.data.cassandra.model.Book;
 import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.thrift.transport.TTransportException;
-import org.baeldung.spring.data.cassandra.config.CassandraConfig;
-import org.baeldung.spring.data.cassandra.model.Book;
+import com.baeldung.spring.data.cassandra.config.CassandraConfig;
 import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
 import org.junit.After;
 import org.junit.AfterClass;
diff --git a/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/spring/data/cassandra/repository/CassandraTemplateIntegrationTest.java b/persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/spring/data/cassandra/repository/CassandraTemplateIntegrationTest.java
similarity index 97%
rename from persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/spring/data/cassandra/repository/CassandraTemplateIntegrationTest.java
rename to persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/spring/data/cassandra/repository/CassandraTemplateIntegrationTest.java
index e331ac3cd4..90ae68ba98 100644
--- a/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/spring/data/cassandra/repository/CassandraTemplateIntegrationTest.java
+++ b/persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/spring/data/cassandra/repository/CassandraTemplateIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.cassandra.repository;
+package com.baeldung.spring.data.cassandra.repository;
 
 import static junit.framework.TestCase.assertNull;
 import static org.hamcrest.CoreMatchers.is;
@@ -10,12 +10,12 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import com.baeldung.spring.data.cassandra.config.CassandraConfig;
+import com.baeldung.spring.data.cassandra.model.Book;
 import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.thrift.transport.TTransportException;
-import org.baeldung.spring.data.cassandra.config.CassandraConfig;
-import org.baeldung.spring.data.cassandra.model.Book;
 import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
 import org.junit.After;
 import org.junit.AfterClass;
diff --git a/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/spring/data/cassandra/repository/CqlQueriesIntegrationTest.java b/persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/spring/data/cassandra/repository/CqlQueriesIntegrationTest.java
similarity index 96%
rename from persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/spring/data/cassandra/repository/CqlQueriesIntegrationTest.java
rename to persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/spring/data/cassandra/repository/CqlQueriesIntegrationTest.java
index f7e42ae23b..f948218807 100644
--- a/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/spring/data/cassandra/repository/CqlQueriesIntegrationTest.java
+++ b/persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/spring/data/cassandra/repository/CqlQueriesIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.cassandra.repository;
+package com.baeldung.spring.data.cassandra.repository;
 
 import static junit.framework.TestCase.assertEquals;
 
@@ -12,8 +12,8 @@ import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.thrift.transport.TTransportException;
-import org.baeldung.spring.data.cassandra.config.CassandraConfig;
-import org.baeldung.spring.data.cassandra.model.Book;
+import com.baeldung.spring.data.cassandra.config.CassandraConfig;
+import com.baeldung.spring.data.cassandra.model.Book;
 import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
 import org.junit.After;
 import org.junit.AfterClass;