diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0d92c7f2b6..742bfec4fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -27,20 +27,20 @@
         <module name="core-java-streams" />
         <module name="core-java-io-2" />
         <module name="core-java-io" />
-        <module name="core-java-8-2" />
         <module name="discourse" />
         <module name="image-processing" />
         <module name="spring-data-redis" />
         <module name="core-java" />
         <module name="core-java-collections-conversions-2" />
-        <module name="core-java-collections-list-3" />
         <module name="core-java-8" />
         <module name="core-java-collections-3" />
         <module name="core-java-collections-2" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
+      <module name="core-java-8-2" target="11" />
       <module name="core-java-collections-list-2" target="11" />
+      <module name="core-java-collections-list-3" target="1.5" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index d93942bfe5..3e6cf93d04 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
     <remote-repository>
-      <option name="id" value="ossez-repo-snapshots" />
-      <option name="name" value="OSSEZ Private Snapshots" />
-      <option name="url" value="https://repo.isharkfly.com/repository/maven-snapshots/" />
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="ossez-repo-snapshots" />
@@ -19,18 +19,53 @@
     <remote-repository>
       <option name="id" value="ossez-repo-releases" />
       <option name="name" value="OSSEZ Private Releases" />
-      <option name="url" value="https://repo.ossez.com/repository/maven-releases/" />
+      <option name="url" value="https://repo.isharkfly.com/repository/maven-public/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.ossez.com/repository/maven-public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="ossez-repo-releases" />
+      <option name="name" value="iSharkFly Private Releases" />
+      <option name="url" value="https://repo.isharkfly.com/repository/maven-public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
       <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="ossez-repo-snapshots" />
