diff --git a/spring-katharsis/src/main/java/org/baeldung/Application.java b/spring-katharsis/src/main/java/com/baeldung/Application.java
similarity index 96%
rename from spring-katharsis/src/main/java/org/baeldung/Application.java
rename to spring-katharsis/src/main/java/com/baeldung/Application.java
index 5ce4ac7e08..6c4f047b26 100644
--- a/spring-katharsis/src/main/java/org/baeldung/Application.java
+++ b/spring-katharsis/src/main/java/com/baeldung/Application.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import io.katharsis.spring.boot.v3.KatharsisConfigV3;
 
diff --git a/spring-katharsis/src/main/java/org/baeldung/Setup.java b/spring-katharsis/src/main/java/com/baeldung/Setup.java
similarity index 81%
rename from spring-katharsis/src/main/java/org/baeldung/Setup.java
rename to spring-katharsis/src/main/java/com/baeldung/Setup.java
index c9088067eb..5363dd829a 100644
--- a/spring-katharsis/src/main/java/org/baeldung/Setup.java
+++ b/spring-katharsis/src/main/java/com/baeldung/Setup.java
@@ -1,14 +1,14 @@
-package org.baeldung;
+package com.baeldung;
 
 import java.util.Arrays;
 import java.util.HashSet;
 
 import javax.annotation.PostConstruct;
 
