diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/IOperations.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/IOperations.java
similarity index 89%
rename from spring-rest-testing/src/main/java/org/baeldung/persistence/IOperations.java
rename to spring-rest-testing/src/main/java/com/baeldung/persistence/IOperations.java
index 0b617bf7ab..73100ec64f 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/IOperations.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/IOperations.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence;
+package com.baeldung.persistence;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/dao/IFooDao.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/dao/IFooDao.java
similarity index 81%
rename from spring-rest-testing/src/main/java/org/baeldung/persistence/dao/IFooDao.java
rename to spring-rest-testing/src/main/java/com/baeldung/persistence/dao/IFooDao.java
index 230abd0d5f..8d47d2eb42 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/dao/IFooDao.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/dao/IFooDao.java
@@ -1,6 +1,6 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
-import org.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.model.Foo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/model/Foo.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/model/Foo.java
similarity index 97%
rename from spring-rest-testing/src/main/java/org/baeldung/persistence/model/Foo.java
rename to spring-rest-testing/src/main/java/com/baeldung/persistence/model/Foo.java
index 8e1dee33e8..9af3d07bed 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/model/Foo.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/model/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import java.io.Serializable;
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/model/User.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/model/User.java
similarity index 97%
rename from spring-rest-testing/src/main/java/org/baeldung/persistence/model/User.java
rename to spring-rest-testing/src/main/java/com/baeldung/persistence/model/User.java
index 670d4a2e74..dbc2b9360f 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/model/User.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/model/User.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/spring-rest-testing/src/main/java/com/baeldung/persistence/service/IFooService.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/service/IFooService.java
new file mode 100644
index 0000000000..15330550a1
--- /dev/null
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/service/IFooService.java
@@ -0,0 +1,10 @@
+package com.baeldung.persistence.service;
+
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.IOperations;
+
+public interface IFooService extends IOperations<Foo> {
+
+    Foo retrieveByName(String name);
+
+}
diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/service/common/AbstractService.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/service/common/AbstractService.java
similarity index 90%
rename from spring-rest-testing/src/main/java/org/baeldung/persistence/service/common/AbstractService.java
rename to spring-rest-testing/src/main/java/com/baeldung/persistence/service/common/AbstractService.java
index ceefbbe0e3..5a5d9d6241 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/service/common/AbstractService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/service/common/AbstractService.java
@@ -1,9 +1,9 @@
-package org.baeldung.persistence.service.common;
+package com.baeldung.persistence.service.common;
 
 import java.io.Serializable;
 import java.util.List;
 
-import org.baeldung.persistence.IOperations;
+import com.baeldung.persistence.IOperations;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/service/impl/FooService.java b/spring-rest-testing/src/main/java/com/baeldung/persistence/service/impl/FooService.java
similarity index 73%
rename from spring-rest-testing/src/main/java/org/baeldung/persistence/service/impl/FooService.java
rename to spring-rest-testing/src/main/java/com/baeldung/persistence/service/impl/FooService.java
index 32fe1bd7e0..92fb6c28a0 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/service/impl/FooService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/persistence/service/impl/FooService.java
@@ -1,9 +1,9 @@
-package org.baeldung.persistence.service.impl;
+package com.baeldung.persistence.service.impl;
 
-import org.baeldung.persistence.dao.IFooDao;
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.persistence.service.IFooService;
-import org.baeldung.persistence.service.common.AbstractService;
+import com.baeldung.persistence.dao.IFooDao;
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.service.IFooService;
+import com.baeldung.persistence.service.common.AbstractService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Service;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/spring/Application.java b/spring-rest-testing/src/main/java/com/baeldung/spring/Application.java
similarity index 95%
rename from spring-rest-testing/src/main/java/org/baeldung/spring/Application.java
rename to spring-rest-testing/src/main/java/com/baeldung/spring/Application.java
index ca72a4ef56..c35c4d7e5e 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/spring/Application.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/spring/Application.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
@@ -19,7 +19,7 @@ import org.springframework.web.context.request.RequestContextListener;
  */
 @EnableScheduling
 @EnableAutoConfiguration
