diff --git a/core-java-modules/core-java-io-3/src/main/java/com/baeldung/copyfolder/ApacheCommons.java b/core-java-modules/core-java-io-3/src/main/java/com/baeldung/copydirectory/ApacheCommons.java
similarity index 51%
rename from core-java-modules/core-java-io-3/src/main/java/com/baeldung/copyfolder/ApacheCommons.java
rename to core-java-modules/core-java-io-3/src/main/java/com/baeldung/copydirectory/ApacheCommons.java
index 67af0594a4..b8aa283b48 100644
--- a/core-java-modules/core-java-io-3/src/main/java/com/baeldung/copyfolder/ApacheCommons.java
+++ b/core-java-modules/core-java-io-3/src/main/java/com/baeldung/copydirectory/ApacheCommons.java
@@ -1,4 +1,4 @@
-package com.baeldung.copyfolder;
+package com.baeldung.copydirectory;
 
 import java.io.File;
 import java.io.IOException;
@@ -8,8 +8,8 @@ import org.apache.commons.io.FileUtils;
 public class ApacheCommons {
 
     public static void copyDirectory(String sourceDirectoryLocation, String destinationDirectoryLocation) throws IOException {
-        File sourceFolder = new File(sourceDirectoryLocation);
-        File destinationFolder = new File(destinationDirectoryLocation);
-        FileUtils.copyDirectory(sourceFolder, destinationFolder);
+        File sourceDirectory = new File(sourceDirectoryLocation);
+        File destinationDirectory = new File(destinationDirectoryLocation);
+        FileUtils.copyDirectory(sourceDirectory, destinationDirectory);
     }
 }
diff --git a/core-java-modules/core-java-io-3/src/main/java/com/baeldung/copyfolder/CoreOld.java b/core-java-modules/core-java-io-3/src/main/java/com/baeldung/copydirectory/CoreOld.java
similarity index 69%
rename from core-java-modules/core-java-io-3/src/main/java/com/baeldung/copyfolder/CoreOld.java
rename to core-java-modules/core-java-io-3/src/main/java/com/baeldung/copydirectory/CoreOld.java
index d1a0158db3..2070977534 100644
--- a/core-java-modules/core-java-io-3/src/main/java/com/baeldung/copyfolder/CoreOld.java
+++ b/core-java-modules/core-java-io-3/src/main/java/com/baeldung/copydirectory/CoreOld.java
@@ -1,4 +1,4 @@
-package com.baeldung.copyfolder;
+package com.baeldung.copydirectory;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -17,12 +17,12 @@ public class CoreOld {
         }
     }
 
