diff --git a/spring-4/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java b/spring-4/src/main/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
similarity index 86%
rename from spring-4/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
rename to spring-4/src/main/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
index df1d173bd2..d11ca10873 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.attributeannotations;
+package com.baeldung.spring43.attributeannotations;
 
 import org.springframework.web.bind.annotation.*;
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java b/spring-4/src/main/java/com/baeldung/spring43/attributeannotations/ParamInterceptor.java
similarity index 91%
rename from spring-4/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java
rename to spring-4/src/main/java/com/baeldung/spring43/attributeannotations/ParamInterceptor.java
index 9cf6020a93..3d6e0ad8b9 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/attributeannotations/ParamInterceptor.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.attributeannotations;
+package com.baeldung.spring43.attributeannotations;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/cache/Foo.java b/spring-4/src/main/java/com/baeldung/spring43/cache/Foo.java
similarity index 94%
rename from spring-4/src/main/java/org/baeldung/spring43/cache/Foo.java
rename to spring-4/src/main/java/com/baeldung/spring43/cache/Foo.java
index ce34adf6c1..731ac68e70 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/cache/Foo.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/cache/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.cache;
+package com.baeldung.spring43.cache;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/cache/FooService.java b/spring-4/src/main/java/com/baeldung/spring43/cache/FooService.java
similarity index 87%
rename from spring-4/src/main/java/org/baeldung/spring43/cache/FooService.java
rename to spring-4/src/main/java/com/baeldung/spring43/cache/FooService.java
index ad4c8b395f..9c0aa583c5 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/cache/FooService.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/cache/FooService.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.cache;
+package com.baeldung.spring43.cache;
 
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
diff --git a/spring-4/src/main/java/com/baeldung/spring43/composedmapping/Appointment.java b/spring-4/src/main/java/com/baeldung/spring43/composedmapping/Appointment.java
new file mode 100644
index 0000000000..4d8ba86f4b
--- /dev/null
+++ b/spring-4/src/main/java/com/baeldung/spring43/composedmapping/Appointment.java
@@ -0,0 +1,5 @@
+package com.baeldung.spring43.composedmapping;
+
+public class Appointment {
+
+}
diff --git a/spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java b/spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentService.java
similarity index 72%
rename from spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java
rename to spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentService.java
index c4c5e82f65..1ca389e16b 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentService.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.composedmapping;
+package com.baeldung.spring43.composedmapping;
 
 import java.util.Map;
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java b/spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentsController.java
similarity index 94%
rename from spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java
rename to spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentsController.java
index e83a33eb89..3ff3a237ac 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentsController.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.composedmapping;
+package com.baeldung.spring43.composedmapping;
 
 import java.util.Map;
 