-@ComponentScan("org.baeldung")
+@ComponentScan("com.baeldung")
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/spring/PersistenceConfig.java b/spring-rest-testing/src/main/java/com/baeldung/spring/PersistenceConfig.java
similarity index 94%
rename from spring-rest-testing/src/main/java/org/baeldung/spring/PersistenceConfig.java
rename to spring-rest-testing/src/main/java/com/baeldung/spring/PersistenceConfig.java
index f3a87b189e..4a4b9eee3f 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/spring/PersistenceConfig.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/spring/PersistenceConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import java.util.Properties;
 
@@ -24,9 +24,9 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-${envTarget:h2}.properties" })
-@ComponentScan({ "org.baeldung.persistence" })
+@ComponentScan({ "com.baeldung.persistence" })
 // @ImportResource("classpath*:springDataPersistenceConfig.xml")
-@EnableJpaRepositories(basePackages = "org.baeldung.persistence.dao")
+@EnableJpaRepositories(basePackages = "com.baeldung.persistence.dao")
 public class PersistenceConfig {
 
     @Autowired
@@ -40,7 +40,7 @@ public class PersistenceConfig {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
+        em.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
 
         final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         // vendorAdapter.set
diff --git a/spring-rest-testing/src/main/java/org/baeldung/spring/WebConfig.java b/spring-rest-testing/src/main/java/com/baeldung/spring/WebConfig.java
similarity index 94%
rename from spring-rest-testing/src/main/java/org/baeldung/spring/WebConfig.java
rename to spring-rest-testing/src/main/java/com/baeldung/spring/WebConfig.java
index a0db08d93d..e35acb0bf0 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/spring/WebConfig.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/spring/WebConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -10,7 +10,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
 @Configuration
-@ComponentScan("org.baeldung.web")
+@ComponentScan("com.baeldung.web")
 @EnableWebMvc
 public class WebConfig implements WebMvcConfigurer {
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/controller/FooController.java b/spring-rest-testing/src/main/java/com/baeldung/web/controller/FooController.java
similarity index 92%
rename from spring-rest-testing/src/main/java/org/baeldung/web/controller/FooController.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/controller/FooController.java
index caaf422410..b5350c33c1 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/controller/FooController.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/controller/FooController.java
@@ -1,12 +1,12 @@
-package org.baeldung.web.controller;
+package com.baeldung.web.controller;
 
 import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.persistence.service.IFooService;
-import org.baeldung.web.util.RestPreconditions;
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.service.IFooService;
+import com.baeldung.web.util.RestPreconditions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/controller/HomeController.java b/spring-rest-testing/src/main/java/com/baeldung/web/controller/HomeController.java
similarity index 87%
rename from spring-rest-testing/src/main/java/org/baeldung/web/controller/HomeController.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/controller/HomeController.java
index 9c4d14cae3..c82911211a 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/controller/HomeController.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/controller/HomeController.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.controller;
+package com.baeldung.web.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/controller/RootController.java b/spring-rest-testing/src/main/java/com/baeldung/web/controller/RootController.java
similarity index 90%
rename from spring-rest-testing/src/main/java/org/baeldung/web/controller/RootController.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/controller/RootController.java
index a66f3d1893..005f6f023b 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/controller/RootController.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/controller/RootController.java
@@ -1,9 +1,9 @@
-package org.baeldung.web.controller;
+package com.baeldung.web.controller;
 
 import java.util.Map;
 
-import org.baeldung.web.metric.IActuatorMetricService;
-import org.baeldung.web.metric.IMetricService;
+import com.baeldung.web.metric.IActuatorMetricService;
+import com.baeldung.web.metric.IMetricService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java b/spring-rest-testing/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java
similarity index 92%
rename from spring-rest-testing/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java
index 14b61f9832..fd002efc28 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.exception;
+package com.baeldung.web.exception;
 
 public final class MyResourceNotFoundException extends RuntimeException {
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/ActuatorMetricService.java
similarity index 99%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/ActuatorMetricService.java
index 4dcec17b9e..8c26fa04a0 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/ActuatorMetricService.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/CustomActuatorMetricService.java
similarity index 98%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/CustomActuatorMetricService.java
index cf30686e52..ee17825b7c 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/CustomActuatorMetricService.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/IActuatorMetricService.java
similarity index 69%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/IActuatorMetricService.java
index 191d347070..60bb43ee00 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/IActuatorMetricService.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 public interface IActuatorMetricService {
     Object[][] getGraphData();
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/ICustomActuatorMetricService.java
similarity index 79%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/ICustomActuatorMetricService.java
index 19ab7164ac..5126252e27 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/ICustomActuatorMetricService.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 public interface ICustomActuatorMetricService {
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/IMetricService.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/IMetricService.java
similarity index 86%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/IMetricService.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/IMetricService.java
index 902d6ac811..b8dfa60215 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/IMetricService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/IMetricService.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 import java.util.Map;
 
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricFilter.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/MetricFilter.java
similarity index 98%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricFilter.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/MetricFilter.java
index 6c2fb0cb39..dee63b226f 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricFilter.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/MetricFilter.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricService.java b/spring-rest-testing/src/main/java/com/baeldung/web/metric/MetricService.java
similarity index 99%
rename from spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricService.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/metric/MetricService.java
index 086068ad8f..fd3cccab3e 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricService.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/metric/MetricService.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.metric;
+package com.baeldung.web.metric;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/spring-rest-testing/src/main/java/org/baeldung/web/util/RestPreconditions.java b/spring-rest-testing/src/main/java/com/baeldung/web/util/RestPreconditions.java
similarity index 93%
rename from spring-rest-testing/src/main/java/org/baeldung/web/util/RestPreconditions.java
rename to spring-rest-testing/src/main/java/com/baeldung/web/util/RestPreconditions.java
index 4f2dedcfa0..93a4ef6a33 100644
--- a/spring-rest-testing/src/main/java/org/baeldung/web/util/RestPreconditions.java
+++ b/spring-rest-testing/src/main/java/com/baeldung/web/util/RestPreconditions.java
@@ -1,9 +1,8 @@
-package org.baeldung.web.util;
+package com.baeldung.web.util;
 
+import com.baeldung.web.exception.MyResourceNotFoundException;
 import org.springframework.http.HttpStatus;
 
-import org.baeldung.web.exception.MyResourceNotFoundException;
-
 /**
  * Simple static methods to be called at the start of your own methods to verify correct arguments and state. If the Precondition fails, an {@link HttpStatus} code is thrown
  */
diff --git a/spring-rest-testing/src/main/java/org/baeldung/persistence/service/IFooService.java b/spring-rest-testing/src/main/java/org/baeldung/persistence/service/IFooService.java
deleted file mode 100644
index 60d607b9ef..0000000000
--- a/spring-rest-testing/src/main/java/org/baeldung/persistence/service/IFooService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.baeldung.persistence.service;
-
-import org.baeldung.persistence.IOperations;
-import org.baeldung.persistence.model.Foo;
-
-public interface IFooService extends IOperations<Foo> {
-
-    Foo retrieveByName(String name);
-
-}
diff --git a/spring-rest-testing/src/main/resources/springDataPersistenceConfig.xml b/spring-rest-testing/src/main/resources/springDataPersistenceConfig.xml
index d6d0ec6e47..5ea2d9c05b 100644
--- a/spring-rest-testing/src/main/resources/springDataPersistenceConfig.xml
+++ b/spring-rest-testing/src/main/resources/springDataPersistenceConfig.xml
@@ -7,6 +7,6 @@
     http://www.springframework.org/schema/data/jpa/spring-jpa.xsd"
 >
 
-    <jpa:repositories base-package="org.baeldung.persistence.dao"/>
+    <jpa:repositories base-package="com.baeldung.persistence.dao"/>
 
 </beans>
\ No newline at end of file
diff --git a/spring-rest-testing/src/main/webapp/WEB-INF/web.xml b/spring-rest-testing/src/main/webapp/WEB-INF/web.xml
index 5f90c3519f..7129b6b4af 100644
--- a/spring-rest-testing/src/main/webapp/WEB-INF/web.xml
+++ b/spring-rest-testing/src/main/webapp/WEB-INF/web.xml
@@ -16,7 +16,7 @@
     </context-param>
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>org.baeldung.spring</param-value>
+        <param-value>com.baeldung.spring</param-value>
     </context-param>
 
     <listener>
@@ -37,7 +37,7 @@
     <!-- Metric filter -->
     <filter>
         <filter-name>metricFilter</filter-name>
-        <filter-class>org.baeldung.web.metric.MetricFilter</filter-class>
+        <filter-class>com.baeldung.web.metric.MetricFilter</filter-class>
     </filter>
 
     <filter-mapping>
diff --git a/spring-rest-testing/src/test/java/org/baeldung/Consts.java b/spring-rest-testing/src/test/java/com/baeldung/Consts.java
similarity index 73%
rename from spring-rest-testing/src/test/java/org/baeldung/Consts.java
rename to spring-rest-testing/src/test/java/com/baeldung/Consts.java
index e5f0be160f..e33efd589e 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/Consts.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/Consts.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 public interface Consts {
     int APPLICATION_PORT = 8082;
diff --git a/spring-rest-testing/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-rest-testing/src/test/java/com/baeldung/SpringContextIntegrationTest.java
similarity index 86%
rename from spring-rest-testing/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-rest-testing/src/test/java/com/baeldung/SpringContextIntegrationTest.java
index 35939c992f..155e05b106 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/SpringContextIntegrationTest.java
@@ -1,6 +1,6 @@
-package org.baeldung;
+package com.baeldung;
 
-import org.baeldung.spring.Application;
+import com.baeldung.spring.Application;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-rest-testing/src/test/java/org/baeldung/SpringContextTest.java b/spring-rest-testing/src/test/java/com/baeldung/SpringContextTest.java
similarity index 85%
rename from spring-rest-testing/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-rest-testing/src/test/java/com/baeldung/SpringContextTest.java
index 8debddc40a..e023254719 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,6 +1,6 @@
-package org.baeldung;
+package com.baeldung;
 
-import org.baeldung.spring.Application;
+import com.baeldung.spring.Application;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-rest-testing/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java b/spring-rest-testing/src/test/java/com/baeldung/persistence/PersistenceTestSuite.java
similarity index 71%
rename from spring-rest-testing/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java
rename to spring-rest-testing/src/test/java/com/baeldung/persistence/PersistenceTestSuite.java
index fb0fd00bb5..77c74b15e4 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/persistence/PersistenceTestSuite.java
@@ -1,6 +1,6 @@
-package org.baeldung.persistence;
+package com.baeldung.persistence;
 
-import org.baeldung.persistence.service.FooServicePersistenceIntegrationTest;
+import com.baeldung.persistence.service.FooServicePersistenceIntegrationTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/spring-rest-testing/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java b/spring-rest-testing/src/test/java/com/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
similarity index 97%
rename from spring-rest-testing/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
rename to spring-rest-testing/src/test/java/com/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
index 79889e0f9e..e66e9d49e2 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.hamcrest.Matchers.hasItem;
@@ -11,9 +11,9 @@ import static org.junit.Assert.assertThat;
 import java.io.Serializable;
 import java.util.List;
 
-import org.baeldung.persistence.IOperations;
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.util.IDUtil;
+import com.baeldung.util.IDUtil;
+import com.baeldung.persistence.IOperations;
+import com.baeldung.persistence.model.Foo;
 import org.hamcrest.Matchers;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/spring-rest-testing/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java b/spring-rest-testing/src/test/java/com/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
similarity index 93%
rename from spring-rest-testing/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
rename to spring-rest-testing/src/test/java/com/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
index 089d2d13a2..24f46b9c8f 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
@@ -1,11 +1,11 @@
-package org.baeldung.persistence.service;
+package com.baeldung.persistence.service;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.junit.Assert.assertNotNull;
 
-import org.baeldung.persistence.IOperations;
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.spring.PersistenceConfig;
+import com.baeldung.persistence.IOperations;
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.spring.PersistenceConfig;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-rest-testing/src/test/java/org/baeldung/util/IDUtil.java b/spring-rest-testing/src/test/java/com/baeldung/util/IDUtil.java
similarity index 96%
rename from spring-rest-testing/src/test/java/org/baeldung/util/IDUtil.java
rename to spring-rest-testing/src/test/java/com/baeldung/util/IDUtil.java
index 85ab623e5f..45e72e046d 100644
--- a/spring-rest-testing/src/test/java/org/baeldung/util/IDUtil.java
+++ b/spring-rest-testing/src/test/java/com/baeldung/util/IDUtil.java
@@ -1,4 +1,4 @@
-package org.baeldung.util;
+package com.baeldung.util;
 
 import java.util.Random;