diff --git a/lombok-modules/README.md b/lombok-modules/README.md
new file mode 100644
index 0000000000..b5a222b439
--- /dev/null
+++ b/lombok-modules/README.md
@@ -0,0 +1,3 @@
+## Project Lombok
+
+This module contains modules about project lombok
\ No newline at end of file
diff --git a/lombok-2/README.md b/lombok-modules/lombok-2/README.md
similarity index 100%
rename from lombok-2/README.md
rename to lombok-modules/lombok-2/README.md
diff --git a/lombok-2/lombok.config b/lombok-modules/lombok-2/lombok.config
similarity index 100%
rename from lombok-2/lombok.config
rename to lombok-modules/lombok-2/lombok.config
diff --git a/lombok-2/pom.xml b/lombok-modules/lombok-2/pom.xml
similarity index 94%
rename from lombok-2/pom.xml
rename to lombok-modules/lombok-2/pom.xml
index bde328444e..c92feed739 100644
--- a/lombok-2/pom.xml
+++ b/lombok-modules/lombok-2/pom.xml
@@ -9,7 +9,7 @@
com.baeldung
- parent-modules
+ lombok-modules
1.0.0-SNAPSHOT
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedAccount.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedAccount.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedAccount.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedFluentAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedFluentAccount.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedFluentAccount.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedFluentAccount.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FluentAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FluentAccount.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FluentAccount.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FluentAccount.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedAccount.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedAccount.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedAccount.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedFluentAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedFluentAccount.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedFluentAccount.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedFluentAccount.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/StandardAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/StandardAccount.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/StandardAccount.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/StandardAccount.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/tostring/Account.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/Account.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/tostring/Account.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/Account.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/tostring/AccountType.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/AccountType.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/tostring/AccountType.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/AccountType.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/tostring/RewardAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/RewardAccount.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/tostring/RewardAccount.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/RewardAccount.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/tostring/SavingAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/SavingAccount.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/tostring/SavingAccount.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/SavingAccount.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/valvar/lombok.config b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/lombok.config
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/valvar/lombok.config
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/lombok.config
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/with/Device.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/Device.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/with/Device.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/Device.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/with/Holder.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/Holder.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/with/Holder.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/Holder.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/with/ImprovedUser.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/ImprovedUser.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/with/ImprovedUser.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/ImprovedUser.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/with/KioskDevice.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/KioskDevice.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/with/KioskDevice.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/KioskDevice.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/with/Stock.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/Stock.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/with/Stock.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/Stock.java
diff --git a/lombok-2/src/main/java/com/baeldung/lombok/with/User.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/User.java
similarity index 100%
rename from lombok-2/src/main/java/com/baeldung/lombok/with/User.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/User.java
diff --git a/lombok-2/src/main/resources/logback.xml b/lombok-modules/lombok-2/src/main/resources/logback.xml
similarity index 100%
rename from lombok-2/src/main/resources/logback.xml
rename to lombok-modules/lombok-2/src/main/resources/logback.xml
diff --git a/lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java
similarity index 100%
rename from lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java
diff --git a/lombok-2/src/test/java/com/baeldung/lombok/tostring/ToStringUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/tostring/ToStringUnitTest.java
similarity index 100%
rename from lombok-2/src/test/java/com/baeldung/lombok/tostring/ToStringUnitTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/tostring/ToStringUnitTest.java
diff --git a/lombok-2/src/test/java/com/baeldung/lombok/valvar/ValExampleUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/valvar/ValExampleUnitTest.java
similarity index 100%
rename from lombok-2/src/test/java/com/baeldung/lombok/valvar/ValExampleUnitTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/valvar/ValExampleUnitTest.java
diff --git a/lombok-2/src/test/java/com/baeldung/lombok/valvar/VarExampleUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/valvar/VarExampleUnitTest.java
similarity index 100%
rename from lombok-2/src/test/java/com/baeldung/lombok/valvar/VarExampleUnitTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/valvar/VarExampleUnitTest.java
diff --git a/lombok-2/src/test/java/com/baeldung/lombok/with/HolderUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/HolderUnitTest.java
similarity index 100%
rename from lombok-2/src/test/java/com/baeldung/lombok/with/HolderUnitTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/HolderUnitTest.java
diff --git a/lombok-2/src/test/java/com/baeldung/lombok/with/ImprovedUserUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/ImprovedUserUnitTest.java
similarity index 100%
rename from lombok-2/src/test/java/com/baeldung/lombok/with/ImprovedUserUnitTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/ImprovedUserUnitTest.java
diff --git a/lombok-2/src/test/java/com/baeldung/lombok/with/KioskDeviceWithUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/KioskDeviceWithUnitTest.java
similarity index 100%
rename from lombok-2/src/test/java/com/baeldung/lombok/with/KioskDeviceWithUnitTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/KioskDeviceWithUnitTest.java
diff --git a/lombok-2/src/test/java/com/baeldung/lombok/with/StockWithUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/StockWithUnitTest.java
similarity index 100%
rename from lombok-2/src/test/java/com/baeldung/lombok/with/StockWithUnitTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/StockWithUnitTest.java
diff --git a/lombok-2/src/test/java/com/baeldung/lombok/with/UserWithUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/UserWithUnitTest.java
similarity index 100%
rename from lombok-2/src/test/java/com/baeldung/lombok/with/UserWithUnitTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/UserWithUnitTest.java
diff --git a/lombok-custom/README.md b/lombok-modules/lombok-custom/README.md
similarity index 100%
rename from lombok-custom/README.md
rename to lombok-modules/lombok-custom/README.md
diff --git a/lombok-custom/pom.xml b/lombok-modules/lombok-custom/pom.xml
similarity index 97%
rename from lombok-custom/pom.xml
rename to lombok-modules/lombok-custom/pom.xml
index dc7f0dfec6..c119900c8a 100644
--- a/lombok-custom/pom.xml
+++ b/lombok-modules/lombok-custom/pom.xml
@@ -9,7 +9,7 @@
com.baeldung
- parent-modules
+ lombok-modules
1.0.0-SNAPSHOT
diff --git a/lombok-custom/src/main/java/com/baeldung/singleton/Singleton.java b/lombok-modules/lombok-custom/src/main/java/com/baeldung/singleton/Singleton.java
similarity index 100%
rename from lombok-custom/src/main/java/com/baeldung/singleton/Singleton.java
rename to lombok-modules/lombok-custom/src/main/java/com/baeldung/singleton/Singleton.java
diff --git a/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonEclipseHandler.java b/lombok-modules/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonEclipseHandler.java
similarity index 100%
rename from lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonEclipseHandler.java
rename to lombok-modules/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonEclipseHandler.java
diff --git a/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonJavacHandler.java b/lombok-modules/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonJavacHandler.java
similarity index 100%
rename from lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonJavacHandler.java
rename to lombok-modules/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonJavacHandler.java
diff --git a/lombok/README.md b/lombok-modules/lombok/README.md
similarity index 100%
rename from lombok/README.md
rename to lombok-modules/lombok/README.md
diff --git a/lombok/lombok.config b/lombok-modules/lombok/lombok.config
similarity index 100%
rename from lombok/lombok.config
rename to lombok-modules/lombok/lombok.config
diff --git a/lombok/lombok_feature.config b/lombok-modules/lombok/lombok_feature.config
similarity index 100%
rename from lombok/lombok_feature.config
rename to lombok-modules/lombok/lombok_feature.config
diff --git a/lombok/pom.xml b/lombok-modules/lombok/pom.xml
similarity index 98%
rename from lombok/pom.xml
rename to lombok-modules/lombok/pom.xml
index 24a04783d1..70c5b09bb3 100644
--- a/lombok/pom.xml
+++ b/lombok-modules/lombok/pom.xml
@@ -9,7 +9,7 @@
com.baeldung
- parent-modules
+ lombok-modules
1.0.0-SNAPSHOT
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/ClientBuilder.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/ClientBuilder.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/ClientBuilder.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/ClientBuilder.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/ImmutableClient.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/ImmutableClient.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/ImmutableClient.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/ImmutableClient.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/RequiredFieldAnnotation.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/RequiredFieldAnnotation.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/RequiredFieldAnnotation.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/RequiredFieldAnnotation.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/Widget.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/Widget.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/Widget.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/Widget.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/customsetter/Message.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/customsetter/Message.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/customsetter/Message.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/customsetter/Message.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/defaultvalue/Pojo.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/defaultvalue/Pojo.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/defaultvalue/Pojo.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/defaultvalue/Pojo.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Child.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Child.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Child.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Child.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Parent.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Parent.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Parent.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Parent.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Student.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Student.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Student.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Student.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Child.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Child.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Child.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Child.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Parent.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Parent.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Parent.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Parent.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Student.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Student.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Student.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Student.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/singular/Person.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/singular/Person.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/singular/Person.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/singular/Person.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/singular/Sea.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/singular/Sea.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/builder/singular/Sea.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/singular/Sea.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/configexamples/Account.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/configexamples/Account.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/configexamples/Account.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/configexamples/Account.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/configexamples/TransactionLog.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/configexamples/TransactionLog.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/configexamples/TransactionLog.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/configexamples/TransactionLog.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/configexamples/lombok.config b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/configexamples/lombok.config
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/configexamples/lombok.config
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/configexamples/lombok.config
diff --git a/lombok/src/main/java/com/baeldung/lombok/exclusions/Employee.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/exclusions/Employee.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/exclusions/Employee.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/exclusions/Employee.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/exclusions/User.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/exclusions/User.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/exclusions/User.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/exclusions/User.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java
similarity index 93%
rename from lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java
index 2191396e5d..d3e142a90d 100644
--- a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java
+++ b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java
@@ -1,15 +1,15 @@
-package com.baeldung.lombok.getter;
-
-
-import lombok.Getter;
-
-/**
- * Related Article Sections:
- * 4. Using @Getter on a Boolean Field
- *
- */
-public class GetterBoolean {
-
- @Getter
- private Boolean running = true;
-}
+package com.baeldung.lombok.getter;
+
+
+import lombok.Getter;
+
+/**
+ * Related Article Sections:
+ * 4. Using @Getter on a Boolean Field
+ *
+ */
+public class GetterBoolean {
+
+ @Getter
+ private Boolean running = true;
+}
diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java
similarity index 93%
rename from lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java
index 5601f85b8b..2805ffc34b 100644
--- a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java
+++ b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java
@@ -1,16 +1,16 @@
-package com.baeldung.lombok.getter;
-
-
-import lombok.Getter;
-
-/**
- * Related Article Sections:
- * 3. Using @Getter on a boolean Field
- *
- */
-public class GetterBooleanPrimitive {
-
- @Getter
- private boolean running;
-
-}
+package com.baeldung.lombok.getter;
+
+
+import lombok.Getter;
+
+/**
+ * Related Article Sections:
+ * 3. Using @Getter on a boolean Field
+ *
+ */
+public class GetterBooleanPrimitive {
+
+ @Getter
+ private boolean running;
+
+}
diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java
similarity index 94%
rename from lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java
index af29a33c20..f3a037bd3b 100644
--- a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java
+++ b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java
@@ -1,18 +1,18 @@
-package com.baeldung.lombok.getter;
-
-
-import lombok.Getter;
-
-/**
- * Related Article Sections:
- * 3.2. Two boolean Fields With the Same Accessor Name
- *
- */
-public class GetterBooleanPrimitiveSameAccessor {
-
- @Getter
- boolean running = true;
-
- @Getter
- boolean isRunning = false;
-}
+package com.baeldung.lombok.getter;
+
+
+import lombok.Getter;
+
+/**
+ * Related Article Sections:
+ * 3.2. Two boolean Fields With the Same Accessor Name
+ *
+ */
+public class GetterBooleanPrimitiveSameAccessor {
+
+ @Getter
+ boolean running = true;
+
+ @Getter
+ boolean isRunning = false;
+}
diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java
similarity index 95%
rename from lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java
index d972273b71..773351904c 100644
--- a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java
+++ b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java
@@ -1,13 +1,13 @@
-package com.baeldung.lombok.getter;
-
-import lombok.Getter;
-
-/**
- * Related Article Sections:
- * 3.1. A boolean Field Having the Same Name With Its Accessor
- *
- */
-public class GetterBooleanSameAccessor {
- @Getter
- private boolean isRunning = true;
-}
+package com.baeldung.lombok.getter;
+
+import lombok.Getter;
+
+/**
+ * Related Article Sections:
+ * 3.1. A boolean Field Having the Same Name With Its Accessor
+ *
+ */
+public class GetterBooleanSameAccessor {
+ @Getter
+ private boolean isRunning = true;
+}
diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java
similarity index 93%
rename from lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java
index 0d3b9a928a..3dd77846a3 100644
--- a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java
+++ b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java
@@ -1,15 +1,15 @@
-package com.baeldung.lombok.getter;
-
-
-import lombok.Getter;
-
-/**
- * Related Article Sections:
- * 4. Using @Getter on a Boolean Field
- *
- */
-public class GetterBooleanType {
-
- @Getter
- private Boolean running = true;
-}
+package com.baeldung.lombok.getter;
+
+
+import lombok.Getter;
+
+/**
+ * Related Article Sections:
+ * 4. Using @Getter on a Boolean Field
+ *
+ */
+public class GetterBooleanType {
+
+ @Getter
+ private Boolean running = true;
+}
diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/ApiClientConfiguration.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ApiClientConfiguration.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/intro/ApiClientConfiguration.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ApiClientConfiguration.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/ClientBuilder.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ClientBuilder.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/intro/ClientBuilder.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ClientBuilder.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/ContactInformationSupport.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ContactInformationSupport.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/intro/ContactInformationSupport.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ContactInformationSupport.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/GetterLazy.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/GetterLazy.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/intro/GetterLazy.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/GetterLazy.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/HasContactInformation.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/HasContactInformation.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/intro/HasContactInformation.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/HasContactInformation.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/ImmutableClient.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ImmutableClient.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/intro/ImmutableClient.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ImmutableClient.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/LoginResult.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/LoginResult.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/intro/LoginResult.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/LoginResult.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/User.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/User.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/intro/User.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/User.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/UserEvent.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/UserEvent.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/intro/UserEvent.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/UserEvent.java
diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/Utility.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/Utility.java
similarity index 100%
rename from lombok/src/main/java/com/baeldung/lombok/intro/Utility.java
rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/Utility.java
diff --git a/lombok/src/main/resources/logback.xml b/lombok-modules/lombok/src/main/resources/logback.xml
similarity index 100%
rename from lombok/src/main/resources/logback.xml
rename to lombok-modules/lombok/src/main/resources/logback.xml
diff --git a/lombok/src/main/resources/sure_in_my_jar.txt b/lombok-modules/lombok/src/main/resources/sure_in_my_jar.txt
similarity index 100%
rename from lombok/src/main/resources/sure_in_my_jar.txt
rename to lombok-modules/lombok/src/main/resources/sure_in_my_jar.txt
diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/BuilderUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/BuilderUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/builder/BuilderUnitTest.java
rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/BuilderUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/RequiredFieldAnnotationUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/RequiredFieldAnnotationUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/builder/RequiredFieldAnnotationUnitTest.java
rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/RequiredFieldAnnotationUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/customsetter/BuilderWithCustomSetterUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/customsetter/BuilderWithCustomSetterUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/builder/customsetter/BuilderWithCustomSetterUnitTest.java
rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/customsetter/BuilderWithCustomSetterUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/defaultvalue/BuilderWithDefaultValueUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/defaultvalue/BuilderWithDefaultValueUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/builder/defaultvalue/BuilderWithDefaultValueUnitTest.java
rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/defaultvalue/BuilderWithDefaultValueUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/inheritance/buildermethodname/BuilderInheritanceUsingMethodNameUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/inheritance/buildermethodname/BuilderInheritanceUsingMethodNameUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/builder/inheritance/buildermethodname/BuilderInheritanceUsingMethodNameUnitTest.java
rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/inheritance/buildermethodname/BuilderInheritanceUsingMethodNameUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/inheritance/superbuilder/BuilderInheritanceUsingSuperBuilderUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/inheritance/superbuilder/BuilderInheritanceUsingSuperBuilderUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/builder/inheritance/superbuilder/BuilderInheritanceUsingSuperBuilderUnitTest.java
rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/inheritance/superbuilder/BuilderInheritanceUsingSuperBuilderUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/singular/BuilderWithSingularSupportForCollectionsUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/singular/BuilderWithSingularSupportForCollectionsUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/builder/singular/BuilderWithSingularSupportForCollectionsUnitTest.java
rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/singular/BuilderWithSingularSupportForCollectionsUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/configexamples/AccountUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/configexamples/AccountUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/configexamples/AccountUnitTest.java
rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/configexamples/AccountUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java
similarity index 97%
rename from lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java
rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java
index 632594d575..79d35129bd 100644
--- a/lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java
+++ b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java
@@ -1,34 +1,34 @@
-package com.baeldung.lombok.getter;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class GetterBooleanUnitTest {
-
- @Test
- public void whenBasicBooleanField_thenMethodNamePrefixedWithIsFollowedByFieldName() {
- GetterBooleanPrimitive lombokExamples = new GetterBooleanPrimitive();
- assertFalse(lombokExamples.isRunning());
- }
-
- @Test
- public void whenBooleanFieldPrefixedWithIs_thenMethodNameIsSameAsFieldName() {
- GetterBooleanSameAccessor lombokExamples = new GetterBooleanSameAccessor();
- assertTrue(lombokExamples.isRunning());
- }
-
- @Test
- public void whenTwoBooleanFieldsCauseNamingConflict_thenLombokMapsToFirstDeclaredField() {
- GetterBooleanPrimitiveSameAccessor lombokExamples = new GetterBooleanPrimitiveSameAccessor();
- assertTrue(lombokExamples.isRunning() == lombokExamples.running);
- assertFalse(lombokExamples.isRunning() == lombokExamples.isRunning);
- }
-
- @Test
- public void whenFieldOfBooleanType_thenLombokPrefixesMethodWithGetInsteadOfIs() {
- GetterBooleanType lombokExamples = new GetterBooleanType();
- assertTrue(lombokExamples.getRunning());
- }
-}
+package com.baeldung.lombok.getter;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class GetterBooleanUnitTest {
+
+ @Test
+ public void whenBasicBooleanField_thenMethodNamePrefixedWithIsFollowedByFieldName() {
+ GetterBooleanPrimitive lombokExamples = new GetterBooleanPrimitive();
+ assertFalse(lombokExamples.isRunning());
+ }
+
+ @Test
+ public void whenBooleanFieldPrefixedWithIs_thenMethodNameIsSameAsFieldName() {
+ GetterBooleanSameAccessor lombokExamples = new GetterBooleanSameAccessor();
+ assertTrue(lombokExamples.isRunning());
+ }
+
+ @Test
+ public void whenTwoBooleanFieldsCauseNamingConflict_thenLombokMapsToFirstDeclaredField() {
+ GetterBooleanPrimitiveSameAccessor lombokExamples = new GetterBooleanPrimitiveSameAccessor();
+ assertTrue(lombokExamples.isRunning() == lombokExamples.running);
+ assertFalse(lombokExamples.isRunning() == lombokExamples.isRunning);
+ }
+
+ @Test
+ public void whenFieldOfBooleanType_thenLombokPrefixesMethodWithGetInsteadOfIs() {
+ GetterBooleanType lombokExamples = new GetterBooleanType();
+ assertTrue(lombokExamples.getRunning());
+ }
+}
diff --git a/lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationIntegrationTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationIntegrationTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationIntegrationTest.java
rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationIntegrationTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/intro/BuilderMethodUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/BuilderMethodUnitTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/intro/BuilderMethodUnitTest.java
rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/BuilderMethodUnitTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/intro/LoginResultLiveTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/LoginResultLiveTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/intro/LoginResultLiveTest.java
rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/LoginResultLiveTest.java
diff --git a/lombok/src/test/java/com/baeldung/lombok/intro/UserIntegrationTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/UserIntegrationTest.java
similarity index 100%
rename from lombok/src/test/java/com/baeldung/lombok/intro/UserIntegrationTest.java
rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/UserIntegrationTest.java
diff --git a/lombok-modules/pom.xml b/lombok-modules/pom.xml
new file mode 100644
index 0000000000..905199a13c
--- /dev/null
+++ b/lombok-modules/pom.xml
@@ -0,0 +1,39 @@
+
+
+ 4.0.0
+ lombok-modules
+ 1.0.0-SNAPSHOT
+ lombok-modules
+ pom
+
+
+ com.baeldung
+ parent-boot-2
+ 0.0.1-SNAPSHOT
+ ../parent-boot-2
+
+
+
+ lombok
+ lombok-2
+ lombok-custom
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
+
+ 1.18.20
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a86aa03093..4b96a48fc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -475,9 +475,7 @@
libraries-testing
linkrest
logging-modules
- lombok
- lombok-2
- lombok-custom
+ lombok-modules
lucene
mapstruct
@@ -919,9 +917,7 @@
libraries-testing
linkrest
logging-modules
- lombok
- lombok-2
- lombok-custom
+ lombok-modules
lucene
mapstruct