-    private static void copyDirectory(File sourceFolder, File destinationFolder) throws IOException {
-        if (!destinationFolder.exists()) {
-            destinationFolder.mkdir();
+    private static void copyDirectory(File sourceDirectory, File destinationDirectory) throws IOException {
+        if (!destinationDirectory.exists()) {
+            destinationDirectory.mkdir();
         }
-        for (String f : sourceFolder.list()) {
-            copyDirectoryJavaUnder7(new File(sourceFolder, f), new File(destinationFolder, f));
+        for (String f : sourceDirectory.list()) {
+            copyDirectoryJavaUnder7(new File(sourceDirectory, f), new File(destinationDirectory, f));
         }
     }
 
diff --git a/core-java-modules/core-java-io-3/src/main/java/com/baeldung/copyfolder/JavaNio.java b/core-java-modules/core-java-io-3/src/main/java/com/baeldung/copydirectory/JavaNio.java
similarity index 94%
rename from core-java-modules/core-java-io-3/src/main/java/com/baeldung/copyfolder/JavaNio.java
rename to core-java-modules/core-java-io-3/src/main/java/com/baeldung/copydirectory/JavaNio.java
index 368118a943..3f28bf0c9d 100644
--- a/core-java-modules/core-java-io-3/src/main/java/com/baeldung/copyfolder/JavaNio.java
+++ b/core-java-modules/core-java-io-3/src/main/java/com/baeldung/copydirectory/JavaNio.java
@@ -1,4 +1,4 @@
-package com.baeldung.copyfolder;
+package com.baeldung.copydirectory;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copydirectory/ApacheCommonsUnitTest.java b/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copydirectory/ApacheCommonsUnitTest.java
new file mode 100644
index 0000000000..3486a9af9d
--- /dev/null
+++ b/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copydirectory/ApacheCommonsUnitTest.java
@@ -0,0 +1,59 @@
+package com.baeldung.copydirectory;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Comparator;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class ApacheCommonsUnitTest {
+
+    private final String sourceDirectoryLocation = "src/test/resources/sourceDirectory";
+    private final String subDirectoryName = "/childDirectory";
+    private final String fileName = "/file.txt";
+    private final String destinationDirectoryLocation = "src/test/resources/destinationDirectory";
+
+    @BeforeEach
+    public void createDirectoryWithSubdirectoryAndFile() throws IOException {
+        Files.createDirectories(Paths.get(sourceDirectoryLocation));
+        Files.createDirectories(Paths.get(sourceDirectoryLocation + subDirectoryName));
+        Files.createFile(Paths.get(sourceDirectoryLocation + subDirectoryName + fileName));
+    }
+
+    @Test
+    public void whenSourceDirectoryExists_thenDirectoryIsFullyCopied() throws IOException {
+        ApacheCommons.copyDirectory(sourceDirectoryLocation, destinationDirectoryLocation);
+
+        assertTrue(new File(destinationDirectoryLocation).exists());
+        assertTrue(new File(destinationDirectoryLocation + subDirectoryName).exists());
+        assertTrue(new File(destinationDirectoryLocation + subDirectoryName + fileName).exists());
+    }
+
+    @Test
+    public void whenSourceDirectoryDoesNotExist_thenExceptionIsThrown() {
+        assertThrows(Exception.class, () -> ApacheCommons.copyDirectory("nonExistingDirectory", destinationDirectoryLocation));
+    }
+
+    @AfterEach
+    public void cleanUp() throws IOException {
+        Files.walk(Paths.get(sourceDirectoryLocation))
+            .sorted(Comparator.reverseOrder())
+            .map(Path::toFile)
+            .forEach(File::delete);
+        if (new File(destinationDirectoryLocation).exists()) {
+            Files.walk(Paths.get(destinationDirectoryLocation))
+                .sorted(Comparator.reverseOrder())
+                .map(Path::toFile)
+                .forEach(File::delete);
+        }
+    }
+
+}
diff --git a/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copydirectory/CoreOldUnitTest.java b/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copydirectory/CoreOldUnitTest.java
new file mode 100644
index 0000000000..53ae216399
--- /dev/null
+++ b/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copydirectory/CoreOldUnitTest.java
@@ -0,0 +1,63 @@
+package com.baeldung.copydirectory;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Comparator;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class CoreOldUnitTest {
+
+    private final String sourceDirectoryLocation = "src/test/resources/sourceDirectory";
+    private final String subDirectoryName = "/childDirectory";
+    private final String fileName = "/file.txt";
+    private final String destinationDirectoryLocation = "src/test/resources/destinationDirectory";
+
+    @BeforeEach
+    public void createDirectoryWithSubdirectoryAndFile() throws IOException {
+        Files.createDirectories(Paths.get(sourceDirectoryLocation));
+        Files.createDirectories(Paths.get(sourceDirectoryLocation + subDirectoryName));
+        Files.createFile(Paths.get(sourceDirectoryLocation + subDirectoryName + fileName));
+    }
+
+    @Test
+    public void whenSourceDirectoryExists_thenDirectoryIsFullyCopied() throws IOException {
+        File sourceDirectory = new File(sourceDirectoryLocation);
+        File destinationDirectory = new File(destinationDirectoryLocation);
+        CoreOld.copyDirectoryJavaUnder7(sourceDirectory, destinationDirectory);
+
+        assertTrue(new File(destinationDirectoryLocation).exists());
+        assertTrue(new File(destinationDirectoryLocation + subDirectoryName).exists());
+        assertTrue(new File(destinationDirectoryLocation + subDirectoryName + fileName).exists());
+    }
+
+    @Test
+    public void whenSourceDirectoryDoesNotExist_thenExceptionIsThrown() throws IOException {
+        File sourceDirectory = new File("nonExistingDirectory");
+        File destinationDirectory = new File(destinationDirectoryLocation);
+        assertThrows(IOException.class, () -> CoreOld.copyDirectoryJavaUnder7(sourceDirectory, destinationDirectory));
+    }
+
+    @AfterEach
+    public void cleanUp() throws IOException {
+        Files.walk(Paths.get(sourceDirectoryLocation))
+            .sorted(Comparator.reverseOrder())
+            .map(Path::toFile)
+            .forEach(File::delete);
+        if (new File(destinationDirectoryLocation).exists()) {
+            Files.walk(Paths.get(destinationDirectoryLocation))
+                .sorted(Comparator.reverseOrder())
+                .map(Path::toFile)
+                .forEach(File::delete);
+        }
+    }
+
+}
diff --git a/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copydirectory/JavaNioUnitTest.java b/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copydirectory/JavaNioUnitTest.java
new file mode 100644
index 0000000000..8d1eea53c9
--- /dev/null
+++ b/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copydirectory/JavaNioUnitTest.java
@@ -0,0 +1,59 @@
+package com.baeldung.copydirectory;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Comparator;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class JavaNioUnitTest {
+
+    private final String sourceDirectoryLocation = "src/test/resources/sourceDirectory";
+    private final String subDirectoryName = "/childDirectory";
+    private final String fileName = "/file.txt";
+    private final String destinationDirectoryLocation = "src/test/resources/destinationDirectory";
+
+    @BeforeEach
+    public void createDirectoryWithSubdirectoryAndFile() throws IOException {
+        Files.createDirectories(Paths.get(sourceDirectoryLocation));
+        Files.createDirectories(Paths.get(sourceDirectoryLocation + subDirectoryName));
+        Files.createFile(Paths.get(sourceDirectoryLocation + subDirectoryName + fileName));
+    }
+
+    @Test
+    public void whenSourceDirectoryExists_thenDirectoryIsFullyCopied() throws IOException {
+        JavaNio.copyDirectory(sourceDirectoryLocation, destinationDirectoryLocation);
+
+        assertTrue(new File(destinationDirectoryLocation).exists());
+        assertTrue(new File(destinationDirectoryLocation + subDirectoryName).exists());
+        assertTrue(new File(destinationDirectoryLocation + subDirectoryName + fileName).exists());
+    }
+
+    @Test
+    public void whenSourceDirectoryDoesNotExist_thenExceptionIsThrown() {
+        assertThrows(IOException.class, () -> JavaNio.copyDirectory("nonExistingDirectory", destinationDirectoryLocation));
+    }
+
+    @AfterEach
+    public void cleanUp() throws IOException {
+        Files.walk(Paths.get(sourceDirectoryLocation))
+            .sorted(Comparator.reverseOrder())
+            .map(Path::toFile)
+            .forEach(File::delete);
+        if (new File(destinationDirectoryLocation).exists()) {
+            Files.walk(Paths.get(destinationDirectoryLocation))
+                .sorted(Comparator.reverseOrder())
+                .map(Path::toFile)
+                .forEach(File::delete);
+        }
+    }
+
+}
diff --git a/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copyfolder/ApacheCommonsUnitTest.java b/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copyfolder/ApacheCommonsUnitTest.java
deleted file mode 100644
index 71e4c52104..0000000000
--- a/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copyfolder/ApacheCommonsUnitTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.baeldung.copyfolder;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Comparator;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-public class ApacheCommonsUnitTest {
-
-    private final String sourceFolderLocation = "src/test/resources/sourceFolder";
-    private final String subFolderName = "/childFolder";
-    private final String fileName = "/file.txt";
-    private final String destinationFolderLocation = "src/test/resources/destinationFolder";
-
-    @BeforeEach
-    public void createFolderWithSubfolderAndFile() throws IOException {
-        Files.createDirectories(Paths.get(sourceFolderLocation));
-        Files.createDirectories(Paths.get(sourceFolderLocation + subFolderName));
-        Files.createFile(Paths.get(sourceFolderLocation + subFolderName + fileName));
-    }
-
-    @Test
-    public void whenSourceFolderExists_thenFolderIsFullyCopied() throws IOException {
-        ApacheCommons.copyDirectory(sourceFolderLocation, destinationFolderLocation);
-
-        assertTrue(new File(destinationFolderLocation).exists());
-        assertTrue(new File(destinationFolderLocation + subFolderName).exists());
-        assertTrue(new File(destinationFolderLocation + subFolderName + fileName).exists());
-    }
-
-    @Test
-    public void whenSourceFolderDoesNotExist_thenExceptionIsThrown() {
-        assertThrows(Exception.class, () -> ApacheCommons.copyDirectory("nonExistingFolder", destinationFolderLocation));
-    }
-
-    @AfterEach
-    public void cleanUp() throws IOException {
-        Files.walk(Paths.get(sourceFolderLocation))
-            .sorted(Comparator.reverseOrder())
-            .map(Path::toFile)
-            .forEach(File::delete);
-        if (new File(destinationFolderLocation).exists()) {
-            Files.walk(Paths.get(destinationFolderLocation))
-                .sorted(Comparator.reverseOrder())
-                .map(Path::toFile)
-                .forEach(File::delete);
-        }
-    }
-
-}
diff --git a/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copyfolder/CoreOldUnitTest.java b/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copyfolder/CoreOldUnitTest.java
deleted file mode 100644
index ba45fd3cd0..0000000000
--- a/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copyfolder/CoreOldUnitTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.baeldung.copyfolder;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Comparator;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-public class CoreOldUnitTest {
-
-    private final String sourceFolderLocation = "src/test/resources/sourceFolder";
-    private final String subFolderName = "/childFolder";
-    private final String fileName = "/file.txt";
-    private final String destinationFolderLocation = "src/test/resources/destinationFolder";
-
-    @BeforeEach
-    public void createFolderWithSubfolderAndFile() throws IOException {
-        Files.createDirectories(Paths.get(sourceFolderLocation));
-        Files.createDirectories(Paths.get(sourceFolderLocation + subFolderName));
-        Files.createFile(Paths.get(sourceFolderLocation + subFolderName + fileName));
-    }
-
-    @Test
-    public void whenSourceFolderExists_thenFolderIsFullyCopied() throws IOException {
-        File sourceFolder = new File(sourceFolderLocation);
-        File destinationFolder = new File(destinationFolderLocation);
-        CoreOld.copyDirectoryJavaUnder7(sourceFolder, destinationFolder);
-
-        assertTrue(new File(destinationFolderLocation).exists());
-        assertTrue(new File(destinationFolderLocation + subFolderName).exists());
-        assertTrue(new File(destinationFolderLocation + subFolderName + fileName).exists());
-    }
-
-    @Test
-    public void whenSourceFolderDoesNotExist_thenExceptionIsThrown() throws IOException {
-        File sourceFolder = new File("nonExistingFolder");
-        File destinationFolder = new File(destinationFolderLocation);
-        assertThrows(IOException.class, () -> CoreOld.copyDirectoryJavaUnder7(sourceFolder, destinationFolder));
-    }
-
-    @AfterEach
-    public void cleanUp() throws IOException {
-        Files.walk(Paths.get(sourceFolderLocation))
-            .sorted(Comparator.reverseOrder())
-            .map(Path::toFile)
-            .forEach(File::delete);
-        if (new File(destinationFolderLocation).exists()) {
-            Files.walk(Paths.get(destinationFolderLocation))
-                .sorted(Comparator.reverseOrder())
-                .map(Path::toFile)
-                .forEach(File::delete);
-        }
-    }
-
-}
diff --git a/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copyfolder/JavaNioUnitTest.java b/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copyfolder/JavaNioUnitTest.java
deleted file mode 100644
index 162811912c..0000000000
--- a/core-java-modules/core-java-io-3/src/test/java/com/baeldung/copyfolder/JavaNioUnitTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.baeldung.copyfolder;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Comparator;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-public class JavaNioUnitTest {
-
-    private final String sourceFolderLocation = "src/test/resources/sourceFolder";
-    private final String subFolderName = "/childFolder";
-    private final String fileName = "/file.txt";
-    private final String destinationFolderLocation = "src/test/resources/destinationFolder";
-
-    @BeforeEach
-    public void createFolderWithSubfolderAndFile() throws IOException {
-        Files.createDirectories(Paths.get(sourceFolderLocation));
-        Files.createDirectories(Paths.get(sourceFolderLocation + subFolderName));
-        Files.createFile(Paths.get(sourceFolderLocation + subFolderName + fileName));
-    }
-
-    @Test
-    public void whenSourceFolderExists_thenFolderIsFullyCopied() throws IOException {
-        JavaNio.copyDirectory(sourceFolderLocation, destinationFolderLocation);
-
-        assertTrue(new File(destinationFolderLocation).exists());
-        assertTrue(new File(destinationFolderLocation + subFolderName).exists());
-        assertTrue(new File(destinationFolderLocation + subFolderName + fileName).exists());
-    }
-
-    @Test
-    public void whenSourceFolderDoesNotExist_thenExceptionIsThrown() {
-        assertThrows(IOException.class, () -> JavaNio.copyDirectory("nonExistingFolder", destinationFolderLocation));
-    }
-
-    @AfterEach
-    public void cleanUp() throws IOException {
-        Files.walk(Paths.get(sourceFolderLocation))
-            .sorted(Comparator.reverseOrder())
-            .map(Path::toFile)
-            .forEach(File::delete);
-        if (new File(destinationFolderLocation).exists()) {
-            Files.walk(Paths.get(destinationFolderLocation))
-                .sorted(Comparator.reverseOrder())
-                .map(Path::toFile)
-                .forEach(File::delete);
-        }
-    }
-
-}