diff --git a/spring-caching/src/main/java/org/baeldung/caching/config/ApplicationCacheConfig.java b/spring-caching/src/main/java/com/baeldung/caching/config/ApplicationCacheConfig.java
similarity index 96%
rename from spring-caching/src/main/java/org/baeldung/caching/config/ApplicationCacheConfig.java
rename to spring-caching/src/main/java/com/baeldung/caching/config/ApplicationCacheConfig.java
index 8bf23de2cc..9a8759cbff 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/config/ApplicationCacheConfig.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/config/ApplicationCacheConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.config;
+package com.baeldung.caching.config;
 
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/config/CachingConfig.java b/spring-caching/src/main/java/com/baeldung/caching/config/CachingConfig.java
similarity index 90%
rename from spring-caching/src/main/java/org/baeldung/caching/config/CachingConfig.java
rename to spring-caching/src/main/java/com/baeldung/caching/config/CachingConfig.java
index c995bca68d..d245b05502 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/config/CachingConfig.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/config/CachingConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.config;
+package com.baeldung.caching.config;
 
 import java.util.Arrays;
 
@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @EnableCaching
-@ComponentScan("org.baeldung.caching.example")
+@ComponentScan("com.baeldung.caching.example")
 public class CachingConfig {
 
     @Bean
diff --git a/spring-caching/src/main/java/org/baeldung/caching/config/CustomKeyGenerator.java b/spring-caching/src/main/java/com/baeldung/caching/config/CustomKeyGenerator.java
similarity index 92%
rename from spring-caching/src/main/java/org/baeldung/caching/config/CustomKeyGenerator.java
rename to spring-caching/src/main/java/com/baeldung/caching/config/CustomKeyGenerator.java
index c1da9493e0..173f44bfbc 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/config/CustomKeyGenerator.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/config/CustomKeyGenerator.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.config;
+package com.baeldung.caching.config;
 
 import org.springframework.cache.interceptor.KeyGenerator;
 import org.springframework.util.StringUtils;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/eviction/controllers/CachingController.java b/spring-caching/src/main/java/com/baeldung/caching/eviction/controllers/CachingController.java
similarity index 78%
rename from spring-caching/src/main/java/org/baeldung/caching/eviction/controllers/CachingController.java
rename to spring-caching/src/main/java/com/baeldung/caching/eviction/controllers/CachingController.java
index aaaf8a5918..2980e32763 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/eviction/controllers/CachingController.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/eviction/controllers/CachingController.java
@@ -1,6 +1,6 @@
-package org.baeldung.caching.eviction.controllers;
+package com.baeldung.caching.eviction.controllers;
 
-import org.baeldung.caching.eviction.service.CachingService;
+import com.baeldung.caching.eviction.service.CachingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/eviction/service/CachingService.java b/spring-caching/src/main/java/com/baeldung/caching/eviction/service/CachingService.java
similarity index 97%
rename from spring-caching/src/main/java/org/baeldung/caching/eviction/service/CachingService.java
rename to spring-caching/src/main/java/com/baeldung/caching/eviction/service/CachingService.java
index a0dd30c329..d44da332d4 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/eviction/service/CachingService.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/eviction/service/CachingService.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.eviction.service;
+package com.baeldung.caching.eviction.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.CacheManager;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/example/AbstractService.java b/spring-caching/src/main/java/com/baeldung/caching/example/AbstractService.java
similarity index 98%
rename from spring-caching/src/main/java/org/baeldung/caching/example/AbstractService.java
rename to spring-caching/src/main/java/com/baeldung/caching/example/AbstractService.java
index 02b8c3c159..5893ffdfcf 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/example/AbstractService.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/example/AbstractService.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.example;
+package com.baeldung.caching.example;
 
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/example/BookService.java b/spring-caching/src/main/java/com/baeldung/caching/example/BookService.java
similarity index 87%
rename from spring-caching/src/main/java/org/baeldung/caching/example/BookService.java
rename to spring-caching/src/main/java/com/baeldung/caching/example/BookService.java
index 9f3aaf89cf..2b335ac10d 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/example/BookService.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/example/BookService.java
@@ -1,6 +1,6 @@
-package org.baeldung.caching.example;
+package com.baeldung.caching.example;
 
-import org.baeldung.caching.model.Book;
+import com.baeldung.caching.model.Book;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 
diff --git a/spring-caching/src/main/java/org/baeldung/caching/example/Customer.java b/spring-caching/src/main/java/com/baeldung/caching/example/Customer.java
similarity index 95%
rename from spring-caching/src/main/java/org/baeldung/caching/example/Customer.java
rename to spring-caching/src/main/java/com/baeldung/caching/example/Customer.java
index a57f08e35b..52de4bc1cc 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/example/Customer.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/example/Customer.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.example;
+package com.baeldung.caching.example;
 
 public class Customer {
 
diff --git a/spring-caching/src/main/java/org/baeldung/caching/example/CustomerDataService.java b/spring-caching/src/main/java/com/baeldung/caching/example/CustomerDataService.java
similarity index 98%
rename from spring-caching/src/main/java/org/baeldung/caching/example/CustomerDataService.java
rename to spring-caching/src/main/java/com/baeldung/caching/example/CustomerDataService.java
index 1c595057a8..005a85fcb4 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/example/CustomerDataService.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/example/CustomerDataService.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.example;
+package com.baeldung.caching.example;
 
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/example/CustomerServiceWithParent.java b/spring-caching/src/main/java/com/baeldung/caching/example/CustomerServiceWithParent.java
similarity index 86%
rename from spring-caching/src/main/java/org/baeldung/caching/example/CustomerServiceWithParent.java
rename to spring-caching/src/main/java/com/baeldung/caching/example/CustomerServiceWithParent.java
index a5ded7daf9..be201413b4 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/example/CustomerServiceWithParent.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/example/CustomerServiceWithParent.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.example;
+package com.baeldung.caching.example;
 
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.stereotype.Component;
diff --git a/spring-caching/src/main/java/org/baeldung/caching/model/Book.java b/spring-caching/src/main/java/com/baeldung/caching/model/Book.java
similarity index 94%
rename from spring-caching/src/main/java/org/baeldung/caching/model/Book.java
rename to spring-caching/src/main/java/com/baeldung/caching/model/Book.java
index c110c79db0..fd8abf1816 100644
--- a/spring-caching/src/main/java/org/baeldung/caching/model/Book.java
+++ b/spring-caching/src/main/java/com/baeldung/caching/model/Book.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.model;
+package com.baeldung.caching.model;
 
 public class Book {
 
diff --git a/spring-caching/src/main/java/org/baeldung/ehcache/calculator/SquaredCalculator.java b/spring-caching/src/main/java/com/baeldung/ehcache/calculator/SquaredCalculator.java
similarity index 86%
rename from spring-caching/src/main/java/org/baeldung/ehcache/calculator/SquaredCalculator.java
rename to spring-caching/src/main/java/com/baeldung/ehcache/calculator/SquaredCalculator.java
index 25957539df..caf1df2a1b 100644
--- a/spring-caching/src/main/java/org/baeldung/ehcache/calculator/SquaredCalculator.java
+++ b/spring-caching/src/main/java/com/baeldung/ehcache/calculator/SquaredCalculator.java
@@ -1,6 +1,6 @@
-package org.baeldung.ehcache.calculator;
+package com.baeldung.ehcache.calculator;
 
-import org.baeldung.ehcache.config.CacheHelper;
+import com.baeldung.ehcache.config.CacheHelper;
 
 public class SquaredCalculator {
     private CacheHelper cache;
diff --git a/spring-caching/src/main/java/org/baeldung/ehcache/config/CacheHelper.java b/spring-caching/src/main/java/com/baeldung/ehcache/config/CacheHelper.java
similarity index 96%
rename from spring-caching/src/main/java/org/baeldung/ehcache/config/CacheHelper.java
rename to spring-caching/src/main/java/com/baeldung/ehcache/config/CacheHelper.java
index 7f59ad8cfb..d138f6e84c 100644
--- a/spring-caching/src/main/java/org/baeldung/ehcache/config/CacheHelper.java
+++ b/spring-caching/src/main/java/com/baeldung/ehcache/config/CacheHelper.java
@@ -1,4 +1,4 @@
-package org.baeldung.ehcache.config;
+package com.baeldung.ehcache.config;
 
 import org.ehcache.Cache;
 import org.ehcache.CacheManager;
diff --git a/spring-caching/src/main/resources/config.xml b/spring-caching/src/main/resources/config.xml
index 23458539b0..666e91e173 100644
--- a/spring-caching/src/main/resources/config.xml
+++ b/spring-caching/src/main/resources/config.xml
@@ -13,7 +13,7 @@
     <!-- <context:annotation-config/> -->
 
     <!-- the service that you wish to make cacheable. -->
-    <bean id="customerDataService" class="org.baeldung.caching.example.CustomerDataService"/>
+    <bean id="customerDataService" class="com.baeldung.caching.example.CustomerDataService"/>
 
     <bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
         <property name="caches">
@@ -34,7 +34,7 @@
 
     <!-- apply the behavior to all the implementations of CustomerDataService  -->
     <aop:config>
-        <aop:advisor advice-ref="cachingBehavior" pointcut="execution(* org.baeldung.caching.example.CustomerDataService.*(..))"/>
+        <aop:advisor advice-ref="cachingBehavior" pointcut="execution(* com.baeldung.caching.example.CustomerDataService.*(..))"/>
     </aop:config>
 
 </beans>
diff --git a/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java b/spring-caching/src/test/java/com/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
similarity index 96%
rename from spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
rename to spring-caching/src/test/java/com/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
index 28b0d26bed..7363022268 100644
--- a/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
+++ b/spring-caching/src/test/java/com/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.test;
+package com.baeldung.caching.test;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -7,7 +7,7 @@ import static org.junit.Assert.assertThat;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.baeldung.caching.eviction.service.CachingService;
+import com.baeldung.caching.eviction.service.CachingService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java b/spring-caching/src/test/java/com/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
similarity index 97%
rename from spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
rename to spring-caching/src/test/java/com/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
index ffcc88febc..fa3168fc62 100644
--- a/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
+++ b/spring-caching/src/test/java/com/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.caching.test;
+package com.baeldung.caching.test;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -7,7 +7,7 @@ import static org.junit.Assert.assertThat;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.baeldung.caching.eviction.service.CachingService;
+import com.baeldung.caching.eviction.service.CachingService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-caching/src/test/java/org/baeldung/caching/test/SpringCachingIntegrationTest.java b/spring-caching/src/test/java/com/baeldung/caching/test/SpringCachingIntegrationTest.java
similarity index 88%
rename from spring-caching/src/test/java/org/baeldung/caching/test/SpringCachingIntegrationTest.java
rename to spring-caching/src/test/java/com/baeldung/caching/test/SpringCachingIntegrationTest.java
index 8c4ebaa7ec..080044f359 100644
--- a/spring-caching/src/test/java/org/baeldung/caching/test/SpringCachingIntegrationTest.java
+++ b/spring-caching/src/test/java/com/baeldung/caching/test/SpringCachingIntegrationTest.java
@@ -1,9 +1,9 @@
-package org.baeldung.caching.test;
+package com.baeldung.caching.test;
 
-import org.baeldung.caching.config.CachingConfig;
-import org.baeldung.caching.example.Customer;
-import org.baeldung.caching.example.CustomerDataService;
-import org.baeldung.caching.example.CustomerServiceWithParent;
+import com.baeldung.caching.config.CachingConfig;
+import com.baeldung.caching.example.Customer;
+import com.baeldung.caching.example.CustomerDataService;
+import com.baeldung.caching.example.CustomerServiceWithParent;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-caching/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java b/spring-caching/src/test/java/com/baeldung/ehcache/SquareCalculatorUnitTest.java
similarity index 90%
rename from spring-caching/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java
rename to spring-caching/src/test/java/com/baeldung/ehcache/SquareCalculatorUnitTest.java
index 0e6ac6fd8e..37df749bab 100644
--- a/spring-caching/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java
+++ b/spring-caching/src/test/java/com/baeldung/ehcache/SquareCalculatorUnitTest.java
@@ -1,7 +1,7 @@
-package org.baeldung.ehcache;
+package com.baeldung.ehcache;
 
-import org.baeldung.ehcache.calculator.SquaredCalculator;
-import org.baeldung.ehcache.config.CacheHelper;
+import com.baeldung.ehcache.calculator.SquaredCalculator;
+import com.baeldung.ehcache.config.CacheHelper;
 import org.junit.Before;
 import org.junit.Test;