diff --git a/core-java-modules/core-java-8-2/src/main/java/com/baeldung/delay/Delay.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/delay/Delay.java
similarity index 95%
rename from core-java-modules/core-java-8-2/src/main/java/com/baeldung/delay/Delay.java
rename to core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/delay/Delay.java
index 0cc0c9487f..1689c09f51 100644
--- a/core-java-modules/core-java-8-2/src/main/java/com/baeldung/delay/Delay.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/delay/Delay.java
@@ -1,4 +1,4 @@
-package com.baeldung.delay;
+package com.baeldung.concurrent.delay;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -61,6 +61,7 @@ public class Delay {
 
         executorService.schedule(Delay::someTask1, delayInSeconds, TimeUnit.SECONDS);
 
+        executorService.shutdown();
     }
 
     private static void fixedRateServiceTask(Integer delayInSeconds) {
@@ -78,6 +79,7 @@ public class Delay {
 
         sf.cancel(true);
 
+        executorService.shutdown();
     }
 
     private static void someTask1() {