diff --git a/core-java-modules/core-java-lang-oop-modifiers-2/pom.xml b/core-java-modules/core-java-lang-oop-modifiers-2/pom.xml
new file mode 100644
index 000000000000..13948796aa37
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-modifiers-2/pom.xml
@@ -0,0 +1,29 @@
+<?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-lang-oop-modifiers-2</artifactId>
+    <packaging>jar</packaging>
+    <name>core-java-lang-oop-modifiers-2</name>
+
+    <parent>
+        <artifactId>core-java-modules</artifactId>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <h2.version>2.1.214</h2.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/finalkeyword/BlackCat.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/finalkeyword/BlackCat.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/finalkeyword/BlackCat.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/finalkeyword/BlackCat.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/finalkeyword/BlackDog.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/finalkeyword/BlackDog.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/finalkeyword/BlackDog.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/finalkeyword/BlackDog.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/finalkeyword/Cat.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/finalkeyword/Cat.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/finalkeyword/Cat.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/finalkeyword/Cat.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/finalkeyword/Dog.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/finalkeyword/Dog.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/finalkeyword/Dog.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/finalkeyword/Dog.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/privatemodifier/Employee.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/privatemodifier/Employee.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/privatemodifier/Employee.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/privatemodifier/Employee.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/privatemodifier/ExampleClass.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/privatemodifier/ExampleClass.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/privatemodifier/ExampleClass.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/privatemodifier/ExampleClass.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/privatemodifier/PublicOuterClass.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/privatemodifier/PublicOuterClass.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/privatemodifier/PublicOuterClass.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/privatemodifier/PublicOuterClass.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/publicmodifier/ListOfThree.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/publicmodifier/ListOfThree.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/publicmodifier/ListOfThree.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/publicmodifier/ListOfThree.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/publicmodifier/SpecialCharacters.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/publicmodifier/SpecialCharacters.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/publicmodifier/SpecialCharacters.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/publicmodifier/SpecialCharacters.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/publicmodifier/Student.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/publicmodifier/Student.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/publicmodifier/Student.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/publicmodifier/Student.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/CachingSingleton.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/CachingSingleton.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/CachingSingleton.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/CachingSingleton.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/FileSystemSingleton.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/FileSystemSingleton.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/FileSystemSingleton.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/FileSystemSingleton.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/MyLock.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/MyLock.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/MyLock.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/MyLock.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/SerializableCloneableSingleton.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/SerializableCloneableSingleton.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/SerializableCloneableSingleton.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/SerializableCloneableSingleton.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/SingletonInterface.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/SingletonInterface.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/SingletonInterface.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/SingletonInterface.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/SingletonLock.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/SingletonLock.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/SingletonLock.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/SingletonLock.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/SubUtility.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/SubUtility.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/SubUtility.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/SubUtility.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/SuperUtility.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/SuperUtility.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticsingletondifference/SuperUtility.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/staticsingletondifference/SuperUtility.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/strictfpUsage/Circle.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/strictfpUsage/Circle.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/strictfpUsage/Circle.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/strictfpUsage/Circle.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/strictfpUsage/ScientificCalculator.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/strictfpUsage/ScientificCalculator.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/strictfpUsage/ScientificCalculator.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/main/java/com/baeldung/strictfpUsage/ScientificCalculator.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/finalkeyword/FinalUnitTest.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/test/java/com/baeldung/finalkeyword/FinalUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/finalkeyword/FinalUnitTest.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/test/java/com/baeldung/finalkeyword/FinalUnitTest.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/publicmodifier/PublicAccessModifierUnitTest.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/test/java/com/baeldung/publicmodifier/PublicAccessModifierUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/publicmodifier/PublicAccessModifierUnitTest.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/test/java/com/baeldung/publicmodifier/PublicAccessModifierUnitTest.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/staticsingletondifference/ForSingletonsUnitTest.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/test/java/com/baeldung/staticsingletondifference/ForSingletonsUnitTest.java
similarity index 94%
rename from core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/staticsingletondifference/ForSingletonsUnitTest.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/test/java/com/baeldung/staticsingletondifference/ForSingletonsUnitTest.java
index 4b0b23b5ec6f..0a6491d4678f 100644
--- a/core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/staticsingletondifference/ForSingletonsUnitTest.java
+++ b/core-java-modules/core-java-lang-oop-modifiers-2/src/test/java/com/baeldung/staticsingletondifference/ForSingletonsUnitTest.java
@@ -1,15 +1,11 @@
 package com.baeldung.staticsingletondifference;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.stream.IntStream;
-
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.io.*;
+import java.util.stream.IntStream;
+
 public class ForSingletonsUnitTest {
 
     @Test
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/strictfpUsage/ScientificCalculatorUnitTest.java b/core-java-modules/core-java-lang-oop-modifiers-2/src/test/java/com/baeldung/strictfpUsage/ScientificCalculatorUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/strictfpUsage/ScientificCalculatorUnitTest.java
rename to core-java-modules/core-java-lang-oop-modifiers-2/src/test/java/com/baeldung/strictfpUsage/ScientificCalculatorUnitTest.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/pom.xml b/core-java-modules/core-java-lang-oop-modifiers/pom.xml
index b06d28ad9932..00832028ba76 100644
--- a/core-java-modules/core-java-lang-oop-modifiers/pom.xml
+++ b/core-java-modules/core-java-lang-oop-modifiers/pom.xml
@@ -1,23 +1,11 @@
 <?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">
+         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-lang-oop-modifiers</artifactId>
     <packaging>jar</packaging>
     <name>core-java-lang-oop-modifiers</name>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>16</source>
-                    <target>16</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
     <parent>
         <artifactId>core-java-modules</artifactId>
@@ -25,17 +13,4 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <h2.version>2.1.214</h2.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index 08b2b801ee14..1a1cca0ad55c 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -176,6 +176,7 @@
         <module>core-java-lang-oop-patterns</module>
         <module>core-java-lang-oop-generics</module>
         <module>core-java-lang-oop-modifiers</module>
+        <module>core-java-lang-oop-modifiers-2</module>
         <module>core-java-lang-oop-types</module>
         <module>core-java-lang-oop-types-2</module>
         <module>core-java-lang-oop-types-3</module>