diff --git a/spring-scheduling/src/main/java/org/baeldung/async/AsyncComponent.java b/spring-scheduling/src/main/java/com/baeldung/async/AsyncComponent.java
similarity index 97%
rename from spring-scheduling/src/main/java/org/baeldung/async/AsyncComponent.java
rename to spring-scheduling/src/main/java/com/baeldung/async/AsyncComponent.java
index 8503f75c8f..7d18b8b784 100644
--- a/spring-scheduling/src/main/java/org/baeldung/async/AsyncComponent.java
+++ b/spring-scheduling/src/main/java/com/baeldung/async/AsyncComponent.java
@@ -1,4 +1,4 @@
-package org.baeldung.async;
+package com.baeldung.async;
 
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncResult;
diff --git a/spring-scheduling/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java b/spring-scheduling/src/main/java/com/baeldung/async/CustomAsyncExceptionHandler.java
similarity index 95%
rename from spring-scheduling/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java
rename to spring-scheduling/src/main/java/com/baeldung/async/CustomAsyncExceptionHandler.java
index a7a177f8fe..ba95f000a2 100644
--- a/spring-scheduling/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java
+++ b/spring-scheduling/src/main/java/com/baeldung/async/CustomAsyncExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.baeldung.async;
+package com.baeldung.async;
 
 import java.lang.reflect.Method;
 
diff --git a/spring-scheduling/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java b/spring-scheduling/src/main/java/com/baeldung/async/config/SpringAsyncConfig.java
similarity index 89%
rename from spring-scheduling/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java
rename to spring-scheduling/src/main/java/com/baeldung/async/config/SpringAsyncConfig.java
index 0676258207..56fa643017 100644
--- a/spring-scheduling/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java
+++ b/spring-scheduling/src/main/java/com/baeldung/async/config/SpringAsyncConfig.java
@@ -1,8 +1,8 @@
-package org.baeldung.async.config;
+package com.baeldung.async.config;
 
 import java.util.concurrent.Executor;
 
-import org.baeldung.async.CustomAsyncExceptionHandler;
+import com.baeldung.async.CustomAsyncExceptionHandler;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -14,7 +14,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 @Configuration
 @EnableAsync()
