diff --git a/spring-all/README.md b/spring-all/README.md
index c5825b47fb..3db7599914 100644
--- a/spring-all/README.md
+++ b/spring-all/README.md
@@ -18,14 +18,11 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Quick Guide to Spring Controllers](http://www.baeldung.com/spring-controllers)
 - [Quick Guide to Spring Bean Scopes](http://www.baeldung.com/spring-bean-scopes)
 - [Introduction To Ehcache](http://www.baeldung.com/ehcache)
-- [A Guide to the Spring Task Scheduler](http://www.baeldung.com/spring-task-scheduler)
-- [Guide to Spring Retry](http://www.baeldung.com/spring-retry)
 - [Custom Scope in Spring](http://www.baeldung.com/spring-custom-scope)
 - [A CLI with Spring Shell](http://www.baeldung.com/spring-shell-cli)
 - [JasperReports with Spring](http://www.baeldung.com/spring-jasper)
 - [Model, ModelMap, and ModelView in Spring MVC](http://www.baeldung.com/spring-mvc-model-model-map-model-view)
 - [A Guide To Caching in Spring](http://www.baeldung.com/spring-cache-tutorial)
-- [How To Do @Async in Spring](http://www.baeldung.com/spring-async)
 - [@Order in Spring](http://www.baeldung.com/spring-order)
 - [Spring Web Contexts](http://www.baeldung.com/spring-web-contexts)
 - [Spring Cache – Creating a Custom KeyGenerator](http://www.baeldung.com/spring-cache-custom-keygenerator)
diff --git a/spring-scheduling/README.md b/spring-scheduling/README.md
new file mode 100644
index 0000000000..72d5a7dc83
--- /dev/null
+++ b/spring-scheduling/README.md
@@ -0,0 +1,5 @@
+### Relevant articles:
+- [A Guide to the Spring Task Scheduler](http://www.baeldung.com/spring-task-scheduler)
+- [Guide to Spring Retry](http://www.baeldung.com/spring-retry)
+- [How To Do @Async in Spring](http://www.baeldung.com/spring-async)
+
diff --git a/spring-scheduling/pom.xml b/spring-scheduling/pom.xml
new file mode 100644
index 0000000000..1b48b55bd7
--- /dev/null
+++ b/spring-scheduling/pom.xml
@@ -0,0 +1,36 @@
+<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>
+    <artifactId>spring-scheduling</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-scheduling</name>
+    <packaging>war</packaging>
+
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/spring-all/src/main/java/com/baeldung/scheduling/ScheduledFixedRateExample.java b/spring-scheduling/src/main/java/com/baeldung/scheduling/ScheduledFixedRateExample.java
similarity index 100%
rename from spring-all/src/main/java/com/baeldung/scheduling/ScheduledFixedRateExample.java
rename to spring-scheduling/src/main/java/com/baeldung/scheduling/ScheduledFixedRateExample.java
diff --git a/spring-all/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java b/spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java
similarity index 100%
rename from spring-all/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java
rename to spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/async/AsyncComponent.java b/spring-scheduling/src/main/java/org/baeldung/async/AsyncComponent.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/async/AsyncComponent.java
rename to spring-scheduling/src/main/java/org/baeldung/async/AsyncComponent.java
diff --git a/spring-all/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java b/spring-scheduling/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java
rename to spring-scheduling/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java
diff --git a/spring-all/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java b/spring-scheduling/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java
rename to spring-scheduling/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java b/spring-scheduling/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java
rename to spring-scheduling/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java
diff --git a/spring-all/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java b/spring-scheduling/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java
rename to spring-scheduling/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java b/spring-scheduling/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java
rename to spring-scheduling/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/springretry/AppConfig.java b/spring-scheduling/src/main/java/org/baeldung/springretry/AppConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springretry/AppConfig.java
rename to spring-scheduling/src/main/java/org/baeldung/springretry/AppConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java b/spring-scheduling/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java
rename to spring-scheduling/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java
diff --git a/spring-all/src/main/java/org/baeldung/springretry/MyService.java b/spring-scheduling/src/main/java/org/baeldung/springretry/MyService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springretry/MyService.java
rename to spring-scheduling/src/main/java/org/baeldung/springretry/MyService.java
diff --git a/spring-all/src/main/java/org/baeldung/springretry/MyServiceImpl.java b/spring-scheduling/src/main/java/org/baeldung/springretry/MyServiceImpl.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springretry/MyServiceImpl.java
rename to spring-scheduling/src/main/java/org/baeldung/springretry/MyServiceImpl.java
diff --git a/spring-all/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java b/spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
rename to spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java b/spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
rename to spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
diff --git a/spring-all/src/main/resources/retryadvice.xml b/spring-scheduling/src/main/resources/retryadvice.xml
similarity index 96%
rename from spring-all/src/main/resources/retryadvice.xml
rename to spring-scheduling/src/main/resources/retryadvice.xml
index 8de7801a58..79a9fc8660 100644
--- a/spring-all/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(* com.baeldung.springretry..*MyService.defaultXmlRetryService(..))" />
+            expression="execution(* org.baeldung.springretry..*MyService.defaultXmlRetryService(..))" />
         <aop:advisor pointcut-ref="transactional" advice-ref="taskRetryAdvice" order="-1" />
     </aop:config>
 
diff --git a/spring-all/src/main/resources/springAsync-config.xml b/spring-scheduling/src/main/resources/springAsync-config.xml
similarity index 100%
rename from spring-all/src/main/resources/springAsync-config.xml
rename to spring-scheduling/src/main/resources/springAsync-config.xml
diff --git a/spring-all/src/main/resources/springScheduled-config.xml b/spring-scheduling/src/main/resources/springScheduled-config.xml
similarity index 100%
rename from spring-all/src/main/resources/springScheduled-config.xml
rename to spring-scheduling/src/main/resources/springScheduled-config.xml
diff --git a/spring-all/src/main/resources/springScheduled.properties b/spring-scheduling/src/main/resources/springScheduled.properties
similarity index 100%
rename from spring-all/src/main/resources/springScheduled.properties
rename to spring-scheduling/src/main/resources/springScheduled.properties
diff --git a/spring-all/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java b/spring-scheduling/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
rename to spring-scheduling/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java b/spring-scheduling/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java
rename to spring-scheduling/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java b/spring-scheduling/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
rename to spring-scheduling/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java b/spring-scheduling/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
rename to spring-scheduling/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java b/spring-scheduling/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java
rename to spring-scheduling/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java b/spring-scheduling/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
rename to spring-scheduling/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java