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/README.md b/core-java-modules/core-java-8-2/README.md
index fe8dba5a8e..cb4d816400 100644
--- a/core-java-modules/core-java-8-2/README.md
+++ b/core-java-modules/core-java-8-2/README.md
@@ -3,11 +3,5 @@
 本模块中包含有关 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/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/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-2/src/main/resources/formats_fr.properties b/core-java-modules/core-java-8/src/main/resources/formats_fr.properties
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/resources/formats_fr.properties
rename to core-java-modules/core-java-8/src/main/resources/formats_fr.properties
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 100%
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
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-2/src/main/resources/messages_fr.properties b/core-java-modules/core-java-8/src/main/resources/messages_fr.properties
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/resources/messages_fr.properties
rename to core-java-modules/core-java-8/src/main/resources/messages_fr.properties
diff --git a/core-java-modules/core-java-8-2/src/main/resources/messages_it.properties b/core-java-modules/core-java-8/src/main/resources/messages_it.properties
similarity index 100%
rename from core-java-modules/core-java-8-2/src/main/resources/messages_it.properties
rename to core-java-modules/core-java-8/src/main/resources/messages_it.properties
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/pom.xml b/core-java-modules/core-java-collections-list/pom.xml
index 95b0415ca9..665ac12947 100644
--- a/core-java-modules/core-java-collections-list/pom.xml
+++ b/core-java-modules/core-java-collections-list/pom.xml
@@ -31,7 +31,7 @@
             <version>${trove4j.version}</version>
         </dependency>
         <dependency>
-            <groupId>it.unimi.dsi</groupId>
+            <groupId>fastutil</groupId>
             <artifactId>fastutil</artifactId>
             <version>${fastutil.version}</version>
         </dependency>
diff --git a/core-java-modules/core-java-collections-list/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
index 0ad2b8d273..e8c54ca136 100644
--- a/core-java-modules/core-java-collections-list/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/pom.xml b/core-java-modules/pom.xml
index be37892eec..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>