diff --git a/spring-4/src/main/java/com/baeldung/spring43/ctor/FooRepository.java b/spring-4/src/main/java/com/baeldung/spring43/ctor/FooRepository.java
new file mode 100644
index 0000000000..f1d8425682
--- /dev/null
+++ b/spring-4/src/main/java/com/baeldung/spring43/ctor/FooRepository.java
@@ -0,0 +1,5 @@
+package com.baeldung.spring43.ctor;
+
+public class FooRepository {
+
+}
diff --git a/spring-4/src/main/java/org/baeldung/spring43/ctor/FooService.java b/spring-4/src/main/java/com/baeldung/spring43/ctor/FooService.java
similarity index 87%
rename from spring-4/src/main/java/org/baeldung/spring43/ctor/FooService.java
rename to spring-4/src/main/java/com/baeldung/spring43/ctor/FooService.java
index bf92d1bd32..cb481f99b2 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/ctor/FooService.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/ctor/FooService.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 public class FooService {
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java b/spring-4/src/main/java/com/baeldung/spring43/defaultmethods/DateHolder.java
similarity index 87%
rename from spring-4/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java
rename to spring-4/src/main/java/com/baeldung/spring43/defaultmethods/DateHolder.java
index 9ae62cf484..a5307ec37c 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/defaultmethods/DateHolder.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import java.time.LocalDate;
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java b/spring-4/src/main/java/com/baeldung/spring43/defaultmethods/IDateHolder.java
similarity index 87%
rename from spring-4/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java
rename to spring-4/src/main/java/com/baeldung/spring43/defaultmethods/IDateHolder.java
index e37d27f9fc..66eca031c0 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/defaultmethods/IDateHolder.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java b/spring-4/src/main/java/com/baeldung/spring43/depresolution/FooRepository.java
similarity index 68%
rename from spring-4/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java
rename to spring-4/src/main/java/com/baeldung/spring43/depresolution/FooRepository.java
index 313f6fc8c5..281a4f29fd 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/depresolution/FooRepository.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.depresolution;
+package com.baeldung.spring43.depresolution;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/depresolution/FooService.java b/spring-4/src/main/java/com/baeldung/spring43/depresolution/FooService.java
similarity index 90%
rename from spring-4/src/main/java/org/baeldung/spring43/depresolution/FooService.java
rename to spring-4/src/main/java/com/baeldung/spring43/depresolution/FooService.java
index b76fa84749..1a6b13dc23 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/depresolution/FooService.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/depresolution/FooService.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.depresolution;
+package com.baeldung.spring43.depresolution;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.stereotype.Service;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/AppPreferences.java
similarity index 81%
rename from spring-4/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java
rename to spring-4/src/main/java/com/baeldung/spring43/scopeannotations/AppPreferences.java
index 45b90c4609..ede2849a51 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/AppPreferences.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.ApplicationScope;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/InstanceCountingService.java
similarity index 86%
rename from spring-4/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java
rename to spring-4/src/main/java/com/baeldung/spring43/scopeannotations/InstanceCountingService.java
index 4fb90566d8..e6879e0544 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/InstanceCountingService.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/LoginAction.java
similarity index 80%
rename from spring-4/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java
rename to spring-4/src/main/java/com/baeldung/spring43/scopeannotations/LoginAction.java
index 60017b4b94..132e701b5a 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/LoginAction.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/ScopeTestController.java
similarity index 95%
rename from spring-4/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java
rename to spring-4/src/main/java/com/baeldung/spring43/scopeannotations/ScopeTestController.java
index 8f4390dfc0..bd3e3e9b92 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/ScopeTestController.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/UserPreferences.java
similarity index 81%
rename from spring-4/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java
rename to spring-4/src/main/java/com/baeldung/spring43/scopeannotations/UserPreferences.java
index ce49c4b1fe..27f313b2cb 100644
--- a/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java
+++ b/spring-4/src/main/java/com/baeldung/spring43/scopeannotations/UserPreferences.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.SessionScope;
diff --git a/spring-4/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java b/spring-4/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java
deleted file mode 100644
index af06249768..0000000000
--- a/spring-4/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.spring43.composedmapping;
-
-public class Appointment {
-
-}
diff --git a/spring-4/src/main/java/org/baeldung/spring43/ctor/FooRepository.java b/spring-4/src/main/java/org/baeldung/spring43/ctor/FooRepository.java
deleted file mode 100644
index 96dbeb8642..0000000000
--- a/spring-4/src/main/java/org/baeldung/spring43/ctor/FooRepository.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.baeldung.spring43.ctor;
-
-public class FooRepository {
-
-}
diff --git a/spring-4/src/main/resources/defaultmethods-context.xml b/spring-4/src/main/resources/defaultmethods-context.xml
index 2b55037405..5725d0cabf 100644
--- a/spring-4/src/main/resources/defaultmethods-context.xml
+++ b/spring-4/src/main/resources/defaultmethods-context.xml
@@ -3,7 +3,7 @@
        xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="dateHolder" class="org.baeldung.spring43.defaultmethods.DateHolder">
+    <bean id="dateHolder" class="com.baeldung.spring43.defaultmethods.DateHolder">
         <property name="stringDate" value="15.10.1982"/>
     </bean>
 
diff --git a/spring-4/src/main/resources/implicit-ctor-context.xml b/spring-4/src/main/resources/implicit-ctor-context.xml
index c978ca17bd..3dc0058f94 100644
--- a/spring-4/src/main/resources/implicit-ctor-context.xml
+++ b/spring-4/src/main/resources/implicit-ctor-context.xml
@@ -3,8 +3,8 @@
        xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean class="org.baeldung.spring43.ctor.FooRepository"/>
+    <bean class="com.baeldung.spring43.ctor.FooRepository"/>
 
-    <bean class="org.baeldung.spring43.ctor.FooService"/>
+    <bean class="com.baeldung.spring43.ctor.FooService"/>
 
 </beans>
diff --git a/spring-4/src/test/java/org/baeldung/SpringContextTest.java b/spring-4/src/test/java/com/baeldung/SpringContextTest.java
similarity index 96%
rename from spring-4/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-4/src/test/java/com/baeldung/SpringContextTest.java
index cccdaff0cd..46308d41ea 100644
--- a/spring-4/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-4/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
similarity index 95%
rename from spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
index 97ae651473..97b92a943c 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.attributeannotations;
+package com.baeldung.spring43.attributeannotations;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
similarity index 96%
rename from spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
index fff2716a64..f696a6f537 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.attributeannotations;
+package com.baeldung.spring43.attributeannotations;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsConfiguration.java
similarity index 95%
rename from spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsConfiguration.java
index e4610e5a83..45acb11f72 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.cache;
+package com.baeldung.spring43.cache;
 
 import java.util.Collections;
 
diff --git a/spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
similarity index 96%
rename from spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
index fa72ed6d43..3f56bb21ff 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.cache;
+package com.baeldung.spring43.cache;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
similarity index 96%
rename from spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
index f1028ebefb..c3a0ceba36 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.composedmapping;
+package com.baeldung.spring43.composedmapping;
 
 import java.util.Collections;
 
diff --git a/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
similarity index 96%
rename from spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
index d0af48cd0e..d5c912b69b 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.composedmapping;
+package com.baeldung.spring43.composedmapping;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
similarity index 94%
rename from spring-4/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
index 871a985479..848fa44365 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/ctor/FooRepositoryConfiguration.java
similarity index 88%
rename from spring-4/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/ctor/FooRepositoryConfiguration.java
index a05a36529f..fb33942844 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/ctor/FooRepositoryConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/ctor/FooServiceConfiguration.java
similarity index 92%
rename from spring-4/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/ctor/FooServiceConfiguration.java
index 41f1719320..5ab09e37ec 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/ctor/FooServiceConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
similarity index 94%
rename from spring-4/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
index 83fa11294e..5296927ef2 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
similarity index 93%
rename from spring-4/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
index 956df44821..f617d48920 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import java.time.LocalDate;
 
diff --git a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
similarity index 92%
rename from spring-4/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
index 3c180e91c8..a8f44d722d 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
similarity index 91%
rename from spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
index dde153487d..7df6040456 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
similarity index 95%
rename from spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
index 8a8cec3f86..6323854099 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import javax.sql.DataSource;
 
diff --git a/spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
similarity index 81%
rename from spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
index 530c4d9f4a..020b50ceb2 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.depresolution;
+package com.baeldung.spring43.depresolution;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
similarity index 93%
rename from spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
index 6d06bfdc2a..29ce530a50 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.depresolution;
+package com.baeldung.spring43.depresolution;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java b/spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
similarity index 93%
rename from spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
rename to spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
index 24c1ec2f34..a7d9c16721 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
diff --git a/spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java b/spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
similarity index 98%
rename from spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
index 69cce15029..f2cea121cc 100644
--- a/spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/spring-vault/src/main/java/org/baeldung/springvault/Credentials.java b/spring-vault/src/main/java/com/baeldung/springvault/Credentials.java
similarity index 93%
rename from spring-vault/src/main/java/org/baeldung/springvault/Credentials.java
rename to spring-vault/src/main/java/com/baeldung/springvault/Credentials.java
index f90ab66a4e..548ebd4ff6 100644
--- a/spring-vault/src/main/java/org/baeldung/springvault/Credentials.java
+++ b/spring-vault/src/main/java/com/baeldung/springvault/Credentials.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 public class Credentials {
 
diff --git a/spring-vault/src/main/java/org/baeldung/springvault/CredentialsService.java b/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java
similarity index 76%
rename from spring-vault/src/main/java/org/baeldung/springvault/CredentialsService.java
rename to spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java
index 87c24bd947..6a4b7cb784 100644
--- a/spring-vault/src/main/java/org/baeldung/springvault/CredentialsService.java
+++ b/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java
@@ -1,16 +1,10 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
-import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.vault.authentication.TokenAuthentication;
-import org.springframework.vault.client.VaultEndpoint;
 import org.springframework.vault.core.VaultTemplate;
-import org.springframework.vault.core.env.VaultPropertySource;
-import org.springframework.vault.support.VaultResponse;
 import org.springframework.vault.support.VaultResponseSupport;
 
 /**
diff --git a/spring-vault/src/main/java/org/baeldung/springvault/SpringVaultApplication.java b/spring-vault/src/main/java/com/baeldung/springvault/SpringVaultApplication.java
similarity index 91%
rename from spring-vault/src/main/java/org/baeldung/springvault/SpringVaultApplication.java
rename to spring-vault/src/main/java/com/baeldung/springvault/SpringVaultApplication.java
index 916a809be5..979b2fb42e 100644
--- a/spring-vault/src/main/java/org/baeldung/springvault/SpringVaultApplication.java
+++ b/spring-vault/src/main/java/com/baeldung/springvault/SpringVaultApplication.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-vault/src/main/java/org/baeldung/springvault/VaultConfig.java b/spring-vault/src/main/java/com/baeldung/springvault/VaultConfig.java
similarity index 95%
rename from spring-vault/src/main/java/org/baeldung/springvault/VaultConfig.java
rename to spring-vault/src/main/java/com/baeldung/springvault/VaultConfig.java
index 106a1a3d42..f13c605bd8 100644
--- a/spring-vault/src/main/java/org/baeldung/springvault/VaultConfig.java
+++ b/spring-vault/src/main/java/com/baeldung/springvault/VaultConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.vault.authentication.ClientAuthentication;
diff --git a/spring-vault/src/main/java/org/baeldung/springvault/VaultEnvironmentConfig.java b/spring-vault/src/main/java/com/baeldung/springvault/VaultEnvironmentConfig.java
similarity index 95%
rename from spring-vault/src/main/java/org/baeldung/springvault/VaultEnvironmentConfig.java
rename to spring-vault/src/main/java/com/baeldung/springvault/VaultEnvironmentConfig.java
index 6c796bc718..4f5777e94c 100644
--- a/spring-vault/src/main/java/org/baeldung/springvault/VaultEnvironmentConfig.java
+++ b/spring-vault/src/main/java/com/baeldung/springvault/VaultEnvironmentConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
diff --git a/spring-vault/src/test/java/org/baeldung/SpringContextLiveTest.java b/spring-vault/src/test/java/com/baeldung/springvault/SpringContextLiveTest.java
similarity index 86%
rename from spring-vault/src/test/java/org/baeldung/SpringContextLiveTest.java
rename to spring-vault/src/test/java/com/baeldung/springvault/SpringContextLiveTest.java
index 60dc119f13..8139522745 100644
--- a/spring-vault/src/test/java/org/baeldung/SpringContextLiveTest.java
+++ b/spring-vault/src/test/java/com/baeldung/springvault/SpringContextLiveTest.java
@@ -1,6 +1,6 @@
-package org.baeldung;
+package com.baeldung.springvault;
 
-import org.baeldung.springvault.SpringVaultApplication;
+import com.baeldung.springvault.SpringVaultApplication;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-vault/src/test/java/org/baeldung/springvault/VaultInitializer.java b/spring-vault/src/test/java/com/baeldung/springvault/VaultInitializer.java
similarity index 99%
rename from spring-vault/src/test/java/org/baeldung/springvault/VaultInitializer.java
rename to spring-vault/src/test/java/com/baeldung/springvault/VaultInitializer.java
index c7db5eb199..a823a4cd27 100644
--- a/spring-vault/src/test/java/org/baeldung/springvault/VaultInitializer.java
+++ b/spring-vault/src/test/java/com/baeldung/springvault/VaultInitializer.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import java.io.BufferedReader;
 import java.io.Closeable;
diff --git a/spring-vault/src/test/java/org/baeldung/springvault/VaultIntegrationTest.java b/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java
similarity index 98%
rename from spring-vault/src/test/java/org/baeldung/springvault/VaultIntegrationTest.java
rename to spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java
index 9f4b5d82a4..dd8797aacc 100644
--- a/spring-vault/src/test/java/org/baeldung/springvault/VaultIntegrationTest.java
+++ b/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import org.junit.FixMethodOrder;
 import org.junit.Ignore;
diff --git a/spring-vault/src/test/java/org/baeldung/springvault/VaultTestConfiguration.java b/spring-vault/src/test/java/com/baeldung/springvault/VaultTestConfiguration.java
similarity index 96%
rename from spring-vault/src/test/java/org/baeldung/springvault/VaultTestConfiguration.java
rename to spring-vault/src/test/java/com/baeldung/springvault/VaultTestConfiguration.java
index 09a1445788..42f0bfbce9 100644
--- a/spring-vault/src/test/java/org/baeldung/springvault/VaultTestConfiguration.java
+++ b/spring-vault/src/test/java/com/baeldung/springvault/VaultTestConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/spring-webflux-amqp/pom.xml b/spring-webflux-amqp/pom.xml
index f9b14eea06..7a7f6ef600 100755
--- a/spring-webflux-amqp/pom.xml
+++ b/spring-webflux-amqp/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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.spring</groupId>
+    <groupId>com.baeldung.spring</groupId>
     <artifactId>spring-webflux-amqp</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <name>spring-webflux-amqp</name>
diff --git a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/AmqpReactiveController.java b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java
similarity index 94%
rename from spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/AmqpReactiveController.java
rename to spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java
index 52f6d924fa..b71c32bd05 100644
--- a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/AmqpReactiveController.java
+++ b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java
@@ -1,11 +1,9 @@
-package org.baeldung.spring.amqp;
+package com.baeldung.spring.amqp;
 
 import java.time.Duration;
-import java.util.Date;
 
 import javax.annotation.PostConstruct;
 
-import org.baeldung.spring.amqp.DestinationsConfig.DestinationInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.AmqpAdmin;
@@ -29,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
 
 @RestController
 public class AmqpReactiveController {
@@ -105,7 +102,7 @@ public class AmqpReactiveController {
     public Mono<ResponseEntity<?>> sendMessageToQueue(@PathVariable String name, @RequestBody String payload) {
 
         // Lookup exchange details
-        final DestinationInfo d = destinationsConfig.getQueues()
+        final DestinationsConfig.DestinationInfo d = destinationsConfig.getQueues()
             .get(name);
 
         if (d == null) {
@@ -135,7 +132,7 @@ public class AmqpReactiveController {
     @GetMapping(value = "/queue/{name}", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     public Flux<?> receiveMessagesFromQueue(@PathVariable String name) {
 
-        DestinationInfo d = destinationsConfig.getQueues()
+        DestinationsConfig.DestinationInfo d = destinationsConfig.getQueues()
             .get(name);
 
         if (d == null) {
@@ -201,7 +198,7 @@ public class AmqpReactiveController {
     public Mono<ResponseEntity<?>> sendMessageToTopic(@PathVariable String name, @RequestBody String payload) {
 
         // Lookup exchange details
-        final DestinationInfo d = destinationsConfig.getTopics()
+        final DestinationsConfig.DestinationInfo d = destinationsConfig.getTopics()
             .get(name);
         if (d == null) {
             // Destination not found.
@@ -223,7 +220,7 @@ public class AmqpReactiveController {
     @GetMapping(value = "/topic/{name}", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     public Flux<?> receiveMessagesFromTopic(@PathVariable String name) {
 
-        DestinationInfo d = destinationsConfig.getTopics()
+        DestinationsConfig.DestinationInfo d = destinationsConfig.getTopics()
             .get(name);
 
         if (d == null) {
@@ -281,7 +278,7 @@ public class AmqpReactiveController {
 
     }
 
-    private Queue createTopicQueue(DestinationInfo destination) {
+    private Queue createTopicQueue(DestinationsConfig.DestinationInfo destination) {
 
         Exchange ex = ExchangeBuilder.topicExchange(destination.getExchange())
           .durable(true)
diff --git a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/DestinationsConfig.java b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java
old mode 100755
new mode 100644
similarity index 93%
rename from spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/DestinationsConfig.java
rename to spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java
index 410b87c764..0f9a0d890f
--- a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/DestinationsConfig.java
+++ b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java
@@ -1,59 +1,59 @@
-package org.baeldung.spring.amqp;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties("destinations")
-public class DestinationsConfig {
-    
-    
-    private Map<String,DestinationInfo> queues = new HashMap<>();
-    
-    private Map<String,DestinationInfo> topics = new HashMap<>();
-    
-    
-
-    public Map<String, DestinationInfo> getQueues() {
-        return queues;
-    }
-
-    public void setQueues(Map<String, DestinationInfo> queues) {
-        this.queues = queues;
-    }
-
-    public Map<String, DestinationInfo> getTopics() {
-        return topics;
-    }
-
-    public void setTopics(Map<String, DestinationInfo> topics) {
-        this.topics = topics;
-    }
-
-    // DestinationInfo stores the Exchange name and routing key used
-    // by our producers when posting messages
-    static class DestinationInfo {
-        
-        private String exchange;
-        private String routingKey;
-        
-        
-        public String getExchange() {
-            return exchange;
-        }
-        public void setExchange(String exchange) {
-            this.exchange = exchange;
-        }
-        public String getRoutingKey() {
-            return routingKey;
-        }
-        public void setRoutingKey(String routingKey) {
-            this.routingKey = routingKey;
-        }
-        
-        
-        
-    }
-    
-}
+package com.baeldung.spring.amqp;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("destinations")
+public class DestinationsConfig {
+    
+    
+    private Map<String,DestinationInfo> queues = new HashMap<>();
+    
+    private Map<String,DestinationInfo> topics = new HashMap<>();
+    
+    
+
+    public Map<String, DestinationInfo> getQueues() {
+        return queues;
+    }
+
+    public void setQueues(Map<String, DestinationInfo> queues) {
+        this.queues = queues;
+    }
+
+    public Map<String, DestinationInfo> getTopics() {
+        return topics;
+    }
+
+    public void setTopics(Map<String, DestinationInfo> topics) {
+        this.topics = topics;
+    }
+
+    // DestinationInfo stores the Exchange name and routing key used
+    // by our producers when posting messages
+    static class DestinationInfo {
+        
+        private String exchange;
+        private String routingKey;
+        
+        
+        public String getExchange() {
+            return exchange;
+        }
+        public void setExchange(String exchange) {
+            this.exchange = exchange;
+        }
+        public String getRoutingKey() {
+            return routingKey;
+        }
+        public void setRoutingKey(String routingKey) {
+            this.routingKey = routingKey;
+        }
+        
+        
+        
+    }
+    
+}
diff --git a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/MessageListenerContainerFactory.java b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java
similarity index 96%
rename from spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/MessageListenerContainerFactory.java
rename to spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java
index 29b8d28a80..d868e6afa8 100644
--- a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/MessageListenerContainerFactory.java
+++ b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.amqp;
+package com.baeldung.spring.amqp;
 
 import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
diff --git a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
old mode 100755
new mode 100644
similarity index 97%
rename from spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
rename to spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
index 8a31299333..d6a7a84d30
--- a/spring-webflux-amqp/src/main/java/org/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
+++ b/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.amqp;
+package com.baeldung.spring.amqp;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextLiveTest.java b/spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java
similarity index 87%
rename from spring-webflux-amqp/src/test/java/org/baeldung/SpringContextLiveTest.java
rename to spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java
index 4d9f658cdc..c443042d3d 100644
--- a/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextLiveTest.java
+++ b/spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java
@@ -1,6 +1,6 @@
-package org.baeldung;
+package com.baeldung;
 
-import org.baeldung.spring.amqp.SpringWebfluxAmqpApplication;
+import com.baeldung.spring.amqp.SpringWebfluxAmqpApplication;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-webflux-amqp/src/test/java/org/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java b/spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java
old mode 100755
new mode 100644
similarity index 93%
rename from spring-webflux-amqp/src/test/java/org/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java
rename to spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java
index bda490c189..81782ce575
--- a/spring-webflux-amqp/src/test/java/org/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java
+++ b/spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.amqp;
+package com.baeldung.spring.amqp;
 
 import org.junit.Test;
 import org.springframework.test.web.reactive.server.WebTestClient;