-@ComponentScan("org.baeldung.async")
+@ComponentScan("com.baeldung.async")
 public class SpringAsyncConfig implements AsyncConfigurer {
 
     @Bean(name = "threadPoolTaskExecutor")
diff --git a/spring-scheduling/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java b/spring-scheduling/src/main/java/com/baeldung/scheduling/ScheduledAnnotationExample.java
similarity index 98%
rename from spring-scheduling/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java
rename to spring-scheduling/src/main/java/com/baeldung/scheduling/ScheduledAnnotationExample.java
index 23bbee3bc3..892347d615 100644
--- a/spring-scheduling/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java
+++ b/spring-scheduling/src/main/java/com/baeldung/scheduling/ScheduledAnnotationExample.java
@@ -1,4 +1,4 @@
-package org.baeldung.scheduling;
+package com.baeldung.scheduling;
 
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
diff --git a/spring-scheduling/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java b/spring-scheduling/src/main/java/com/baeldung/scheduling/SchedulingWithXmlConfig.java
similarity index 93%
rename from spring-scheduling/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java
rename to spring-scheduling/src/main/java/com/baeldung/scheduling/SchedulingWithXmlConfig.java
index d7da9ac19c..54856442f4 100644
--- a/spring-scheduling/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java
+++ b/spring-scheduling/src/main/java/com/baeldung/scheduling/SchedulingWithXmlConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.scheduling;
+package com.baeldung.scheduling;
 
 public class SchedulingWithXmlConfig {
 
diff --git a/spring-scheduling/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java b/spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingConfig.java
similarity index 90%
rename from spring-scheduling/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java
rename to spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingConfig.java
index 1d81fa0aa8..5d7f1cf88f 100644
--- a/spring-scheduling/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java
+++ b/spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.scheduling;
+package com.baeldung.scheduling;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -9,7 +9,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 
 @Configuration
 @EnableScheduling
-@ComponentScan("org.baeldung.scheduling")
+@ComponentScan("com.baeldung.scheduling")
 @PropertySource("classpath:springScheduled.properties")
 public class SpringSchedulingConfig {
 
diff --git a/spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java b/spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java
deleted file mode 100644
index 6000f75ec2..0000000000
--- a/spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.baeldung.scheduling;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-@Configuration
-@EnableScheduling
-@ComponentScan("com.baeldung.scheduling")
-public class SpringSchedulingFixedRateConfig {
-
-}
\ No newline at end of file
diff --git a/spring-scheduling/src/main/java/org/baeldung/springretry/AppConfig.java b/spring-scheduling/src/main/java/com/baeldung/springretry/AppConfig.java
similarity index 92%
rename from spring-scheduling/src/main/java/org/baeldung/springretry/AppConfig.java
rename to spring-scheduling/src/main/java/com/baeldung/springretry/AppConfig.java
index d9b081578c..e79beb370b 100644
--- a/spring-scheduling/src/main/java/org/baeldung/springretry/AppConfig.java
+++ b/spring-scheduling/src/main/java/com/baeldung/springretry/AppConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.springretry;
+package com.baeldung.springretry;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -9,7 +9,7 @@ import org.springframework.retry.policy.SimpleRetryPolicy;
 import org.springframework.retry.support.RetryTemplate;
 
 @Configuration
-@ComponentScan(basePackages = "org.baeldung.springretry")
+@ComponentScan(basePackages = "com.baeldung.springretry")
 @EnableRetry
 // Uncomment this two lines if we need XML configuration
 // @EnableAspectJAutoProxy
diff --git a/spring-scheduling/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java b/spring-scheduling/src/main/java/com/baeldung/springretry/DefaultListenerSupport.java
similarity index 96%
rename from spring-scheduling/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java
rename to spring-scheduling/src/main/java/com/baeldung/springretry/DefaultListenerSupport.java
index bc251b4c2f..0f9f1b6f0d 100644
--- a/spring-scheduling/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java
+++ b/spring-scheduling/src/main/java/com/baeldung/springretry/DefaultListenerSupport.java
@@ -1,4 +1,4 @@
-package org.baeldung.springretry;
+package com.baeldung.springretry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-scheduling/src/main/java/org/baeldung/springretry/MyService.java b/spring-scheduling/src/main/java/com/baeldung/springretry/MyService.java
similarity index 93%
rename from spring-scheduling/src/main/java/org/baeldung/springretry/MyService.java
rename to spring-scheduling/src/main/java/com/baeldung/springretry/MyService.java
index 6306ff3c26..409bf25845 100644
--- a/spring-scheduling/src/main/java/org/baeldung/springretry/MyService.java
+++ b/spring-scheduling/src/main/java/com/baeldung/springretry/MyService.java
@@ -1,4 +1,4 @@
-package org.baeldung.springretry;
+package com.baeldung.springretry;
 
 import java.sql.SQLException;
 
diff --git a/spring-scheduling/src/main/java/org/baeldung/springretry/MyServiceImpl.java b/spring-scheduling/src/main/java/com/baeldung/springretry/MyServiceImpl.java
similarity index 96%
rename from spring-scheduling/src/main/java/org/baeldung/springretry/MyServiceImpl.java
rename to spring-scheduling/src/main/java/com/baeldung/springretry/MyServiceImpl.java
index 1b698f26c9..3e4b5ed00d 100644
--- a/spring-scheduling/src/main/java/org/baeldung/springretry/MyServiceImpl.java
+++ b/spring-scheduling/src/main/java/com/baeldung/springretry/MyServiceImpl.java
@@ -1,4 +1,4 @@
-package org.baeldung.springretry;
+package com.baeldung.springretry;
 
 import java.sql.SQLException;
 
diff --git a/spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java b/spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
similarity index 93%
rename from spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
rename to spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
index 342a5fe3e6..c24c701df5 100644
--- a/spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
+++ b/spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.taskscheduler;
+package com.baeldung.taskscheduler;
 
 import java.util.concurrent.TimeUnit;
 
@@ -10,7 +10,7 @@ import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.scheduling.support.PeriodicTrigger;
 
 @Configuration
-@ComponentScan(basePackages = "org.baeldung.taskscheduler", basePackageClasses = { ThreadPoolTaskSchedulerExamples.class })
+@ComponentScan(basePackages = "com.baeldung.taskscheduler", basePackageClasses = { ThreadPoolTaskSchedulerExamples.class })
 public class ThreadPoolTaskSchedulerConfig {
 
     @Bean
diff --git a/spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java b/spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
similarity index 97%
rename from spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
rename to spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
index 5d72ed148a..c0c6f37507 100644
--- a/spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
+++ b/spring-scheduling/src/main/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
@@ -1,4 +1,4 @@
-package org.baeldung.taskscheduler;
+package com.baeldung.taskscheduler;
 
 import java.util.Date;
 
diff --git a/spring-scheduling/src/main/resources/retryadvice.xml b/spring-scheduling/src/main/resources/retryadvice.xml
index 79a9fc8660..8de7801a58 100644
--- a/spring-scheduling/src/main/resources/retryadvice.xml
+++ b/spring-scheduling/src/main/resources/retryadvice.xml
@@ -7,7 +7,7 @@
                            http://www.springframework.org/schema/beans/spring-beans.xsd">
     <aop:config>
         <aop:pointcut id="transactional"
-            expression="execution(* org.baeldung.springretry..*MyService.defaultXmlRetryService(..))" />
+            expression="execution(* com.baeldung.springretry..*MyService.defaultXmlRetryService(..))" />
         <aop:advisor pointcut-ref="transactional" advice-ref="taskRetryAdvice" order="-1" />
     </aop:config>
 
diff --git a/spring-scheduling/src/main/resources/springAsync-config.xml b/spring-scheduling/src/main/resources/springAsync-config.xml
index 40fc40c79f..48bfbb3f41 100644
--- a/spring-scheduling/src/main/resources/springAsync-config.xml
+++ b/spring-scheduling/src/main/resources/springAsync-config.xml
@@ -10,6 +10,6 @@
     <task:annotation-driven executor="myExecutor"/>
     <task:executor id="myExecutor" pool-size="5"/>
 
-    <bean id="asyncAnnotationExample" class="org.baeldung.async.AsyncComponent"/>
+    <bean id="asyncAnnotationExample" class="com.baeldung.async.AsyncComponent"/>
 
 </beans>
\ No newline at end of file
diff --git a/spring-scheduling/src/main/resources/springScheduled-config.xml b/spring-scheduling/src/main/resources/springScheduled-config.xml
index 4078f535da..1e42b118bd 100644
--- a/spring-scheduling/src/main/resources/springScheduled-config.xml
+++ b/spring-scheduling/src/main/resources/springScheduled-config.xml
@@ -16,7 +16,7 @@
     <bean id="myscheduler" class="org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler"/>
 
     <!-- Configure the fixedDealy, fixedRate or cron based scheduled tasks -->
-    <bean id="schedulingWithXmlConfig" class="org.baeldung.scheduling.SchedulingWithXmlConfig"/>
+    <bean id="schedulingWithXmlConfig" class="com.baeldung.scheduling.SchedulingWithXmlConfig"/>
 
     <task:scheduled-tasks scheduler="myScheduler">
         <task:scheduled ref="schedulingWithXmlConfig" method="scheduleFixedDelayTask"
diff --git a/spring-scheduling/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
similarity index 96%
rename from spring-scheduling/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
index 0c010cf732..875fb8bea8 100644
--- a/spring-scheduling/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
@@ -1,9 +1,9 @@
-package org.baeldung.async;
+package com.baeldung.async;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import org.baeldung.async.config.SpringAsyncConfig;
+import com.baeldung.async.config.SpringAsyncConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-scheduling/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/async/AsyncWithXMLIntegrationTest.java
similarity index 96%
rename from spring-scheduling/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/async/AsyncWithXMLIntegrationTest.java
index ffaa653a9a..95ef7d79ae 100644
--- a/spring-scheduling/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/async/AsyncWithXMLIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.async;
+package com.baeldung.async;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-scheduling/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
similarity index 87%
rename from spring-scheduling/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
index c5ca78aaa1..86ae6521e3 100644
--- a/spring-scheduling/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
@@ -1,5 +1,6 @@
-package org.baeldung.scheduling;
+package com.baeldung.scheduling;
 
+import com.baeldung.scheduling.SpringSchedulingConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
index ef7c7c68fd..72db6d1b47 100644
--- a/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { SpringSchedulingFixedRateConfig.class }, loader = AnnotationConfigContextLoader.class)
+@ContextConfiguration(classes = { SpringSchedulingConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class ScheduledFixedRateExampleIntegrationTest {
 
     @Test
diff --git a/spring-scheduling/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
similarity index 93%
rename from spring-scheduling/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
index 08df73f8fd..c1c1387bef 100644
--- a/spring-scheduling/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.scheduling;
+package com.baeldung.scheduling;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-scheduling/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/springretry/SpringRetryIntegrationTest.java
similarity index 97%
rename from spring-scheduling/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/springretry/SpringRetryIntegrationTest.java
index d7d0943e6b..2e5fb75482 100644
--- a/spring-scheduling/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/springretry/SpringRetryIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.springretry;
+package com.baeldung.springretry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-scheduling/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
similarity index 94%
rename from spring-scheduling/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
index 94c58cb17e..0b87b14ab6 100644
--- a/spring-scheduling/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.taskscheduler;
+package com.baeldung.taskscheduler;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;