-import org.baeldung.persistence.dao.RoleRepository;
-import org.baeldung.persistence.dao.UserRepository;
-import org.baeldung.persistence.model.Role;
-import org.baeldung.persistence.model.User;
+import com.baeldung.persistence.dao.RoleRepository;
+import com.baeldung.persistence.dao.UserRepository;
+import com.baeldung.persistence.model.Role;
+import com.baeldung.persistence.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/dao/RoleRepository.java b/spring-katharsis/src/main/java/com/baeldung/persistence/dao/RoleRepository.java
similarity index 62%
rename from spring-katharsis/src/main/java/org/baeldung/persistence/dao/RoleRepository.java
rename to spring-katharsis/src/main/java/com/baeldung/persistence/dao/RoleRepository.java
index f4542ad097..6b7cc0204c 100644
--- a/spring-katharsis/src/main/java/org/baeldung/persistence/dao/RoleRepository.java
+++ b/spring-katharsis/src/main/java/com/baeldung/persistence/dao/RoleRepository.java
@@ -1,6 +1,6 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
-import org.baeldung.persistence.model.Role;
+import com.baeldung.persistence.model.Role;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface RoleRepository extends JpaRepository<Role, Long> {
diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/dao/UserRepository.java b/spring-katharsis/src/main/java/com/baeldung/persistence/dao/UserRepository.java
similarity index 62%
rename from spring-katharsis/src/main/java/org/baeldung/persistence/dao/UserRepository.java
rename to spring-katharsis/src/main/java/com/baeldung/persistence/dao/UserRepository.java
index cfe857ec40..89c2f3ec07 100644
--- a/spring-katharsis/src/main/java/org/baeldung/persistence/dao/UserRepository.java
+++ b/spring-katharsis/src/main/java/com/baeldung/persistence/dao/UserRepository.java
@@ -1,6 +1,6 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
-import org.baeldung.persistence.model.User;
+import com.baeldung.persistence.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserRepository extends JpaRepository<User, Long> {
diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/RoleResourceRepository.java b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/RoleResourceRepository.java
similarity index 89%
rename from spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/RoleResourceRepository.java
rename to spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/RoleResourceRepository.java
index 1998c414bb..c5e6326075 100644
--- a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/RoleResourceRepository.java
+++ b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/RoleResourceRepository.java
@@ -1,12 +1,12 @@
-package org.baeldung.persistence.katharsis;
+package com.baeldung.persistence.katharsis;
 
 
+import com.baeldung.persistence.dao.RoleRepository;
 import io.katharsis.queryspec.QuerySpec;
 import io.katharsis.repository.ResourceRepositoryV2;
 import io.katharsis.resource.list.ResourceList;
 
-import org.baeldung.persistence.dao.RoleRepository;
-import org.baeldung.persistence.model.Role;
+import com.baeldung.persistence.model.Role;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserResourceRepository.java b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserResourceRepository.java
similarity index 89%
rename from spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserResourceRepository.java
rename to spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserResourceRepository.java
index 9b3de31601..616431f3f0 100644
--- a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserResourceRepository.java
+++ b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserResourceRepository.java
@@ -1,11 +1,11 @@
-package org.baeldung.persistence.katharsis;
+package com.baeldung.persistence.katharsis;
 
+import com.baeldung.persistence.dao.UserRepository;
+import com.baeldung.persistence.model.User;
 import io.katharsis.queryspec.QuerySpec;
 import io.katharsis.repository.ResourceRepositoryV2;
 import io.katharsis.resource.list.ResourceList;
 
-import org.baeldung.persistence.dao.UserRepository;
-import org.baeldung.persistence.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java
similarity index 89%
rename from spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java
rename to spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java
index dbeb769fac..066292c00f 100644
--- a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java
+++ b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java
@@ -1,5 +1,8 @@
-package org.baeldung.persistence.katharsis;
+package com.baeldung.persistence.katharsis;
 
+import com.baeldung.persistence.dao.RoleRepository;
+import com.baeldung.persistence.dao.UserRepository;
+import com.baeldung.persistence.model.User;
 import io.katharsis.queryspec.QuerySpec;
 import io.katharsis.repository.RelationshipRepositoryV2;
 import io.katharsis.resource.list.ResourceList;
@@ -7,10 +10,7 @@ import io.katharsis.resource.list.ResourceList;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.baeldung.persistence.dao.RoleRepository;
-import org.baeldung.persistence.dao.UserRepository;
-import org.baeldung.persistence.model.Role;
-import org.baeldung.persistence.model.User;
+import com.baeldung.persistence.model.Role;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/model/Role.java b/spring-katharsis/src/main/java/com/baeldung/persistence/model/Role.java
similarity index 98%
rename from spring-katharsis/src/main/java/org/baeldung/persistence/model/Role.java
rename to spring-katharsis/src/main/java/com/baeldung/persistence/model/Role.java
index f391efd37c..2f928993c2 100644
--- a/spring-katharsis/src/main/java/org/baeldung/persistence/model/Role.java
+++ b/spring-katharsis/src/main/java/com/baeldung/persistence/model/Role.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import io.katharsis.resource.annotations.JsonApiId;
 import io.katharsis.resource.annotations.JsonApiRelation;
diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/model/User.java b/spring-katharsis/src/main/java/com/baeldung/persistence/model/User.java
similarity index 98%
rename from spring-katharsis/src/main/java/org/baeldung/persistence/model/User.java
rename to spring-katharsis/src/main/java/com/baeldung/persistence/model/User.java
index 7c55e29599..111435c52e 100644
--- a/spring-katharsis/src/main/java/org/baeldung/persistence/model/User.java
+++ b/spring-katharsis/src/main/java/com/baeldung/persistence/model/User.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import io.katharsis.resource.annotations.JsonApiId;
 import io.katharsis.resource.annotations.JsonApiRelation;
diff --git a/spring-katharsis/src/test/java/org/baeldung/SpringContextTest.java b/spring-katharsis/src/test/java/com/baeldung/SpringContextTest.java
similarity index 87%
rename from spring-katharsis/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-katharsis/src/test/java/com/baeldung/SpringContextTest.java
index 769a436778..13c1c162f1 100644
--- a/spring-katharsis/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-katharsis/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,6 +1,5 @@
-package org.baeldung;
+package com.baeldung;
 
-import org.baeldung.Application;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java b/spring-katharsis/src/test/java/com/baeldung/test/JsonApiLiveTest.java
similarity index 94%
rename from spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java
rename to spring-katharsis/src/test/java/com/baeldung/test/JsonApiLiveTest.java
index e512202d96..a7c60d4a90 100644
--- a/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java
+++ b/spring-katharsis/src/test/java/com/baeldung/test/JsonApiLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.test;
+package com.baeldung.test;
 
 import static org.junit.Assert.assertEquals;