diff --git a/lombok-2/README.md b/lombok-2/README.md
new file mode 100644
index 0000000000..25d097a7ea
--- /dev/null
+++ b/lombok-2/README.md
@@ -0,0 +1,10 @@
+## Project Lombok
+
+This module contains articles about Project Lombok.
+
+### Relevant Articles:
+
+- [Using Lombok’s @Accessors Annotation](https://www.baeldung.com/lombok-accessors)
+- [Declaring Val and Var Variables in Lombok](https://www.baeldung.com/java-lombok-val-var)
+- [Lombok Using @With Annotations](https://www.baeldung.com/lombok-with-annotations)
+- More articles: [[<-- prev]](../lombok)
diff --git a/lombok-2/lombok.config b/lombok-2/lombok.config
new file mode 100644
index 0000000000..f68b99fb85
--- /dev/null
+++ b/lombok-2/lombok.config
@@ -0,0 +1,2 @@
+config.stopBubbling = true
+lombok.experimental.flagUsage = warning
diff --git a/lombok-2/pom.xml b/lombok-2/pom.xml
new file mode 100644
index 0000000000..3c67e959a4
--- /dev/null
+++ b/lombok-2/pom.xml
@@ -0,0 +1,25 @@
+<?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>lombok-2</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>lombok-2</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/lombok/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java b/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java
rename to lombok-2/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/accessors/model/ChainedAccount.java b/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedAccount.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/accessors/model/ChainedAccount.java
rename to lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedAccount.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/accessors/model/ChainedFluentAccount.java b/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedFluentAccount.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/accessors/model/ChainedFluentAccount.java
rename to lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedFluentAccount.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/accessors/model/FluentAccount.java b/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FluentAccount.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/accessors/model/FluentAccount.java
rename to lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FluentAccount.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/accessors/model/PrefixedAccount.java b/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedAccount.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/accessors/model/PrefixedAccount.java
rename to lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedAccount.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/accessors/model/PrefixedFluentAccount.java b/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedFluentAccount.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/accessors/model/PrefixedFluentAccount.java
rename to lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedFluentAccount.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/accessors/model/StandardAccount.java b/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/StandardAccount.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/accessors/model/StandardAccount.java
rename to lombok-2/src/main/java/com/baeldung/lombok/accessors/model/StandardAccount.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/valvar/ValExample.java b/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/valvar/ValExample.java
rename to lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/valvar/VarExample.java b/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/valvar/VarExample.java
rename to lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/valvar/lombok.config b/lombok-2/src/main/java/com/baeldung/lombok/valvar/lombok.config
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/valvar/lombok.config
rename to lombok-2/src/main/java/com/baeldung/lombok/valvar/lombok.config
diff --git a/lombok/src/main/java/com/baeldung/lombok/with/Device.java b/lombok-2/src/main/java/com/baeldung/lombok/with/Device.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/with/Device.java
rename to lombok-2/src/main/java/com/baeldung/lombok/with/Device.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/with/Holder.java b/lombok-2/src/main/java/com/baeldung/lombok/with/Holder.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/with/Holder.java
rename to lombok-2/src/main/java/com/baeldung/lombok/with/Holder.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/with/ImprovedUser.java b/lombok-2/src/main/java/com/baeldung/lombok/with/ImprovedUser.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/with/ImprovedUser.java
rename to lombok-2/src/main/java/com/baeldung/lombok/with/ImprovedUser.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/with/KioskDevice.java b/lombok-2/src/main/java/com/baeldung/lombok/with/KioskDevice.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/with/KioskDevice.java
rename to lombok-2/src/main/java/com/baeldung/lombok/with/KioskDevice.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/with/Stock.java b/lombok-2/src/main/java/com/baeldung/lombok/with/Stock.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/with/Stock.java
rename to lombok-2/src/main/java/com/baeldung/lombok/with/Stock.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/with/User.java b/lombok-2/src/main/java/com/baeldung/lombok/with/User.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/with/User.java
rename to lombok-2/src/main/java/com/baeldung/lombok/with/User.java
diff --git a/lombok-2/src/main/resources/logback.xml b/lombok-2/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/lombok-2/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?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/lombok/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java b/lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java
rename to lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/valvar/ValExampleUnitTest.java b/lombok-2/src/test/java/com/baeldung/lombok/valvar/ValExampleUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/valvar/ValExampleUnitTest.java
rename to lombok-2/src/test/java/com/baeldung/lombok/valvar/ValExampleUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/valvar/VarExampleUnitTest.java b/lombok-2/src/test/java/com/baeldung/lombok/valvar/VarExampleUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/valvar/VarExampleUnitTest.java
rename to lombok-2/src/test/java/com/baeldung/lombok/valvar/VarExampleUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/with/HolderUnitTest.java b/lombok-2/src/test/java/com/baeldung/lombok/with/HolderUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/with/HolderUnitTest.java
rename to lombok-2/src/test/java/com/baeldung/lombok/with/HolderUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/with/ImprovedUserUnitTest.java b/lombok-2/src/test/java/com/baeldung/lombok/with/ImprovedUserUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/with/ImprovedUserUnitTest.java
rename to lombok-2/src/test/java/com/baeldung/lombok/with/ImprovedUserUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/with/KioskDeviceWithUnitTest.java b/lombok-2/src/test/java/com/baeldung/lombok/with/KioskDeviceWithUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/with/KioskDeviceWithUnitTest.java
rename to lombok-2/src/test/java/com/baeldung/lombok/with/KioskDeviceWithUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/with/StockWithUnitTest.java b/lombok-2/src/test/java/com/baeldung/lombok/with/StockWithUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/with/StockWithUnitTest.java
rename to lombok-2/src/test/java/com/baeldung/lombok/with/StockWithUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/with/UserWithUnitTest.java b/lombok-2/src/test/java/com/baeldung/lombok/with/UserWithUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/with/UserWithUnitTest.java
rename to lombok-2/src/test/java/com/baeldung/lombok/with/UserWithUnitTest.java
diff --git a/lombok/README.md b/lombok/README.md
index a92840f698..a3dcaf8c0b 100644
--- a/lombok/README.md
+++ b/lombok/README.md
@@ -12,8 +12,6 @@ This module contains articles about Project Lombok.
 - [Lombok Builder with Custom Setter](https://www.baeldung.com/lombok-builder-custom-setter)
 - [Setting up Lombok with Eclipse and Intellij](https://www.baeldung.com/lombok-ide)
 - [Using the @Singular Annotation with Lombok Builders](https://www.baeldung.com/lombok-builder-singular)
-- [Using Lombok’s @Accessors Annotation](https://www.baeldung.com/lombok-accessors)
 - [Omitting Getter or Setter in Lombok](https://www.baeldung.com/lombok-omit-getter-setter)
-- [Declaring Val and Var Variables in Lombok](https://www.baeldung.com/java-lombok-val-var)
-- [Lombok Using @With Annotations](https://www.baeldung.com/lombok-with-annotations)
 - [Lombok Configuration System](https://www.baeldung.com/lombok-configuration-system)
+- More articles: [[next -->]](../lombok-2)
\ No newline at end of file
diff --git a/lombok/pom.xml b/lombok/pom.xml
index 4a78c5422c..cb7caa07f9 100644
--- a/lombok/pom.xml
+++ b/lombok/pom.xml
@@ -17,7 +17,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <!-- Check for the most recent available version: https://projectlombok.org/changelog.html -->
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -63,18 +62,25 @@
                             <verbose>false</verbose>
                         </configuration>
                     </execution>
-                    <!-- This is for delomboking also your tests sources. <execution> <id>test-delombok</id> 
-                        <phase>generate-test-sources</phase> <goals> <goal>testDelombok</goal> </goals> <configuration> <verbose>false</verbose> 
-                        </configuration> </execution> -->
+                    <!-- This is for delomboking also your tests sources.
+                    <execution>
+                        <id>test-delombok</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>testDelombok</goal>
+                        </goals>
+                        <configuration>
+                            <verbose>false</verbose>
+                        </configuration>
+                    </execution>
+                    -->
                 </executions>
             </plugin>
         </plugins>
     </build>
 
     <properties>
-        <!-- various -->
         <hibernate-jpa-2.1-api.version>1.0.0.Final</hibernate-jpa-2.1-api.version>
-        <!-- delombok maven plugin -->
         <delombok-maven-plugin.version>1.18.20.0</delombok-maven-plugin.version>
     </properties>
 
diff --git a/lombok/src/main/README.md b/lombok/src/main/README.md
deleted file mode 100644
index 4092d8ce99..0000000000
--- a/lombok/src/main/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Relevant Articles:
-
-- [Guide to the Linux wc Command](https://www.baeldung.com/linux/wc-command)
diff --git a/pom.xml b/pom.xml
index 24357f452a..64fafb4e34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -503,6 +503,7 @@
                 <module>linkrest</module>
                 <module>logging-modules</module>
                 <module>lombok</module>
+                <module>lombok-2</module>
                 <module>lombok-custom</module>
                 <module>lucene</module>
 
@@ -984,6 +985,7 @@
                 <module>linkrest</module>
                 <module>logging-modules</module>
                 <module>lombok</module>
+                <module>lombok-2</module>
                 <module>lombok-custom</module>
                 <module>lucene</module>