+      <option name="name" value="OSSEZ Private Snapshots" />
+      <option name="url" value="https://repo.isharkfly.com/repository/maven-public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="ossez-repo-snapshots" />
+      <option name="name" value="iSharkFly Private Snapshots" />
+      <option name="url" value="https://repo.isharkfly.com/repository/maven-public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="ossez-repo-snapshots" />
+      <option name="name" value="iSharkFly Private Snapshots" />
+      <option name="url" value="https://repo.isharkfly.com/repository/maven-snapshots/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="ossez-repo-snapshots" />
+      <option name="name" value="OSSEZ Private Snapshots" />
+      <option name="url" value="https://repo.isharkfly.com/repository/maven-snapshots/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="ossez-repo-releases" />
+      <option name="name" value="OSSEZ Private Releases" />
+      <option name="url" value="https://repo.ossez.com/repository/maven-releases/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="ossez-repo-releases" />
+      <option name="name" value="iSharkFly Private Releases" />
+      <option name="url" value="https://repo.isharkfly.com/repository/maven-releases/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />
diff --git a/core-java-modules/core-java-8-2/.gitignore b/core-java-modules/core-java-8-2/.gitignore
deleted file mode 100644
index 374c8bf907..0000000000
--- a/core-java-modules/core-java-8-2/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-*.class
-
-0.*
-
-#folders#
-/target
-/neoDb*
-/data
-/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-.resourceCache
-
-# Packaged files #
-*.jar
-*.war
-*.ear
-
-# Files generated by integration tests
-backup-pom.xml
-/bin/
-/temp
-
-#IntelliJ specific
-.idea/
-*.iml
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/README.md b/core-java-modules/core-java-8-2/README.md
deleted file mode 100644
index fe8dba5a8e..0000000000
--- a/core-java-modules/core-java-8-2/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-## Java 8 核心（第 2 部分）
-
-本模块中包含有关 Java 8 核心新增功能特性的一些文章。
-
-### 相关文章
-- [Run a Java Application from the Command Line](https://www.baeldung.com/java-run-jar-with-arguments)
-- [Java 8 Stream skip() vs limit()](https://www.baeldung.com/java-stream-skip-vs-limit)
-- [Guide to Java BiFunction Interface](https://www.baeldung.com/java-bifunction-interface)
-- [Interface With Default Methods vs Abstract Class](https://www.baeldung.com/java-interface-default-method-vs-abstract-class)
-- [Convert Between Byte Array and UUID in Java](https://www.baeldung.com/java-byte-array-to-uuid)
-- [Create a Simple “Rock-Paper-Scissors” Game in Java](https://www.baeldung.com/java-rock-paper-scissors)
-- [Java 8 开始新增的 Optional 类](https://www.ossez.com/t/java-8-optional/13964)
-- [[<-- Java 8 核心（第 1 部分）]](/core-java-modules/core-java-8)
diff --git a/core-java-modules/core-java-8-2/pom.xml b/core-java-modules/core-java-8-2/pom.xml
deleted file mode 100644
index 7c8a59c157..0000000000
--- a/core-java-modules/core-java-8-2/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>core-java-8-2</artifactId>
-    <name>core-java-8-2</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.ossez.core-java-modules</groupId>
-        <artifactId>core-java-modules</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.ibm.icu</groupId>
-            <artifactId>icu4j</artifactId>
-            <version>${icu.version}</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <icu.version>64.2</icu.version>
-    </properties>
-
-</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/src/main/resources/example_manifest.txt b/core-java-modules/core-java-8-2/src/main/resources/example_manifest.txt
deleted file mode 100644
index 71abcb05fb..0000000000
--- a/core-java-modules/core-java-8-2/src/main/resources/example_manifest.txt
+++ /dev/null
@@ -1 +0,0 @@
-Main-Class: com.baeldung.jarArguments.JarExample
diff --git a/core-java-modules/core-java-8-2/src/main/resources/formats_fr.properties b/core-java-modules/core-java-8-2/src/main/resources/formats_fr.properties
deleted file mode 100644
index c2d5159b32..0000000000
--- a/core-java-modules/core-java-8-2/src/main/resources/formats_fr.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-label={0, date, short}, {1}{2, choice, 0# ne|0<} vous a envoy� {2, choice, 0#aucun message|1#un message|2#deux messages|2<{2,number,integer} messages}.
-label-icu={0} {2, plural, =0 {ne } other {}}vous a envoy� {2, plural, =0 {aucun message} =1 {un message} other {{2, number, integer} messages}}.
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/src/main/resources/messages_fr.properties b/core-java-modules/core-java-8-2/src/main/resources/messages_fr.properties
deleted file mode 100644
index 6716102568..0000000000
--- a/core-java-modules/core-java-8-2/src/main/resources/messages_fr.properties
+++ /dev/null
@@ -1 +0,0 @@
-label=Alice vous a envoy� un message.
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/src/main/resources/messages_it.properties b/core-java-modules/core-java-8-2/src/main/resources/messages_it.properties
deleted file mode 100644
index 6929a8c091..0000000000
--- a/core-java-modules/core-java-8-2/src/main/resources/messages_it.properties
+++ /dev/null
@@ -1 +0,0 @@
-label=Alice ti ha inviato un messaggio.
\ No newline at end of file
diff --git a/core-java-modules/core-java-8/README.md b/core-java-modules/core-java-8/README.md
index 5ec4b3ddef..690997caa8 100644
--- a/core-java-modules/core-java-8/README.md
+++ b/core-java-modules/core-java-8/README.md
@@ -12,4 +12,10 @@
 - [Finding Min/Max in an Array with Java](https://www.baeldung.com/java-array-min-max)
 - [Internationalization and Localization in Java 8](https://www.baeldung.com/java-8-localization)
 - [Generalized Target-Type Inference in Java](https://www.baeldung.com/java-generalized-target-type-inference)
-- [[Java 8 核心（第 2 部分） -->]](/core-java-modules/core-java-8-2)
+- [Run a Java Application from the Command Line](https://www.baeldung.com/java-run-jar-with-arguments)
+- [Java 8 Stream skip() vs limit()](https://www.baeldung.com/java-stream-skip-vs-limit)
+- [Guide to Java BiFunction Interface](https://www.baeldung.com/java-bifunction-interface)
+- [Interface With Default Methods vs Abstract Class](https://www.baeldung.com/java-interface-default-method-vs-abstract-class)
+- [Convert Between Byte Array and UUID in Java](https://www.baeldung.com/java-byte-array-to-uuid)
+- [Create a Simple “Rock-Paper-Scissors” Game in Java](https://www.baeldung.com/java-rock-paper-scissors)
+- [Java 8 开始新增的 Optional 类](https://www.ossez.com/t/java-8-optional/13964)
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/ossez/game/RockPaperScissorsGame.java b/core-java-modules/core-java-8/src/main/java/com/ossez/game/RockPaperScissorsGame.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/java/com/ossez/game/RockPaperScissorsGame.java
rename to core-java-modules/core-java-8/src/main/java/com/ossez/game/RockPaperScissorsGame.java
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/ossez/interfaceVsAbstractClass/ChidlCircleInterfaceImpl.java b/core-java-modules/core-java-8/src/main/java/com/ossez/interfaceVsAbstractClass/ChidlCircleInterfaceImpl.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/java/com/ossez/interfaceVsAbstractClass/ChidlCircleInterfaceImpl.java
rename to core-java-modules/core-java-8/src/main/java/com/ossez/interfaceVsAbstractClass/ChidlCircleInterfaceImpl.java
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/ossez/interfaceVsAbstractClass/ChildCircleClass.java b/core-java-modules/core-java-8/src/main/java/com/ossez/interfaceVsAbstractClass/ChildCircleClass.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/java/com/ossez/interfaceVsAbstractClass/ChildCircleClass.java
rename to core-java-modules/core-java-8/src/main/java/com/ossez/interfaceVsAbstractClass/ChildCircleClass.java
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/ossez/interfaceVsAbstractClass/CircleClass.java b/core-java-modules/core-java-8/src/main/java/com/ossez/interfaceVsAbstractClass/CircleClass.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/java/com/ossez/interfaceVsAbstractClass/CircleClass.java
rename to core-java-modules/core-java-8/src/main/java/com/ossez/interfaceVsAbstractClass/CircleClass.java
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/ossez/interfaceVsAbstractClass/CircleInterface.java b/core-java-modules/core-java-8/src/main/java/com/ossez/interfaceVsAbstractClass/CircleInterface.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/java/com/ossez/interfaceVsAbstractClass/CircleInterface.java
rename to core-java-modules/core-java-8/src/main/java/com/ossez/interfaceVsAbstractClass/CircleInterface.java
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/ossez/jarArguments/JarExample.java b/core-java-modules/core-java-8/src/main/java/com/ossez/jarArguments/JarExample.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/java/com/ossez/jarArguments/JarExample.java
rename to core-java-modules/core-java-8/src/main/java/com/ossez/jarArguments/JarExample.java
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/ossez/localization/App.java b/core-java-modules/core-java-8/src/main/java/com/ossez/localization/App.java
similarity index 93%
rename from core-java-modules/core-java-8-2/src/main/java/com/ossez/localization/App.java
rename to core-java-modules/core-java-8/src/main/java/com/ossez/localization/App.java
index a5047b8d92..f1fee46776 100644
--- a/core-java-modules/core-java-8-2/src/main/java/com/ossez/localization/App.java
+++ b/core-java-modules/core-java-8/src/main/java/com/ossez/localization/App.java
@@ -1,6 +1,5 @@
 package com.ossez.localization;
 
-import java.text.ParseException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/ossez/localization/ICUFormat.java b/core-java-modules/core-java-8/src/main/java/com/ossez/localization/ICUFormat.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/java/com/ossez/localization/ICUFormat.java
rename to core-java-modules/core-java-8/src/main/java/com/ossez/localization/ICUFormat.java
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/ossez/localization/JavaSEFormat.java b/core-java-modules/core-java-8/src/main/java/com/ossez/localization/JavaSEFormat.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/java/com/ossez/localization/JavaSEFormat.java
rename to core-java-modules/core-java-8/src/main/java/com/ossez/localization/JavaSEFormat.java
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/ossez/localization/Localization.java b/core-java-modules/core-java-8/src/main/java/com/ossez/localization/Localization.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/java/com/ossez/localization/Localization.java
rename to core-java-modules/core-java-8/src/main/java/com/ossez/localization/Localization.java
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/ossez/stream/SkipLimitComparison.java b/core-java-modules/core-java-8/src/main/java/com/ossez/stream/SkipLimitComparison.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/java/com/ossez/stream/SkipLimitComparison.java
rename to core-java-modules/core-java-8/src/main/java/com/ossez/stream/SkipLimitComparison.java
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/ossez/uuid/UuidHelper.java b/core-java-modules/core-java-8/src/main/java/com/ossez/uuid/UuidHelper.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/java/com/ossez/uuid/UuidHelper.java
rename to core-java-modules/core-java-8/src/main/java/com/ossez/uuid/UuidHelper.java
diff --git a/core-java-modules/core-java-8-2/src/main/resources/META-INF/persistence.xml b/core-java-modules/core-java-8/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/resources/META-INF/persistence.xml
rename to core-java-modules/core-java-8/src/main/resources/META-INF/persistence.xml
diff --git a/core-java-modules/core-java-8-2/src/main/resources/formats_en.properties b/core-java-modules/core-java-8/src/main/resources/formats_en.properties
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/resources/formats_en.properties
rename to core-java-modules/core-java-8/src/main/resources/formats_en.properties
diff --git a/core-java-modules/core-java-8/src/main/resources/formats_fr.properties b/core-java-modules/core-java-8/src/main/resources/formats_fr.properties
new file mode 100644
index 0000000000..218385c54c
--- /dev/null
+++ b/core-java-modules/core-java-8/src/main/resources/formats_fr.properties
@@ -0,0 +1,2 @@
+label={0, date, short}, {1}{2, choice, 0# ne|0<} vous a envoyé {2, choice, 0#aucun message|1#un message|2#deux messages|2<{2,number,integer} messages}.
+label-icu={0} {2, plural, =0 {ne } other {}}vous a envoyé {2, plural, =0 {aucun message} =1 {un message} other {{2, number, integer} messages}}.
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/src/main/resources/formats_it.properties b/core-java-modules/core-java-8/src/main/resources/formats_it.properties
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/resources/formats_it.properties
rename to core-java-modules/core-java-8/src/main/resources/formats_it.properties
diff --git a/core-java-modules/core-java-8-2/src/main/resources/formats_pl.properties b/core-java-modules/core-java-8/src/main/resources/formats_pl.properties
similarity index 86%
rename from core-java-modules/core-java-8-2/src/main/resources/formats_pl.properties
rename to core-java-modules/core-java-8/src/main/resources/formats_pl.properties
index 9333ec3396..dc63d3720b 100644
--- a/core-java-modules/core-java-8-2/src/main/resources/formats_pl.properties
+++ b/core-java-modules/core-java-8/src/main/resources/formats_pl.properties
@@ -1,2 +1,2 @@
 label=W {0, date, short} {1}{2, choice, 0# nie|0<} wys\u0142a\u0142a ci {2, choice, 0#\u017Cadnych wiadomo\u015Bci|1#wiadomo\u015B\u0107|2#dwie wiadomo\u015Bci|2<{2, number, integer} wiadomo\u015Bci}.
-label-icu={0} {2, plural, =0 {nie } other {}}{1, select, male {wys\u0142a\u0142} female {wys\u0142a\u0142a} other {wys\u0142a\u0142o}} ci {2, plural, =0 {\u017Cadnej wiadomo\u015Bci} =1 {wiadomo\u015B\u0107} other {{2, number, integer} wiadomo\u015Bci}}.
+label-icu={0} {2, plural, =0 {nie } other {}}{1, select, male {wys\u0142a\u0142} female {wys\u0142a\u0142a} other {wys\u0142a\u0142o}} ci {2, plural, =0 {\u017Cadnej wiadomo\u015Bci} =1 {wiadomo\u015B\u0107} other {{2, number, integer} wiadomo\u015Bci}}.
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/src/main/resources/messages_en.properties b/core-java-modules/core-java-8/src/main/resources/messages_en.properties
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/resources/messages_en.properties
rename to core-java-modules/core-java-8/src/main/resources/messages_en.properties
diff --git a/core-java-modules/core-java-8/src/main/resources/messages_fr.properties b/core-java-modules/core-java-8/src/main/resources/messages_fr.properties
new file mode 100644
index 0000000000..9c1c9f9322
--- /dev/null
+++ b/core-java-modules/core-java-8/src/main/resources/messages_fr.properties
@@ -0,0 +1 @@
+label=Alice vous a envoyé un message.
\ No newline at end of file
diff --git a/core-java-modules/core-java-8/src/main/resources/messages_it.properties b/core-java-modules/core-java-8/src/main/resources/messages_it.properties
new file mode 100644
index 0000000000..be694a3ae7
--- /dev/null
+++ b/core-java-modules/core-java-8/src/main/resources/messages_it.properties
@@ -0,0 +1 @@
+label=Alice ti ha inviato un messaggio.
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/src/main/resources/messages_pl.properties b/core-java-modules/core-java-8/src/main/resources/messages_pl.properties
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/resources/messages_pl.properties
rename to core-java-modules/core-java-8/src/main/resources/messages_pl.properties
diff --git a/core-java-modules/core-java-8-2/src/test/java/com/ossez/bifunction/BiFunctionalInterfacesUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/ossez/bifunction/BiFunctionalInterfacesUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/test/java/com/ossez/bifunction/BiFunctionalInterfacesUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/ossez/bifunction/BiFunctionalInterfacesUnitTest.java
diff --git a/core-java-modules/core-java-8-2/src/test/java/com/ossez/interfaceVsAbstractClass/InterfaceVsAbstractClassUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/ossez/interfaceVsAbstractClass/InterfaceVsAbstractClassUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/test/java/com/ossez/interfaceVsAbstractClass/InterfaceVsAbstractClassUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/ossez/interfaceVsAbstractClass/InterfaceVsAbstractClassUnitTest.java
diff --git a/core-java-modules/core-java-8-2/src/test/java/com/ossez/localization/ICUFormatUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/ossez/localization/ICUFormatUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-8-2/src/test/java/com/ossez/localization/ICUFormatUnitTest.java
rename to core-java-modules/core-java-8/src/test/java/com/ossez/localization/ICUFormatUnitTest.java
diff --git a/core-java-modules/core-java-collections-list-3/README.md b/core-java-modules/core-java-collections-list-3/README.md
deleted file mode 100644
index 4948e293e6..0000000000
--- a/core-java-modules/core-java-collections-list-3/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## Java 核心（Core Java）集合中的 List 列表 （第3部分）
-
-This module contains articles about the Java List collection
-
-### Relevant Articles: 
-- [Collections.emptyList() vs. New List Instance](https://www.baeldung.com/java-collections-emptylist-new-list)
-- [Copy a List to Another List in Java](http://www.baeldung.com/java-copy-list-to-another)
-- [Determine If All Elements Are the Same in a Java List](https://www.baeldung.com/java-list-all-equal)
-- [List of Primitive Integer Values in Java](https://www.baeldung.com/java-list-primitive-int)
-- [Performance Comparison of Primitive Lists in Java](https://www.baeldung.com/java-list-primitive-performance)
-- [Filtering a Java Collection by a List](https://www.baeldung.com/java-filter-collection-by-list)
-- [How to Count Duplicate Elements in Arraylist](https://www.baeldung.com/java-count-duplicate-elements-arraylist)
-- [Finding the Differences Between Two Lists in Java](https://www.baeldung.com/java-lists-difference)
-- [[<-- Prev]](/core-java-modules/core-java-collections-list-2)
diff --git a/core-java-modules/core-java-collections-list-3/pom.xml b/core-java-modules/core-java-collections-list-3/pom.xml
deleted file mode 100644
index 3777d61278..0000000000
--- a/core-java-modules/core-java-collections-list-3/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>core-java-collections-list-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>core-java-collections-list-3</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.ossez.core-java-modules</groupId>
-        <artifactId>core-java-modules</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>${commons-collections4.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.trove4j</groupId>
-            <artifactId>trove4j</artifactId>
-            <version>${trove4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>it.unimi.dsi</groupId>
-            <artifactId>fastutil</artifactId>
-            <version>${fastutil.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>colt</groupId>
-            <artifactId>colt</artifactId>
-            <version>${colt.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-            <version>${jmh-core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh-generator.version}</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <trove4j.version>3.0.2</trove4j.version>
-        <fastutil.version>8.1.0</fastutil.version>
-        <colt.version>1.2.0</colt.version>
-    </properties>
-
-</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-list-3/src/main/resources/logback.xml b/core-java-modules/core-java-collections-list-3/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/core-java-modules/core-java-collections-list-3/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-list/README.md b/core-java-modules/core-java-collections-list/README.md
index 36ceee579c..837fdd8b2c 100644
--- a/core-java-modules/core-java-collections-list/README.md
+++ b/core-java-modules/core-java-collections-list/README.md
@@ -20,4 +20,14 @@
 - [Ways to Iterate Over a List in Java](https://www.baeldung.com/java-iterate-list)
 - [Flattening Nested Collections in Java](https://www.baeldung.com/java-flatten-nested-collections)
 - [Intersection of Two Lists in Java](https://www.baeldung.com/java-lists-intersection)
-- [Searching for a String in an ArrayList](https://www.baeldung.com/java-search-string-arraylist)
\ No newline at end of file
+- [Searching for a String in an ArrayList](https://www.baeldung.com/java-search-string-arraylist)
+- [Collections.emptyList() vs. New List Instance](https://www.baeldung.com/java-collections-emptylist-new-list)
+- [Copy a List to Another List in Java](http://www.baeldung.com/java-copy-list-to-another)
+- [Determine If All Elements Are the Same in a Java List](https://www.baeldung.com/java-list-all-equal)
+- [List of Primitive Integer Values in Java](https://www.baeldung.com/java-list-primitive-int)
+- [Performance Comparison of Primitive Lists in Java](https://www.baeldung.com/java-list-primitive-performance)
+- [Filtering a Java Collection by a List](https://www.baeldung.com/java-filter-collection-by-list)
+- [How to Count Duplicate Elements in Arraylist](https://www.baeldung.com/java-count-duplicate-elements-arraylist)
+- [Finding the Differences Between Two Lists in Java](https://www.baeldung.com/java-lists-difference)
+- [List vs. ArrayList in Java](https://www.baeldung.com/java-list-vs-arraylist)
+- [Set vs List in Java](https://www.baeldung.com/java-set-vs-list)
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-list/pom.xml b/core-java-modules/core-java-collections-list/pom.xml
index 5fcd835634..665ac12947 100644
--- a/core-java-modules/core-java-collections-list/pom.xml
+++ b/core-java-modules/core-java-collections-list/pom.xml
@@ -25,6 +25,31 @@
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.sf.trove4j</groupId>
+            <artifactId>trove4j</artifactId>
+            <version>${trove4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>fastutil</groupId>
+            <artifactId>fastutil</artifactId>
+            <version>${fastutil.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>colt</groupId>
+            <artifactId>colt</artifactId>
+            <version>${colt.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh-core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh-generator.version}</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/allequalelements/VerifyAllEqualListElements.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/allequalelements/VerifyAllEqualListElements.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/allequalelements/VerifyAllEqualListElements.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/allequalelements/VerifyAllEqualListElements.java
diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/collection/filtering/Employee.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/filtering/Employee.java
similarity index 95%
rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/collection/filtering/Employee.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/filtering/Employee.java
index 5ca4e2929d..e4ac3fce1e 100644
--- a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/collection/filtering/Employee.java
+++ b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/filtering/Employee.java
@@ -1,4 +1,4 @@
-package com.ossez.collection.filtering;
+package com.ossez.filtering;
 
 /**
  * Java 8 Collection Filtering by List of Values base class.
diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/java/list/Flower.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/java/list/Flower.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/java/list/Flower.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/java/list/Flower.java
diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/java/list/CopyListService.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/CopyListService.java
similarity index 98%
rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/java/list/CopyListService.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/CopyListService.java
index dbbe45d28a..1222c9ee42 100644
--- a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/java/list/CopyListService.java
+++ b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/CopyListService.java
@@ -1,4 +1,4 @@
-package com.ossez.java.list;
+package com.ossez.list;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/list/duplicatescounter/DuplicatesCounter.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/duplicatescounter/DuplicatesCounter.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/list/duplicatescounter/DuplicatesCounter.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/duplicatescounter/DuplicatesCounter.java
diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/list/primitive/PrimitiveCollections.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/primitive/PrimitiveCollections.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/list/primitive/PrimitiveCollections.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/primitive/PrimitiveCollections.java
diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/list/primitive/PrimitivesListPerformance.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/primitive/PrimitivesListPerformance.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-3/src/main/java/com/ossez/list/primitive/PrimitivesListPerformance.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/primitive/PrimitivesListPerformance.java
diff --git a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/allequalelements/VerifyAllEqualListElementsUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/allequalelements/VerifyAllEqualListElementsUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/allequalelements/VerifyAllEqualListElementsUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/allequalelements/VerifyAllEqualListElementsUnitTest.java
diff --git a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/collection/CollectionsEmpty.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/collection/CollectionsEmpty.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/collection/CollectionsEmpty.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/collection/CollectionsEmpty.java
diff --git a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java
similarity index 98%
rename from core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java
index 0ad2b8d273..e8c54ca136 100644
--- a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java
+++ b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/collection/filtering/CollectionFilteringUnitTest.java
@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.ossez.filtering.Employee;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/java/list/CopyListServiceUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/CopyListServiceUnitTest.java
similarity index 99%
rename from core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/java/list/CopyListServiceUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/CopyListServiceUnitTest.java
index c4eefc1249..7ca480978a 100644
--- a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/java/list/CopyListServiceUnitTest.java
+++ b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/CopyListServiceUnitTest.java
@@ -1,4 +1,4 @@
-package com.ossez.java.list;
+package com.ossez.list;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/list/difference/FindDifferencesBetweenListsUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/difference/FindDifferencesBetweenListsUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/list/difference/FindDifferencesBetweenListsUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/difference/FindDifferencesBetweenListsUnitTest.java
diff --git a/core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/list/duplicatescounter/DuplicatesCounterUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/duplicatescounter/DuplicatesCounterUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-3/src/test/java/com/ossez/list/duplicatescounter/DuplicatesCounterUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/duplicatescounter/DuplicatesCounterUnitTest.java
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index 9a5afb75d8..b638264f5e 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -17,7 +17,6 @@
     <modules>
         <module>core-java</module>
         <module>core-java-8</module>
-        <module>core-java-8-2</module>
         <module>core-java-11</module>
         <module>core-java-11-2</module>
         <module>core-java-annotations</module>
@@ -27,14 +26,12 @@
         <module>core-java-collections-conversions</module>
         <module>core-java-collections-conversions-2</module>
         <module>core-java-collections-list</module>
-        <module>core-java-collections-list-3</module>
         <module>core-java-datetime-conversion</module>
         <module>core-java-io</module>
         <module>core-java-io-2</module>
         <module>core-java-lambdas</module>
         <module>core-java-serialization</module>
         <module>core-java-streams</module>
-        <module>core-java-streams</module>
         <module>core-java-strings</module>
         <module>core-java-uuid</module>
     </modules>
diff --git a/pom.xml b/pom.xml
index 6bf67c1d33..21cf3f48c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,9 @@
         <version.guava>31.1-jre</version.guava>
         <lombok.version>1.18.28</lombok.version>
         <joda-time.version>2.12.5</joda-time.version>
+        <colt.version>1.2.0</colt.version>
+        <trove4j.version>3.0.3</trove4j.version>
+        <fastutil.version>5.0.9</fastutil.version>
 
         <!-- Hibernate / JPA -->
         <hibernate.version>4.3.5.Final</hibernate.version>
@@ -115,11 +118,15 @@
         <moneta.version>1.3</moneta.version>
         <jmh-core.version>1.33</jmh-core.version>
         <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
-        <maven-surefire-plugin.version>3.0.0-M8</maven-surefire-plugin.version>
-        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+
         <logback-classic.version>1.2.5</logback-classic.version>
         <rest-assured.version>3.1.1</rest-assured.version>
 
+        <!-- PLUGINS -->
+        <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M8</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+
     </properties>
 
 
@@ -238,6 +245,13 @@
             <version>1.5</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>httpunit</groupId>
             <artifactId>httpunit</artifactId>
@@ -329,7 +343,6 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -337,6 +350,15 @@
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <release>${java.version}</release>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>${maven-resources-plugin.version}</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
             <plugin>