diff --git a/core-java-8/src/main/java/com/baeldung/unzip/UnzipFile.java b/core-java-8/src/main/java/com/baeldung/unzip/UnzipFile.java
index d0b4274731..813d8f20f8 100644
--- a/core-java-8/src/main/java/com/baeldung/unzip/UnzipFile.java
+++ b/core-java-8/src/main/java/com/baeldung/unzip/UnzipFile.java
@@ -2,27 +2,26 @@ package com.baeldung.unzip;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 public class UnzipFile {
-    public static void main(String[] args) throws FileNotFoundException, IOException {
-        String fileZip = "/opt/zipped/cities.zip";
-        byte[] buffer = new byte[1024];
-        ZipInputStream zis = new ZipInputStream(new FileInputStream(fileZip));
+    public static void main(final String[] args) throws IOException {
+        final String fileZip = "src/main/resources/compressed.zip";
+        final byte[] buffer = new byte[1024];
+        final ZipInputStream zis = new ZipInputStream(new FileInputStream(fileZip));
         ZipEntry zipEntry = zis.getNextEntry();
         while(zipEntry != null){
-            String fileName = zipEntry.getName();
-            File newFile = new File("/opt/unzipped/" + fileName);
-            FileOutputStream fos = new FileOutputStream(newFile);             
+            final String fileName = zipEntry.getName();
+            final File newFile = new File("src/main/resources/unzipTest/" + fileName);
+            final FileOutputStream fos = new FileOutputStream(newFile);
             int len;
             while ((len = zis.read(buffer)) > 0) {
                 fos.write(buffer, 0, len);
             }
-            fos.close();   
+            fos.close();
             zipEntry = zis.getNextEntry();
         }
         zis.closeEntry();
diff --git a/core-java-8/src/main/java/com/baeldung/zip/ZipDirectory.java b/core-java-8/src/main/java/com/baeldung/zip/ZipDirectory.java
new file mode 100644
index 0000000000..7da71a093d
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/zip/ZipDirectory.java
@@ -0,0 +1,43 @@
+package com.baeldung.zip;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+public class ZipDirectory {
+    public static void main(final String[] args) throws IOException {
+        final String sourceFile = "src/main/resources/zipTest";
+        final FileOutputStream fos = new FileOutputStream("src/main/resources/dirCompressed.zip");
+        final ZipOutputStream zipOut = new ZipOutputStream(fos);
+        final File fileToZip = new File(sourceFile);
+
+        zipFile(fileToZip, fileToZip.getName(), zipOut);
+        zipOut.close();
+        fos.close();
+    }
+
+    private static void zipFile(final File fileToZip, final String fileName, final ZipOutputStream zipOut) throws IOException {
+        if (fileToZip.isHidden()) {
+            return;
+        }
+        if (fileToZip.isDirectory()) {
+            final File[] children = fileToZip.listFiles();
+            for (final File childFile : children) {
+                zipFile(childFile, fileName + "/" + childFile.getName(), zipOut);
+            }
+            return;
+        }
+        final FileInputStream fis = new FileInputStream(fileToZip);
+        final ZipEntry zipEntry = new ZipEntry(fileName);
+        zipOut.putNextEntry(zipEntry);
+        final byte[] bytes = new byte[1024];
+        int length;
+        while ((length = fis.read(bytes)) >= 0) {
+            zipOut.write(bytes, 0, length);
+        }
+        fis.close();
+    }
+}
\ No newline at end of file
diff --git a/core-java-8/src/main/java/com/baeldung/zip/ZipFile.java b/core-java-8/src/main/java/com/baeldung/zip/ZipFile.java
index dccd3f2347..af80ec9609 100644
--- a/core-java-8/src/main/java/com/baeldung/zip/ZipFile.java
+++ b/core-java-8/src/main/java/com/baeldung/zip/ZipFile.java
@@ -2,22 +2,21 @@ package com.baeldung.zip;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 public class ZipFile {
-    public static void main(String[] args) throws FileNotFoundException, IOException {
-        String sourceFile = "/opt/photos/photo.png";
-        FileOutputStream fos = new FileOutputStream("/opt/zipped/cities.zip");		
-        ZipOutputStream zipOut = new ZipOutputStream(fos);
-        File fileToZip = new File(sourceFile);
-        FileInputStream fis = new FileInputStream(fileToZip);
-        ZipEntry zipEntry = new ZipEntry(fileToZip.getName());
+    public static void main(final String[] args) throws IOException {
+        final String sourceFile = "src/main/resources/zipTest/test1.txt";
+        final FileOutputStream fos = new FileOutputStream("src/main/resources/compressed.zip");
+        final ZipOutputStream zipOut = new ZipOutputStream(fos);
+        final File fileToZip = new File(sourceFile);
+        final FileInputStream fis = new FileInputStream(fileToZip);
+        final ZipEntry zipEntry = new ZipEntry(fileToZip.getName());
         zipOut.putNextEntry(zipEntry);
-        byte[] bytes = new byte[1024];
+        final byte[] bytes = new byte[1024];
         int length;
         while((length = fis.read(bytes)) >= 0) {
             zipOut.write(bytes, 0, length);
diff --git a/core-java-8/src/main/java/com/baeldung/zip/ZipMultipleFiles.java b/core-java-8/src/main/java/com/baeldung/zip/ZipMultipleFiles.java
new file mode 100644
index 0000000000..211696195d
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/zip/ZipMultipleFiles.java
@@ -0,0 +1,33 @@
+package com.baeldung.zip;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+public class ZipMultipleFiles {
+    public static void main(final String[] args) throws IOException {
+        final List<String> srcFiles = Arrays.asList("src/main/resources/zipTest/test1.txt", "src/main/resources/zipTest/test2.txt");
+        final FileOutputStream fos = new FileOutputStream("src/main/resources/multiCompressed.zip");
+        final ZipOutputStream zipOut = new ZipOutputStream(fos);
+        for (final String srcFile : srcFiles) {
+            final File fileToZip = new File(srcFile);
+            final FileInputStream fis = new FileInputStream(fileToZip);
+            final ZipEntry zipEntry = new ZipEntry(fileToZip.getName());
+            zipOut.putNextEntry(zipEntry);
+
+            final byte[] bytes = new byte[1024];
+            int length;
+            while((length = fis.read(bytes)) >= 0) {
+                zipOut.write(bytes, 0, length);
+            }
+            fis.close();
+        }
+        zipOut.close();
+        fos.close();
+    }
+}
\ No newline at end of file
diff --git a/core-java-8/src/main/resources/compressed.zip b/core-java-8/src/main/resources/compressed.zip
new file mode 100644
index 0000000000..03f840ae2b
Binary files /dev/null and b/core-java-8/src/main/resources/compressed.zip differ
diff --git a/core-java-8/src/main/resources/dirCompressed.zip b/core-java-8/src/main/resources/dirCompressed.zip
new file mode 100644
index 0000000000..f42d3aa5c6
Binary files /dev/null and b/core-java-8/src/main/resources/dirCompressed.zip differ
diff --git a/core-java-8/src/main/resources/multiCompressed.zip b/core-java-8/src/main/resources/multiCompressed.zip
new file mode 100644
index 0000000000..002e70ef81
Binary files /dev/null and b/core-java-8/src/main/resources/multiCompressed.zip differ
diff --git a/core-java-8/src/main/resources/unzipTest/test1.txt b/core-java-8/src/main/resources/unzipTest/test1.txt
new file mode 100644
index 0000000000..c57eff55eb
--- /dev/null
+++ b/core-java-8/src/main/resources/unzipTest/test1.txt
@@ -0,0 +1 @@
+Hello World!
\ No newline at end of file
diff --git a/core-java-8/src/main/resources/zipTest/test1.txt b/core-java-8/src/main/resources/zipTest/test1.txt
new file mode 100644
index 0000000000..c57eff55eb
--- /dev/null
+++ b/core-java-8/src/main/resources/zipTest/test1.txt
@@ -0,0 +1 @@
+Hello World!
\ No newline at end of file
diff --git a/core-java-8/src/main/resources/zipTest/test2.txt b/core-java-8/src/main/resources/zipTest/test2.txt
new file mode 100644
index 0000000000..f0fb0f14d1
--- /dev/null
+++ b/core-java-8/src/main/resources/zipTest/test2.txt
@@ -0,0 +1 @@
+My Name is John
\ No newline at end of file
diff --git a/core-java-8/src/main/resources/zipTest/testFolder/test3.txt b/core-java-8/src/main/resources/zipTest/testFolder/test3.txt
new file mode 100644
index 0000000000..882edb168e
--- /dev/null
+++ b/core-java-8/src/main/resources/zipTest/testFolder/test3.txt
@@ -0,0 +1 @@
+My Name is Tom
\ No newline at end of file
diff --git a/core-java-8/src/main/resources/zipTest/testFolder/test4.txt b/core-java-8/src/main/resources/zipTest/testFolder/test4.txt
new file mode 100644
index 0000000000..a78c3fadc8
--- /dev/null
+++ b/core-java-8/src/main/resources/zipTest/testFolder/test4.txt
@@ -0,0 +1 @@
+My Name is Jane
\ No newline at end of file