diff --git a/algorithms-miscellaneous-3/README.md b/algorithms-miscellaneous-3/README.md
index cd3711d573..6a38df484a 100644
--- a/algorithms-miscellaneous-3/README.md
+++ b/algorithms-miscellaneous-3/README.md
@@ -1,4 +1,4 @@
-## Relevant articles:
+## Relevant Articles:
 
 - [Java Two Pointer Technique](https://www.baeldung.com/java-two-pointer-technique)
 - [Implementing Simple State Machines with Java Enums](https://www.baeldung.com/java-enum-simple-state-machine)
diff --git a/algorithms-miscellaneous-3/pom.xml b/algorithms-miscellaneous-3/pom.xml
index 3cebdd09ac..802cf74320 100644
--- a/algorithms-miscellaneous-3/pom.xml
+++ b/algorithms-miscellaneous-3/pom.xml
@@ -30,6 +30,19 @@
         	<artifactId>guava</artifactId>
         	<version>${guava.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.8.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>pl.pragmatists</groupId>
+            <artifactId>JUnitParams</artifactId>
+            <version>1.1.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamples.java b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamples.java
new file mode 100644
index 0000000000..a67c54a922
--- /dev/null
+++ b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamples.java
@@ -0,0 +1,49 @@
+package com.baeldung.algorithms.printtriangles;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class PrintTriangleExamples {
+
+    public static String printARightAngledTriangle(int N) {
+        StringBuilder result = new StringBuilder();
+        for (int r = 1; r <= N; r++) {
+            for (int j = 1; j <= r; j++) {
+                result.append("*");
+            }
+            result.append(System.lineSeparator());
+        }
+        return result.toString();
+    }
+
+    public static String printAnIsoscelesTriangle(int N) {
+        StringBuilder result = new StringBuilder();
+        for (int r = 1; r <= N; r++) {
+            for (int sp = 1; sp <= N - r; sp++) {
+                result.append(" ");
+            }
+            for (int c = 1; c <= (r * 2) - 1; c++) {
+                result.append("*");
+            }
+            result.append(System.lineSeparator());
+        }
+        return result.toString();
+    }
+
+    public static String printAnIsoscelesTriangleUsingSubstring(int N) {
+        StringBuilder result = new StringBuilder();
+        String helperString = StringUtils.repeat(' ', N - 1) + StringUtils.repeat('*', N * 2 - 1);
+
+        for (int r = 0; r < N; r++) {
+            result.append(helperString.substring(r, N + 2 * r));
+            result.append(System.lineSeparator());
+        }
+        return result.toString();
+    }
+
+    public static void main(String[] args) {
+        System.out.println(printARightAngledTriangle(5));
+        System.out.println(printAnIsoscelesTriangle(5));
+        System.out.println(printAnIsoscelesTriangleUsingSubstring(5));
+    }
+
+}
\ No newline at end of file
diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java b/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java
new file mode 100644
index 0000000000..6fa6584b8e
--- /dev/null
+++ b/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/printtriangles/PrintTriangleExamplesUnitTest.java
@@ -0,0 +1,93 @@
+package com.baeldung.algorithms.printtriangles;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(JUnitParamsRunner.class)
+public class PrintTriangleExamplesUnitTest {
+    
+    private static Object[][] rightAngledTriangles() {
+        String expected0 = ""; 
+        
+        String expected2 = "*" + System.lineSeparator() 
+                         + "**" + System.lineSeparator();
+        
+        String expected5 = "*" + System.lineSeparator() 
+                         + "**" + System.lineSeparator()
+                         + "***" + System.lineSeparator()
+                         + "****" + System.lineSeparator()
+                         + "*****" + System.lineSeparator();
+        
+        String expected7 = "*" + System.lineSeparator() 
+                         + "**" + System.lineSeparator()
+                         + "***" + System.lineSeparator()
+                         + "****" + System.lineSeparator()
+                         + "*****" + System.lineSeparator()
+                         + "******" + System.lineSeparator()
+                         + "*******" + System.lineSeparator();
+        
+        return new Object[][] {
+            { 0, expected0 },
+            { 2, expected2 },
+            { 5, expected5 },
+            { 7, expected7 }
+        };
+    }
+
+    @Test
+    @Parameters(method = "rightAngledTriangles")
+    public void whenPrintARightAngledTriangleIsCalled_ThenTheCorrectStringIsReturned(int nrOfRows, String expected) {
+        String actual = PrintTriangleExamples.printARightAngledTriangle(nrOfRows);
+
+        assertEquals(expected, actual);
+    }
+    
+    private static Object[][] isoscelesTriangles() {
+        String expected0 = ""; 
+        
+        String expected2 = " *" + System.lineSeparator() 
+                         + "***" + System.lineSeparator();
+        
+        String expected5 = "    *" + System.lineSeparator() 
+                         + "   ***" + System.lineSeparator()
+                         + "  *****" + System.lineSeparator()
+                         + " *******" + System.lineSeparator()
+                         + "*********" + System.lineSeparator();
+        
+        String expected7 = "      *" + System.lineSeparator() 
+                         + "     ***" + System.lineSeparator()
+                         + "    *****" + System.lineSeparator()
+                         + "   *******" + System.lineSeparator()
+                         + "  *********" + System.lineSeparator()
+                         + " ***********" + System.lineSeparator()
+                         + "*************" + System.lineSeparator();
+        
+        return new Object[][] {
+            { 0, expected0 },
+            { 2, expected2 },
+            { 5, expected5 },
+            { 7, expected7 }
+        };
+    }
+
+    @Test
+    @Parameters(method = "isoscelesTriangles")
+    public void whenPrintAnIsoscelesTriangleIsCalled_ThenTheCorrectStringIsReturned(int nrOfRows, String expected) {
+        String actual = PrintTriangleExamples.printAnIsoscelesTriangle(nrOfRows);
+
+        assertEquals(expected, actual);
+    }
+    
+    @Test
+    @Parameters(method = "isoscelesTriangles")
+    public void whenPrintAnIsoscelesTriangleUsingSubstringIsCalled_ThenTheCorrectStringIsReturned(int nrOfRows, String expected) {
+        String actual = PrintTriangleExamples.printAnIsoscelesTriangleUsingSubstring(nrOfRows);
+
+        assertEquals(expected, actual);
+    }
+
+}
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/inoutsort/InOutSort.java b/algorithms-sorting/src/main/java/com/baeldung/algorithms/inoutsort/InOutSort.java
new file mode 100644
index 0000000000..5ba225cead
--- /dev/null
+++ b/algorithms-sorting/src/main/java/com/baeldung/algorithms/inoutsort/InOutSort.java
@@ -0,0 +1,25 @@
+package com.baeldung.algorithms.inoutsort;
+
+public class InOutSort {
+
+    public static int[] reverseInPlace(int A[]) {
+        int n = A.length;
+        for (int i = 0; i < n / 2; i++) {
+            int temp = A[i];
+            A[i] = A[n - 1 - i];
+            A[n - 1 - i] = temp;
+        }
+
+        return A;
+    }
+
+    public static int[] reverseOutOfPlace(int A[]) {
+        int n = A.length;
+        int[] B = new int[n];
+        for (int i = 0; i < n; i++) {
+            B[n - i - 1] = A[i];
+        }
+
+        return B;
+    }
+}
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java b/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java
new file mode 100644
index 0000000000..17e95edf06
--- /dev/null
+++ b/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java
@@ -0,0 +1,38 @@
+package com.baeldung.algorithms.selectionsort;
+
+public class SelectionSort {
+
+    public static void sortAscending(final int[] arr) {
+        for (int i = 0; i < arr.length - 1; i++) {
+            int minElementIndex = i;
+            for (int j = i + 1; j < arr.length; j++) {
+                if (arr[minElementIndex] > arr[j]) {
+                    minElementIndex = j;
+                }
+            }
+
+            if (minElementIndex != i) {
+                int temp = arr[i];
+                arr[i] = arr[minElementIndex];
+                arr[minElementIndex] = temp;
+            }
+        }
+    }
+
+    public static void sortDescending(final int[] arr) {
+        for (int i = 0; i < arr.length - 1; i++) {
+            int maxElementIndex = i;
+            for (int j = i + 1; j < arr.length; j++) {
+                if (arr[maxElementIndex] < arr[j]) {
+                    maxElementIndex = j;
+                }
+            }
+
+            if (maxElementIndex != i) {
+                int temp = arr[i];
+                arr[i] = arr[maxElementIndex];
+                arr[maxElementIndex] = temp;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java b/algorithms-sorting/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java
new file mode 100644
index 0000000000..321b905f68
--- /dev/null
+++ b/algorithms-sorting/src/test/java/com/baeldung/algorithms/inoutsort/InOutSortUnitTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.algorithms.inoutsort;
+
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+
+import org.junit.Test;
+
+public class InOutSortUnitTest {
+
+    @Test
+    public void givenArray_whenInPlaceSort_thenReversed() {
+        int[] input = {1, 2, 3, 4, 5, 6, 7};
+        int[] expected = {7, 6, 5, 4, 3, 2, 1};
+        assertArrayEquals("the two arrays are not equal", expected, InOutSort.reverseInPlace(input));
+    }
+
+    @Test
+    public void givenArray_whenOutOfPlaceSort_thenReversed() {
+        int[] input = {1, 2, 3, 4, 5, 6, 7};
+        int[] expected = {7, 6, 5, 4, 3, 2, 1};
+        assertArrayEquals("the two arrays are not equal", expected, InOutSort.reverseOutOfPlace(input));
+    }
+}
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java b/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java
new file mode 100644
index 0000000000..85efd1d3da
--- /dev/null
+++ b/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java
@@ -0,0 +1,25 @@
+package com.baeldung.algorithms.selectionsort;
+
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+
+import org.junit.Test;
+
+public class SelectionSortUnitTest {
+
+    @Test
+    public void givenUnsortedArray_whenSelectionSort_SortAscending_thenSortedAsc() {
+        int[] input = { 5, 4, 1, 6, 2 };
+        SelectionSort.sortAscending(input);
+        int[] expected = {1, 2, 4, 5, 6};
+        assertArrayEquals("the two arrays are not equal", expected, input);
+    }
+    
+    @Test
+    public void givenUnsortedArray_whenSelectionSort_SortDescending_thenSortedDesc() {
+        int[] input = { 5, 4, 1, 6, 2 };
+        SelectionSort.sortDescending(input);
+        int[] expected = {6, 5, 4, 2, 1};
+        assertArrayEquals("the two arrays are not equal", expected, input);
+    }
+}
diff --git a/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/Employee.groovy b/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/Employee.groovy
new file mode 100644
index 0000000000..f49d0f906b
--- /dev/null
+++ b/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/Employee.groovy
@@ -0,0 +1,45 @@
+package com.baeldung.metaprogramming
+
+import groovy.transform.AutoClone
+import groovy.transform.Canonical
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+import groovy.transform.TupleConstructor
+import groovy.util.logging.*
+
+@Canonical
+@TupleConstructor
+@EqualsAndHashCode
+@ToString(includePackage=false, excludes=['id'])
+@Log 
+@AutoClone
+class Employee {
+
+    long id
+    String firstName
+    String lastName
+    int age
+
+    //method to catch missing property's getter
+    def propertyMissing(String propertyName) {
+        log.info "$propertyName is not available"
+        "property '$propertyName' is not available"
+    }
+
+    //method to catch missing property's setter
+    def propertyMissing(String propertyName, propertyValue) {
+        println "property '$propertyName' is not available"
+        log.info "$propertyName is not available"
+        "property '$propertyName' is not available"
+    }
+
+    def methodMissing(String methodName, def methodArgs) {
+        log.info "$methodName is not defined"
+        "method '$methodName' is not defined"
+    }
+    
+    def logEmp() {
+        log.info "Employee: $lastName, $firstName is of $age years age"
+    }
+
+}
\ No newline at end of file
diff --git a/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/BasicExtensions.groovy b/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/BasicExtensions.groovy
new file mode 100644
index 0000000000..65591cae8d
--- /dev/null
+++ b/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/BasicExtensions.groovy
@@ -0,0 +1,30 @@
+package com.baeldung.metaprogramming.extension
+
+import com.baeldung.metaprogramming.Employee
+
+class BasicExtensions {
+    
+    static int getYearOfBirth(Employee self) {
+        return (new Date().getYear() + 1900) - self.age;
+    }
+    
+    static String capitalize(String self) {
+        return self.substring(0, 1).toUpperCase() + self.substring(1)
+    }
+
+    static void printCounter(Integer self) {
+        while (self>0) {
+            println self
+            self--
+        }
+    }
+    
+    static Long square(Long self) {
+        return self*self
+    }
+    
+    static BigDecimal cube(BigDecimal self) {
+        return self*self*self
+    }
+    
+}
\ No newline at end of file
diff --git a/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/StaticEmployeeExtension.groovy b/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/StaticEmployeeExtension.groovy
new file mode 100644
index 0000000000..ab2aac38ea
--- /dev/null
+++ b/core-groovy-2/src/main/groovy/com/baeldung/metaprogramming/extension/StaticEmployeeExtension.groovy
@@ -0,0 +1,10 @@
+package com.baeldung.metaprogramming.extension
+
+import com.baeldung.metaprogramming.Employee
+
+class StaticEmployeeExtension {
+    
+    static Employee getDefaultObj(Employee self) {
+        return new Employee(firstName: "firstName", lastName: "lastName", age: 20)
+    }
+}
\ No newline at end of file
diff --git a/core-groovy-2/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/core-groovy-2/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
new file mode 100644
index 0000000000..967108b846
--- /dev/null
+++ b/core-groovy-2/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
@@ -0,0 +1,4 @@
+moduleName=core-groovy-2
+moduleVersion=1.0-SNAPSHOT
+extensionClasses=com.baeldung.metaprogramming.extension.BasicExtensions
+staticExtensionClasses=com.baeldung.metaprogramming.extension.StaticEmployeeExtension
diff --git a/core-groovy-2/src/test/groovy/com/baeldung/metaprogramming/MetaprogrammingUnitTest.groovy b/core-groovy-2/src/test/groovy/com/baeldung/metaprogramming/MetaprogrammingUnitTest.groovy
new file mode 100644
index 0000000000..8066b10f9b
--- /dev/null
+++ b/core-groovy-2/src/test/groovy/com/baeldung/metaprogramming/MetaprogrammingUnitTest.groovy
@@ -0,0 +1,118 @@
+package com.baeldung.metaprogramming
+
+import groovy.time.TimeCategory
+
+class MetaprogrammingUnitTest extends GroovyTestCase {
+
+    Employee emp = new Employee(firstName: "Norman", lastName: "Lewis")
+
+    void testPropertyMissing() {
+        assert emp.address == "property 'address' is not available"
+    }
+
+    void testMethodMissing() {
+        Employee emp = new Employee()
+        try {
+            emp.getFullName()
+        } catch(MissingMethodException e) {
+            println "method is not defined"
+        }
+        assert emp.getFullName() == "method 'getFullName' is not defined"
+    }
+
+    void testMetaClassProperty() {
+        Employee.metaClass.address = ""
+        emp = new Employee(firstName: "Norman", lastName: "Lewis", address: "US")
+        assert emp.address == "US"
+    }
+
+    void testMetaClassMethod() {
+        emp.metaClass.getFullName = {
+            "$lastName, $firstName"
+        }
+        assert emp.getFullName() == "Lewis, Norman"
+    }
+
+    void testMetaClassConstructor() {
+        try {
+            Employee emp = new Employee("Norman")
+        } catch(GroovyRuntimeException e) {
+            assert e.message == "Could not find matching constructor for: com.baeldung.metaprogramming.Employee(String)"
+        }
+
+        Employee.metaClass.constructor = { String firstName ->
+            new Employee(firstName: firstName)
+        }
+
+        Employee norman = new Employee("Norman")
+        assert norman.firstName == "Norman"
+        assert norman.lastName == null
+    }
+
+    void testJavaMetaClass() {
+        String.metaClass.capitalize = { String str ->
+            str.substring(0, 1).toUpperCase() + str.substring(1);
+        }
+        assert "norman".capitalize() == "Norman"
+    }
+
+    void testEmployeeExtension() {
+        Employee emp = new Employee(age: 28)
+        assert emp.getYearOfBirth() == 1991
+    }
+
+    void testJavaClassesExtensions() {
+        5.printCounter()
+
+        assert 40l.square() == 1600l
+
+        assert (2.98).cube() == 26.463592
+    }
+
+    void testStaticEmployeeExtension() {
+        assert Employee.getDefaultObj().firstName == "firstName"
+        assert Employee.getDefaultObj().lastName == "lastName"
+        assert Employee.getDefaultObj().age == 20
+    }
+
+    void testToStringAnnotation() {
+        Employee employee = new Employee()
+        employee.id = 1
+        employee.firstName = "norman"
+        employee.lastName = "lewis"
+        employee.age = 28
+
+        assert employee.toString() == "Employee(norman, lewis, 28)"
+    }
+
+    void testTupleConstructorAnnotation() {
+        Employee norman = new Employee(1, "norman", "lewis", 28)
+        assert norman.toString() == "Employee(norman, lewis, 28)"
+
+        Employee snape = new Employee(2, "snape")
+        assert snape.toString() == "Employee(snape, null, 0)"
+
+    }
+    
+    void testEqualsAndHashCodeAnnotation() {
+        Employee norman = new Employee(1, "norman", "lewis", 28)
+        Employee normanCopy = new Employee(1, "norman", "lewis", 28)
+        assert norman.equals(normanCopy)
+        assert norman.hashCode() == normanCopy.hashCode()
+    }
+    
+    void testAutoCloneAnnotation() {
+        try {
+            Employee norman = new Employee(1, "norman", "lewis", 28)
+            def normanCopy = norman.clone()
+            assert norman == normanCopy
+        } catch(CloneNotSupportedException e) {
+            e.printStackTrace()
+        }
+    }
+
+    void testLoggingAnnotation() {
+        Employee employee = new Employee(1, "Norman", "Lewis", 28)
+        employee.logEmp()
+    }
+}
\ 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
index 245fa93ba7..d11510b2aa 100644
--- a/core-java-modules/core-java-8-2/README.md
+++ b/core-java-modules/core-java-8-2/README.md
@@ -7,3 +7,4 @@
 - [How to Delay Code Execution in Java](https://www.baeldung.com/java-delay-code-execution)
 - [Run JAR Application With Command Line Arguments](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)
diff --git a/core-java-modules/core-java-8/README.md b/core-java-modules/core-java-8/README.md
index b2ae48ea11..6e79eddd16 100644
--- a/core-java-modules/core-java-8/README.md
+++ b/core-java-modules/core-java-8/README.md
@@ -4,14 +4,10 @@
 
 ### Relevant Articles: 
 - [Guide to Java 8’s Collectors](http://www.baeldung.com/java-8-collectors)
-- [Functional Interfaces in Java 8](http://www.baeldung.com/java-8-functional-interfaces)
-- [Java 8 – Powerful Comparison with Lambdas](http://www.baeldung.com/java-8-sort-lambda)
 - [New Features in Java 8](http://www.baeldung.com/java-8-new-features)
-- [Lambda Expressions and Functional Interfaces: Tips and Best Practices](http://www.baeldung.com/java-8-lambda-expressions-tips)
 - [The Double Colon Operator in Java 8](http://www.baeldung.com/java-8-double-colon-operator)
 - [Guide to Java 8 groupingBy Collector](http://www.baeldung.com/java-groupingby-collector)
 - [Strategy Design Pattern in Java 8](http://www.baeldung.com/java-strategy-pattern)
-- [Exceptions in Java 8 Lambda Expressions](http://www.baeldung.com/java-lambda-exceptions)
 - [Guide to Java 8 Comparator.comparing()](http://www.baeldung.com/java-8-comparator-comparing)
 - [Guide To Java 8 Optional](http://www.baeldung.com/java-optional)
 - [Guide to the Java 8 forEach](http://www.baeldung.com/foreach-java)
@@ -38,6 +34,5 @@
 - [Java @SafeVarargs Annotation](https://www.baeldung.com/java-safevarargs)
 - [Java @Deprecated Annotation](https://www.baeldung.com/java-deprecated)
 - [Java 8 Predicate Chain](https://www.baeldung.com/java-predicate-chain)
-- [Method References in Java](https://www.baeldung.com/java-method-references)
 - [Creating a Custom Annotation in Java](https://www.baeldung.com/java-custom-annotation)
 - [The Difference Between Collection.stream().forEach() and Collection.forEach()](https://www.baeldung.com/java-collection-stream-foreach)
diff --git a/core-java-modules/core-java-arrays/README.md b/core-java-modules/core-java-arrays/README.md
index b5f71cc253..45feff3edc 100644
--- a/core-java-modules/core-java-arrays/README.md
+++ b/core-java-modules/core-java-arrays/README.md
@@ -7,7 +7,7 @@
 - [Check if a Java Array Contains a Value](http://www.baeldung.com/java-array-contains-value)
 - [Initializing Arrays in Java](http://www.baeldung.com/java-initialize-array)
 - [Guide to the java.util.Arrays Class](http://www.baeldung.com/java-util-arrays)
-- [Jagged Arrays In Java](http://www.baeldung.com/java-jagged-arrays)
+- [Multi-Dimensional Arrays In Java](http://www.baeldung.com/java-jagged-arrays)
 - [Find Sum and Average in a Java Array](http://www.baeldung.com/java-array-sum-average)
 - [Arrays in Java: A Reference Guide](https://www.baeldung.com/java-arrays-guide)
 - [How to Invert an Array in Java](http://www.baeldung.com/java-invert-array)
@@ -16,3 +16,4 @@
 - [Sorting Arrays in Java](https://www.baeldung.com/java-sorting-arrays)
 - [Convert a Float to a Byte Array in Java](https://www.baeldung.com/java-convert-float-to-byte-array)
 - [Converting Between Stream and Array in Java](https://www.baeldung.com/java-stream-to-array)
+- [Removing an Element from an Array in Java](https://www.baeldung.com/java-array-remove-element)
diff --git a/core-java-modules/core-java-jpms/README.md b/core-java-modules/core-java-jpms/README.md
new file mode 100644
index 0000000000..5c424711bc
--- /dev/null
+++ b/core-java-modules/core-java-jpms/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [Design Strategies for Decoupling Java Modules](https://www.baeldung.com/java-modules-decoupling-design-strategies)
diff --git a/core-java-modules/core-java-lambdas/README.md b/core-java-modules/core-java-lambdas/README.md
index 10b876735e..98fff64d68 100644
--- a/core-java-modules/core-java-lambdas/README.md
+++ b/core-java-modules/core-java-lambdas/README.md
@@ -1,3 +1,8 @@
 ## Relevant articles:
 
 - [Why Do Local Variables Used in Lambdas Have to Be Final or Effectively Final?](https://www.baeldung.com/java-lambda-effectively-final-local-variables)
+- [Java 8 – Powerful Comparison with Lambdas](http://www.baeldung.com/java-8-sort-lambda)
+- [Functional Interfaces in Java 8](http://www.baeldung.com/java-8-functional-interfaces)
+- [Lambda Expressions and Functional Interfaces: Tips and Best Practices](http://www.baeldung.com/java-8-lambda-expressions-tips)
+- [Exceptions in Java 8 Lambda Expressions](http://www.baeldung.com/java-lambda-exceptions)
+- [Method References in Java](https://www.baeldung.com/java-method-references)
diff --git a/core-java-modules/core-java-lambdas/pom.xml b/core-java-modules/core-java-lambdas/pom.xml
index d6158c2946..9e6e81ed40 100644
--- a/core-java-modules/core-java-lambdas/pom.xml
+++ b/core-java-modules/core-java-lambdas/pom.xml
@@ -15,5 +15,11 @@
     <relativePath>../../parent-java</relativePath>
   </parent>
 
-
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>${commons-lang3.version}</version>
+    </dependency>
+  </dependencies>
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/entity/Human.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/entity/Human.java
similarity index 100%
rename from core-java-modules/core-java-8/src/test/java/com/baeldung/java8/entity/Human.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/entity/Human.java
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappers.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappers.java
similarity index 100%
rename from core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappers.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappers.java
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/exceptions/ThrowingConsumer.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/exceptions/ThrowingConsumer.java
similarity index 100%
rename from core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/exceptions/ThrowingConsumer.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/exceptions/ThrowingConsumer.java
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Bar.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Bar.java
similarity index 100%
rename from core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Bar.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Bar.java
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Baz.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Baz.java
similarity index 100%
rename from core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Baz.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Baz.java
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Foo.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Foo.java
similarity index 100%
rename from core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Foo.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Foo.java
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java
similarity index 100%
rename from core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Processor.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Processor.java
similarity index 100%
rename from core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/Processor.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Processor.java
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/ProcessorImpl.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/ProcessorImpl.java
similarity index 100%
rename from core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/ProcessorImpl.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/ProcessorImpl.java
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/UseFoo.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/UseFoo.java
similarity index 100%
rename from core-java-modules/core-java-8/src/main/java/com/baeldung/java8/lambda/tips/UseFoo.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/UseFoo.java
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceUnitTest.java b/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-8/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceUnitTest.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceUnitTest.java
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java b/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java
similarity index 100%
rename from core-java-modules/core-java-8/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8SortUnitTest.java b/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/Java8SortUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-8/src/test/java/com/baeldung/java8/Java8SortUnitTest.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/Java8SortUnitTest.java
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java b/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/Bicycle.java b/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/Bicycle.java
similarity index 100%
rename from core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/Bicycle.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/Bicycle.java
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/BicycleComparator.java b/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/BicycleComparator.java
similarity index 100%
rename from core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/BicycleComparator.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/BicycleComparator.java
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/MethodReferenceUnitTest.java b/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/MethodReferenceUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/methodreference/MethodReferenceUnitTest.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/MethodReferenceUnitTest.java
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java b/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-8/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java
diff --git a/core-java-modules/core-java-lang-operators/pom.xml b/core-java-modules/core-java-lang-operators/pom.xml
new file mode 100644
index 0000000000..58cab9d507
--- /dev/null
+++ b/core-java-modules/core-java-lang-operators/pom.xml
@@ -0,0 +1,43 @@
+<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>
+    <groupId>com.baeldung</groupId>
+    <artifactId>core-java-lang-operators</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-lang-operators</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-lang-operators</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+        <!-- testing -->
+        <assertj-core.version>3.10.0</assertj-core.version>
+    </properties>
+
+</project>
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Circle.java b/core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Circle.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Circle.java
rename to core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Circle.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Ring.java b/core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Ring.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Ring.java
rename to core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Ring.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Round.java b/core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Round.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Round.java
rename to core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Round.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Shape.java b/core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Shape.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Shape.java
rename to core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Shape.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Triangle.java b/core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Triangle.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Triangle.java
rename to core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Triangle.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Car.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Car.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Car.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Car.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Diesel.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Diesel.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Diesel.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Diesel.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Engine.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Engine.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Engine.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Engine.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Vehicle.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Vehicle.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Vehicle.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Vehicle.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/modulo/ModuloUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/modulo/ModuloUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/modulo/ModuloUnitTest.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/modulo/ModuloUnitTest.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java
diff --git a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/unaryoperators/IncrementDecrementUnaryOperatorUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/unaryoperators/IncrementDecrementUnaryOperatorUnitTest.java
new file mode 100644
index 0000000000..cb0f896ec0
--- /dev/null
+++ b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/unaryoperators/IncrementDecrementUnaryOperatorUnitTest.java
@@ -0,0 +1,64 @@
+package com.baeldung.unaryoperators;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+public class IncrementDecrementUnaryOperatorUnitTest {
+
+    @Test
+    public void givenAnOperand_whenUsingPreIncrementUnaryOperator_thenOperandIsIncrementedByOne() {
+        int operand = 1;
+        ++operand;
+        assertThat(operand).isEqualTo(2);
+    }
+
+    @Test
+    public void givenANumber_whenUsingPreIncrementUnaryOperatorInEvaluation_thenNumberIsIncrementedByOne() {
+        int operand = 1;
+        int number = ++operand;
+        assertThat(number).isEqualTo(2);
+    }
+
+    @Test
+    public void givenAnOperand_whenUsingPreDecrementUnaryOperator_thenOperandIsDecrementedByOne() {
+        int operand = 1;
+        --operand;
+        assertThat(operand).isEqualTo(0);
+    }
+
+    @Test
+    public void givenANumber_whenUsingPreDecrementUnaryOperatorInEvaluation_thenNumberIsDecrementedByOne() {
+        int operand = 1;
+        int number = --operand;
+        assertThat(number).isEqualTo(0);
+    }
+
+    @Test
+    public void givenAnOperand_whenUsingPostIncrementUnaryOperator_thenOperandIsIncrementedByOne() {
+        int operand = 1;
+        operand++;
+        assertThat(operand).isEqualTo(2);
+    }
+
+    @Test
+    public void givenANumber_whenUsingPostIncrementUnaryOperatorInEvaluation_thenNumberIsSameAsOldValue() {
+        int operand = 1;
+        int number = operand++;
+        assertThat(number).isEqualTo(1);
+    }
+
+    @Test
+    public void givenAnOperand_whenUsingPostDecrementUnaryOperator_thenOperandIsDecrementedByOne() {
+        int operand = 1;
+        operand--;
+        assertThat(operand).isEqualTo(0);
+    }
+
+    @Test
+    public void givenANumber_whenUsingPostDecrementUnaryOperatorInEvaluation_thenNumberIsSameAsOldValue() {
+        int operand = 1;
+        int number = operand--;
+        assertThat(number).isEqualTo(1);
+    }
+}
diff --git a/core-java-modules/core-java-lang-syntax/README.md b/core-java-modules/core-java-lang-syntax/README.md
index 81c3d6c354..3293e9b23d 100644
--- a/core-java-modules/core-java-lang-syntax/README.md
+++ b/core-java-modules/core-java-lang-syntax/README.md
@@ -18,3 +18,4 @@
 - [The Modulo Operator in Java](https://www.baeldung.com/modulo-java)
 - [Ternary Operator In Java](https://www.baeldung.com/java-ternary-operator)
 - [Java instanceof Operator](https://www.baeldung.com/java-instanceof)
+- [Breaking Out of Nested Loops](https://www.baeldung.com/java-breaking-out-nested-loop)
diff --git a/core-java-modules/core-java-networking-2/.gitignore b/core-java-modules/core-java-networking-2/.gitignore
deleted file mode 100644
index 374c8bf907..0000000000
--- a/core-java-modules/core-java-networking-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-nio/README.md b/core-java-modules/core-java-nio/README.md
index 9034c3b3b1..1ac3b6c089 100644
--- a/core-java-modules/core-java-nio/README.md
+++ b/core-java-modules/core-java-nio/README.md
@@ -1,3 +1,3 @@
-## Relevant articles:
+## Relevant Articles:
 
-- [Determine File Creating Date in Java](https://www.baeldung.com/java-file-creation-date)
+- [Determine File Creation Date in Java](https://www.baeldung.com/java-file-creation-date)
diff --git a/core-java-modules/core-java-nio/src/main/java/com/baeldung/file/Main.java b/core-java-modules/core-java-nio/src/main/java/com/baeldung/file/Main.java
new file mode 100644
index 0000000000..d8800dd881
--- /dev/null
+++ b/core-java-modules/core-java-nio/src/main/java/com/baeldung/file/Main.java
@@ -0,0 +1,26 @@
+package com.baeldung.file;
+
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingApacheCommonsIO;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingBufferedReader;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingGoogleGuava;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingLineNumberReader;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingNIOFileChannel;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingNIOFiles;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingNIOFilesReadAllLines;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingScanner;
+
+public class Main {
+
+    private static final String INPUT_FILE_NAME = "src/main/resources/input.txt";
+
+    public static void main(String... args) throws Exception {
+        System.out.printf("Total Number of Lines Using BufferedReader: %s%n", getTotalNumberOfLinesUsingBufferedReader(INPUT_FILE_NAME));
+        System.out.printf("Total Number of Lines Using LineNumberReader: %s%n", getTotalNumberOfLinesUsingLineNumberReader(INPUT_FILE_NAME));
+        System.out.printf("Total Number of Lines Using Scanner: %s%n", getTotalNumberOfLinesUsingScanner(INPUT_FILE_NAME));
+        System.out.printf("Total Number of Lines Using NIO Files: %s%n", getTotalNumberOfLinesUsingNIOFiles(INPUT_FILE_NAME));
+        System.out.printf("Total Number of Lines Using NIO Files#readAllLines: %s%n", getTotalNumberOfLinesUsingNIOFilesReadAllLines(INPUT_FILE_NAME));
+        System.out.printf("Total Number of Lines Using NIO FileChannel: %s%n", getTotalNumberOfLinesUsingNIOFileChannel(INPUT_FILE_NAME));
+        System.out.printf("Total Number of Lines Using Apache Commons IO: %s%n", getTotalNumberOfLinesUsingApacheCommonsIO(INPUT_FILE_NAME));
+        System.out.printf("Total Number of Lines Using NIO Google Guava: %s%n", getTotalNumberOfLinesUsingGoogleGuava(INPUT_FILE_NAME));
+    }
+}
diff --git a/core-java-modules/core-java-nio/src/main/java/com/baeldung/file/NumberOfLineFinder.java b/core-java-modules/core-java-nio/src/main/java/com/baeldung/file/NumberOfLineFinder.java
new file mode 100644
index 0000000000..3abf82f3fa
--- /dev/null
+++ b/core-java-modules/core-java-nio/src/main/java/com/baeldung/file/NumberOfLineFinder.java
@@ -0,0 +1,123 @@
+package com.baeldung.file;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.List;
+import java.util.Scanner;
+import java.util.stream.Stream;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.LineIterator;
+
+public class NumberOfLineFinder {
+
+    public static int getTotalNumberOfLinesUsingBufferedReader(String fileName) {
+        int lines = 0;
+        try (BufferedReader reader = new BufferedReader(new FileReader(fileName))) {
+            while (reader.readLine() != null) {
+                lines++;
+            }
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+    public static int getTotalNumberOfLinesUsingLineNumberReader(String fileName) {
+        int lines = 0;
+        try (LineNumberReader reader = new LineNumberReader(new FileReader(fileName))) {
+            reader.skip(Integer.MAX_VALUE);
+            lines = reader.getLineNumber() + 1;
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+    public static int getTotalNumberOfLinesUsingScanner(String fileName) {
+        int lines = 0;
+        try (Scanner scanner = new Scanner(new FileReader(fileName))) {
+            while (scanner.hasNextLine()) {
+                scanner.nextLine();
+                lines++;
+            }
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+    public static int getTotalNumberOfLinesUsingNIOFiles(String fileName) {
+        int lines = 0;
+        try (Stream<String> fileStream = Files.lines(Paths.get(fileName))) {
+            lines = (int) fileStream.count();
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+    public static int getTotalNumberOfLinesUsingNIOFilesReadAllLines(String fileName) {
+        int lines = 0;
+        try {
+            List<String> fileStream = Files.readAllLines(Paths.get(fileName));
+            lines = fileStream.size();
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+    public static int getTotalNumberOfLinesUsingNIOFileChannel(String fileName) {
+        int lines = 1;
+        try (FileChannel channel = FileChannel.open(Paths.get(fileName), StandardOpenOption.READ)) {
+            ByteBuffer byteBuffer = channel.map(MapMode.READ_ONLY, 0, channel.size());
+            while (byteBuffer.hasRemaining()) {
+                byte currentChar = byteBuffer.get();
+                if (currentChar == '\n') {
+                    lines++;
+                }
+            }
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+    public static int getTotalNumberOfLinesUsingApacheCommonsIO(String fileName) {
+        int lines = 0;
+        try {
+            LineIterator lineIterator = FileUtils.lineIterator(new File(fileName));
+            while (lineIterator.hasNext()) {
+                lineIterator.nextLine();
+                lines++;
+            }
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+    public static int getTotalNumberOfLinesUsingGoogleGuava(String fileName) {
+        int lines = 0;
+        try {
+            List<String> lineItems = com.google.common.io.Files.readLines(Paths.get(fileName)
+                .toFile(), Charset.defaultCharset());
+            lines = lineItems.size();
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+}
diff --git a/core-java-modules/core-java-nio/src/main/resources/input.txt b/core-java-modules/core-java-nio/src/main/resources/input.txt
new file mode 100644
index 0000000000..650da894e8
--- /dev/null
+++ b/core-java-modules/core-java-nio/src/main/resources/input.txt
@@ -0,0 +1,45 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. In lacus enim, scelerisque id sapien ut, semper euismod quam. Nunc ullamcorper semper blandit. Praesent quis quam mollis, iaculis lectus a, fringilla leo. Interdum et malesuada fames ac ante ipsum primis in faucibus. Duis vitae auctor mauris. Pellentesque eu pellentesque lorem, vel ultricies libero. Pellentesque vestibulum sagittis eros. In vestibulum lacus elit. Interdum et malesuada fames ac ante ipsum primis in faucibus.
+
+Vivamus pharetra lacus fringilla nisl molestie eleifend. Donec et dolor non quam mattis mattis. Proin malesuada maximus elit id semper. Donec facilisis dolor ut feugiat auctor. Proin accumsan semper consectetur. Vivamus facilisis odio vel bibendum imperdiet. Sed rutrum nisi nec nisi interdum fringilla. Aliquam laoreet velit ullamcorper egestas ultrices. Aliquam ultricies sem sed orci interdum, eu porta purus malesuada. Sed accumsan, nunc ut maximus rhoncus, arcu ante pretium ex, non ultrices magna nisi et velit. Pellentesque tempor mi quis lacus consectetur, quis imperdiet enim efficitur. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+
+Nunc sed maximus erat. Aenean imperdiet finibus massa ac aliquam. Interdum et malesuada fames ac ante ipsum primis in faucibus. Duis dignissim cursus purus, eu tempus urna. Nunc sed mauris scelerisque, luctus eros ut, viverra nisi. Maecenas congue sed ligula in eleifend. Praesent nec dignissim enim, dictum efficitur massa. Nullam eros dui, rutrum quis aliquam accumsan, sollicitudin cursus eros. Phasellus euismod, lorem vitae vehicula ullamcorper, leo lorem vestibulum magna, vitae malesuada libero ipsum id lorem. Aenean finibus turpis facilisis tortor bibendum, vitae dignissim dolor dictum. Ut quis ornare nisi, non rutrum sapien.
+
+Etiam placerat, est eget placerat imperdiet, neque urna tristique est, a dictum nisl dolor vitae leo. Vivamus porttitor mi vitae volutpat ultrices. Quisque at ante porta mauris ultricies iaculis. Phasellus iaculis sollicitudin urna nec facilisis. Suspendisse dapibus vulputate scelerisque. Fusce felis diam, eleifend in tristique in, malesuada a purus. Suspendisse euismod ipsum sed urna imperdiet, quis venenatis lacus dapibus. Maecenas vitae est vel sem fringilla ornare at ut mi. Quisque porta, nulla at rutrum fringilla, mi ligula egestas libero, ac convallis elit diam et sapien. Vestibulum purus tortor, ornare ut enim sed, mattis lobortis erat. Maecenas ac ante tincidunt, euismod mauris a, fermentum diam. Nullam arcu est, consequat sed enim in, bibendum aliquet velit. Donec bibendum magna ac augue sagittis vehicula. Curabitur nec mauris eu augue bibendum volutpat. Fusce fringilla varius fringilla.
+
+Aliquam faucibus massa non orci accumsan, porta consectetur diam vulputate. Nullam nec erat mollis, imperdiet libero nec, tincidunt neque. Aenean varius purus nec est auctor, sed vulputate libero varius. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent vel neque elit. Donec vulputate fermentum nulla, ut aliquam neque tempor in. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec vel venenatis est. Suspendisse luctus elit quis dui dapibus, id sodales dolor cursus. Curabitur ut vehicula dui. Fusce aliquet est et ante feugiat, et tempus ex congue. Nunc eget dapibus leo. Nunc eu accumsan diam. Suspendisse risus eros, rutrum et volutpat in, consequat in nulla. Suspendisse id felis a orci accumsan iaculis.
+
+Duis tincidunt diam eget tortor aliquet sodales. Etiam sodales purus ac urna mollis, et cursus enim porttitor. Nulla viverra ligula nunc, ornare condimentum felis posuere sed. Fusce aliquet pretium sagittis. Sed ac mi elementum massa dictum ornare. Integer quis dapibus lectus. Curabitur in rhoncus justo, et vulputate justo. Integer eget efficitur felis.
+
+Sed finibus vel tortor ac egestas. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas vestibulum nulla mi, blandit efficitur sapien fermentum eu. Integer sed turpis eros. Phasellus sed aliquam ligula. Etiam dictum quam in dapibus mattis. Donec et tristique quam. Pellentesque gravida luctus dolor, eu ornare sapien. Donec justo ante, lacinia non sem et, ultricies dignissim nibh. Vivamus eu nisl et magna pulvinar efficitur. Sed at vehicula lectus, sit amet luctus sem. Morbi vehicula sapien nisi, nec sagittis orci vestibulum et.
+
+Praesent non finibus diam. Quisque sit amet nisl vitae augue lobortis commodo. Morbi ullamcorper, tortor id ornare maximus, erat ipsum ullamcorper ipsum, in imperdiet diam sem vel erat. Sed pellentesque quis ex sed volutpat. Vestibulum volutpat diam ac dignissim sollicitudin. Praesent at luctus ex, at volutpat dui. Nunc nulla dui, lobortis et pharetra quis, efficitur in turpis. Donec sodales auctor purus id mollis. Sed auctor eu erat eget bibendum. Mauris tincidunt ornare neque id consequat. Suspendisse non massa ante. Quisque velit enim, rhoncus at erat eget, scelerisque placerat elit. Donec finibus luctus dolor. In sed eleifend lorem. Sed tempor ullamcorper lorem nec tristique. Fusce nec volutpat neque, id elementum est.
+
+Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vestibulum mattis elementum tellus, vitae maximus nulla eleifend ut. Vestibulum eu nibh vulputate, posuere felis eget, aliquet ex. Nullam leo ex, lacinia a ante ac, accumsan efficitur ligula. Vestibulum ornare gravida tempus. Proin rhoncus felis sit amet dolor commodo facilisis. Integer aliquet, diam sed pharetra feugiat, sem massa mollis orci, eget pretium libero nunc at quam. Ut rhoncus quam vitae massa hendrerit, ornare condimentum odio varius. Donec odio sapien, tristique eget libero ac, interdum facilisis odio. Phasellus nec mauris vel dolor semper mattis et quis ligula. Donec nec porttitor nunc. Integer maximus quam vitae sem gravida, ut commodo ex porttitor.
+
+Sed cursus nisi turpis, vel laoreet massa blandit ut. Cras posuere velit nulla, nec pellentesque ipsum dignissim eget. Donec pharetra, ex et commodo viverra, leo dolor dapibus tellus, vel dignissim est sem ac lectus. Quisque a arcu dapibus, aliquet magna sed, rhoncus neque. Integer suscipit, nulla ac varius lacinia, orci metus scelerisque neque, a laoreet nibh risus vitae dolor. Pellentesque felis metus, pulvinar vel cursus id, ultrices non purus. Donec mi lectus, faucibus sit amet nunc at, sagittis pretium lectus. Fusce nec purus arcu. Mauris neque neque, blandit eget mi at, auctor tempus orci. Mauris sapien lorem, luctus nec tellus non, porttitor aliquam dui.
+
+Mauris non ex risus. Aliquam imperdiet in eros eget placerat. Sed congue sed sapien porta sollicitudin. Phasellus tempor hendrerit metus vitae tincidunt. Suspendisse congue nisi sed augue dapibus, at pretium ante mollis. Cras non posuere nulla. Proin malesuada finibus magna vel iaculis. Cras in dapibus lorem. Pellentesque volutpat dolor sit amet magna tincidunt mollis. Nunc et lectus sodales, accumsan est vitae, ornare augue. Maecenas malesuada arcu leo, eget blandit lectus porttitor et. Nam aliquam sapien sit amet purus consequat lobortis. Aenean varius, augue porta dignissim efficitur, felis velit dapibus leo, tincidunt ultricies magna felis id ligula. Duis hendrerit, lectus eu elementum euismod, elit lectus consequat mi, sit amet egestas justo massa ut urna. Proin eleifend interdum ultrices.
+
+Donec lacinia orci pharetra ornare tincidunt. Nulla facilisi. Maecenas malesuada dui ac elit sagittis tincidunt id dictum dolor. Quisque lobortis purus ac metus volutpat viverra. Proin finibus sapien ut odio semper consectetur. Sed gravida luctus egestas. Mauris pretium volutpat elit, at commodo arcu sagittis nec. Ut condimentum fringilla urna ac dignissim. Cras aliquam metus pulvinar, pulvinar nibh at, placerat arcu. Nulla ornare tortor sed lectus mollis, vitae fringilla tellus egestas. Vivamus efficitur tincidunt sapien, sed finibus mi congue eu. Nullam magna velit, lacinia vitae ligula eget, molestie consectetur felis. Suspendisse varius turpis orci, ac laoreet arcu accumsan sed. Fusce quis fermentum lacus, nec varius libero. Pellentesque ac odio ut justo lobortis elementum sit amet vehicula lorem. Nulla interdum nulla eget mi tristique, vitae egestas nunc egestas.
+
+Curabitur commodo libero eu elit tincidunt, quis placerat risus vehicula. Vestibulum vehicula id nunc iaculis fermentum. Aenean semper, tellus ac semper rutrum, justo lorem feugiat leo, quis vulputate neque dui non ligula. Etiam egestas, enim eget tempor porta, nunc est tristique ante, vel suscipit massa lorem vel diam. Donec faucibus ante id turpis rhoncus congue. Nullam laoreet, diam efficitur scelerisque consequat, ligula leo ultrices est, non fermentum elit mauris ut dolor. Morbi non porttitor lorem. Sed volutpat sapien et lorem porttitor, ultricies ultricies tellus congue. Mauris sodales, tortor nec sagittis finibus, dui odio aliquet nibh, in luctus sapien massa eu risus. Nulla in est sed ante molestie vehicula vel nec lectus. Fusce maximus a quam eget aliquam. Vivamus pulvinar quis nisi a maximus. Proin cursus lacus sapien, et hendrerit elit pretium a. Donec tellus lectus, consectetur id dolor a, luctus rutrum libero. Suspendisse auctor scelerisque dui, nec pellentesque felis viverra nec. Cras elit ex, varius sed pulvinar sed, suscipit ultrices lacus.
+
+Vivamus eu luctus lectus. Maecenas congue magna orci, quis semper nulla blandit vel. Phasellus dignissim risus placerat lacinia sagittis. Praesent at gravida nisi, at pulvinar diam. Nulla egestas lectus sed felis facilisis egestas. Curabitur posuere gravida urna eu vestibulum. Pellentesque at dolor gravida, placerat quam sit amet, fermentum ligula. Morbi fringilla, mi eget mollis dictum, neque dolor ullamcorper leo, a rutrum libero ipsum eget orci. Curabitur consectetur iaculis vestibulum. Suspendisse ultricies ligula et neque lacinia luctus. Sed dignissim neque id eros sollicitudin pellentesque.
+
+Donec et magna quis lectus pharetra finibus a fringilla sapien. Phasellus accumsan, erat eu sodales cursus, tortor elit dapibus risus, ut ornare neque arcu in tellus. Nam ac vehicula diam, at aliquam nisl. Cras in sem eget nisi ultrices rutrum sit amet eu velit. Sed molestie tellus eget ante scelerisque, sit amet pulvinar neque fringilla. Nunc volutpat facilisis egestas. Cras sodales dui ac massa egestas, in mattis leo rhoncus. Pellentesque vitae urna vehicula ipsum sodales suscipit. Sed commodo tempus fringilla.
+
+Etiam egestas elit vitae mi maximus fringilla quis eget libero. Fusce finibus ultrices tellus at molestie. Pellentesque posuere blandit elementum. Etiam eu erat eu urna hendrerit euismod. Nulla quis lectus rhoncus, ultricies urna eget, pretium neque. Cras sit amet ipsum sit amet purus rutrum ultricies nec vitae tortor. Sed tempor dapibus augue in pulvinar. Ut pretium sapien in malesuada accumsan. Donec eget ultrices erat, ut efficitur ligula. Sed posuere mauris est, nec convallis ipsum tempus non.
+
+Duis a ullamcorper ante. Quisque eu ultricies metus, at aliquet odio. Nullam tempus molestie augue ut varius. Fusce purus eros, dictum nec finibus sed, sodales et diam. Suspendisse sed mi purus. Donec eleifend ipsum diam, nec fringilla enim laoreet non. Phasellus condimentum, magna sit amet porttitor suscipit, arcu risus lobortis dolor, ac fringilla nibh nisl vel purus. Phasellus facilisis posuere orci sit amet tempus. Nam nec enim maximus, rhoncus felis a, rutrum diam.
+
+Suspendisse potenti. Donec vel tempor neque. In aliquet nulla in eleifend bibendum. Sed sapien sem, finibus in sodales vitae, euismod in sem. Phasellus nec elit a erat pulvinar semper. Aliquam luctus nisl in libero molestie aliquam. Nunc ac ornare felis. Ut non mauris ut ipsum rhoncus pretium. Curabitur tristique lacus a sagittis aliquam. Morbi vel volutpat tellus. Maecenas volutpat, lacus sed tempus imperdiet, eros tellus volutpat nisi, a egestas augue nulla quis arcu. In sollicitudin imperdiet efficitur. Suspendisse viverra aliquet nisi, congue ultrices arcu hendrerit in.
+
+Maecenas vitae vestibulum nunc. Nullam semper faucibus tincidunt. Etiam sed hendrerit risus. Proin gravida, urna nec tincidunt tempus, nulla sapien porttitor nibh, porttitor lobortis nunc quam et tortor. Praesent ut varius lacus, ut hendrerit enim. Ut nec turpis ac felis imperdiet bibendum. Phasellus porttitor enim odio, et vehicula mi convallis vel. Quisque porta scelerisque sagittis. Praesent dignissim sagittis vulputate. Aenean non justo ac est volutpat bibendum. Aliquam mattis, sapien dapibus pellentesque semper, velit urna malesuada diam, nec varius nibh eros at erat. Proin leo ante, ultricies id velit ut, faucibus porta nibh. Sed nec fermentum urna, sed mollis leo. Aliquam erat volutpat.
+
+Donec condimentum, urna sed hendrerit vestibulum, ante nibh lacinia dui, in tincidunt odio sem eget orci. In hac habitasse platea dictumst. Mauris id ex id ante tempus finibus eu sagittis erat. Quisque interdum urna risus, vel varius nibh euismod non. Nulla eget pellentesque quam. Aliquam vestibulum ac tortor non lobortis. Sed vitae erat sed libero dignissim dictum nec in turpis. Vivamus id ornare elit, ut facilisis lectus. Morbi dictum purus eget ipsum dignissim porttitor. Sed at vehicula purus, nec rhoncus quam. Nunc a nisl quis arcu blandit fermentum vel quis odio. Vivamus rhoncus, sapien sed lacinia hendrerit, velit urna fermentum dolor, id feugiat magna ligula sed urna. Proin euismod efficitur libero, eget porttitor lacus tempus quis. Duis tincidunt quis est a laoreet. Nam sit amet tristique nisl, sit amet mattis mi.
+
+Aenean id dictum nulla, sed laoreet magna. Morbi consectetur in turpis at aliquam. Maecenas rutrum feugiat metus, at ullamcorper augue fermentum ut. Vivamus in magna pretium nibh dictum rhoncus luctus at orci. In hac habitasse platea dictumst. Fusce convallis, nulla nec hendrerit suscipit, ipsum diam lobortis sem, vitae elementum lectus erat sit amet magna. Quisque sollicitudin fringilla purus, ac molestie justo congue vitae. Nulla sapien leo, ullamcorper ac tellus in, cursus rhoncus enim. Suspendisse rutrum magna non ex elementum elementum id vitae enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse ornare libero eu molestie pulvinar. Phasellus faucibus, magna eget rutrum porta, lorem turpis blandit lectus, eu viverra massa risus et ex.
+
+Ut consectetur eros lacus, ac ullamcorper lacus mattis a. Cras congue justo ut erat interdum, et scelerisque nisi malesuada. Quisque sed sapien sollicitudin purus tincidunt finibus vestibulum vel dolor. Cras iaculis bibendum erat, a dictum urna viverra et. Integer non neque vulputate, tincidunt purus nec, rutrum arcu. Aliquam nec magna non sem semper laoreet quis at quam. Mauris dui lectus, convallis eu efficitur at, facilisis nec lorem. Cras felis sem, egestas ac rutrum vel, mollis et ex. Aenean semper egestas libero, nec commodo mi blandit efficitur. Duis nec quam in massa dignissim sagittis vel vitae leo. Nam molestie hendrerit auctor.
+
+Sed suscipit egestas tellus sed cursus. Donec vel massa sit amet dui condimentum accumsan. Phasellus libero eros, lobortis a nisi id, porttitor maximus lectus. Praesent consectetur diam urna, id viverra turpis elementum in. Vivamus vitae pretium justo, nec tempor felis. Vivamus volutpat ultricies magna. Suspendisse vulputate lectus ac orci volutpat ullamcorper. Nulla eu leo pretium, commodo arcu accumsan, tempor nisl. Fusce sit amet tellus a ipsum vehicula laoreet sed vitae mauris. Duis porttitor massa mattis nibh placerat consequat. Fusce rutrum commodo tortor eget pellentesque. Suspendisse tempor enim libero, consequat dictum nibh dictum varius. Pellentesque feugiat sit amet urna sed facilisis. Curabitur a sagittis augue.
\ No newline at end of file
diff --git a/core-java-modules/core-java-nio/src/test/java/com/baeldung/file/NumberOfLineFinderUnitTest.java b/core-java-modules/core-java-nio/src/test/java/com/baeldung/file/NumberOfLineFinderUnitTest.java
new file mode 100644
index 0000000000..40ed6d6bba
--- /dev/null
+++ b/core-java-modules/core-java-nio/src/test/java/com/baeldung/file/NumberOfLineFinderUnitTest.java
@@ -0,0 +1,67 @@
+package com.baeldung.file;
+
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingApacheCommonsIO;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingBufferedReader;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingGoogleGuava;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingLineNumberReader;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingNIOFileChannel;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingNIOFiles;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingNIOFilesReadAllLines;
+import static com.baeldung.file.NumberOfLineFinder.getTotalNumberOfLinesUsingScanner;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class NumberOfLineFinderUnitTest {
+    private static final String INPUT_FILE_NAME = "src/main/resources/input.txt";
+    private static final int ACTUAL_LINE_COUNT = 45;
+
+    @Test
+    public void whenUsingBufferedReader_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingBufferedReader(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+    @Test
+    public void whenUsingLineNumberReader_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingLineNumberReader(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+    @Test
+    public void whenUsingScanner_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingScanner(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+    @Test
+    public void whenUsingNIOFiles_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingNIOFiles(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+    @Test
+    public void whenUsingNIOFilesReadAllLines_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingNIOFilesReadAllLines(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+    @Test
+    public void whenUsingNIOFileChannel_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingNIOFileChannel(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+    @Test
+    public void whenUsingApacheCommonsIO_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingApacheCommonsIO(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+    @Test
+    public void whenUsingGoogleGuava_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingGoogleGuava(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+}
diff --git a/core-java-modules/core-java-security/README.md b/core-java-modules/core-java-security/README.md
index 9526b15be5..a833ca30bb 100644
--- a/core-java-modules/core-java-security/README.md
+++ b/core-java-modules/core-java-security/README.md
@@ -10,3 +10,4 @@
 - [SSL Handshake Failures](https://www.baeldung.com/java-ssl-handshake-failures)
 - [SHA-256 and SHA3-256 Hashing in Java](https://www.baeldung.com/sha-256-hashing-java)
 - [Enabling TLS v1.2 in Java 7](https://www.baeldung.com/java-7-tls-v12)
+- [The Java SecureRandom Class](https://www.baeldung.com/java-secure-random)
diff --git a/core-java-modules/core-java-security/src/test/java/com/baeldung/jgss/JgssIntegrationTest.java b/core-java-modules/core-java-security/src/test/java/com/baeldung/jgss/JgssIntegrationTest.java
new file mode 100644
index 0000000000..ce784bcae6
--- /dev/null
+++ b/core-java-modules/core-java-security/src/test/java/com/baeldung/jgss/JgssIntegrationTest.java
@@ -0,0 +1,84 @@
+package com.baeldung.jgss;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.security.sasl.SaslException;
+
+import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSException;
+import org.ietf.jgss.GSSManager;
+import org.ietf.jgss.GSSName;
+import org.ietf.jgss.MessageProp;
+import org.ietf.jgss.Oid;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+@Ignore
+public class JgssIntegrationTest {
+
+    private static final String SERVER_PRINCIPAL = "HTTP/localhost@EXAMPLE.COM";
+    private static final String MECHANISM = "1.2.840.113554.1.2.2";
+
+    GSSContext serverContext;
+    GSSContext clientContext;
+
+    @Before
+    public void setUp() throws SaslException, GSSException {
+        GSSManager manager = GSSManager.getInstance();
+        serverContext = manager.createContext((GSSCredential) null);
+        String serverPrinciple = SERVER_PRINCIPAL;
+        GSSName serverName = manager.createName(serverPrinciple, null);
+        Oid krb5Oid = new Oid(MECHANISM);
+        clientContext = manager.createContext(serverName, krb5Oid, (GSSCredential) null, GSSContext.DEFAULT_LIFETIME);
+        clientContext.requestMutualAuth(true);
+        clientContext.requestConf(true);
+        clientContext.requestInteg(true);
+    }
+
+    @Test
+    public void givenCredential_whenStarted_thenAutenticationWorks() throws SaslException, GSSException {
+        byte[] serverToken;
+        byte[] clientToken;
+
+        // On the client-side
+        clientToken = clientContext.initSecContext(new byte[0], 0, 0);
+        // sendToServer(clientToken); // This is supposed to be send over the network
+
+        // On the server-side
+        serverToken = serverContext.acceptSecContext(clientToken, 0, clientToken.length);
+        // sendToClient(serverToken); // This is supposed to be send over the network
+
+        // Back on the client-side
+        clientContext.initSecContext(serverToken, 0, serverToken.length);
+
+        assertTrue(serverContext.isEstablished());
+        assertTrue(clientContext.isEstablished());
+    }
+
+    @Test
+    public void givenContext_whenStarted_thenSecurityWorks() throws SaslException, GSSException {
+        // On the client-side
+        byte[] messageBytes = "Baeldung".getBytes();
+        MessageProp clientProp = new MessageProp(0, true);
+        byte[] clientToken = clientContext.wrap(messageBytes, 0, messageBytes.length, clientProp);
+        // sendToServer(clientToken); // This is supposed to be send over the network
+
+        // On the server-side
+        MessageProp serverProp = new MessageProp(0, false);
+        byte[] bytes = serverContext.unwrap(clientToken, 0, clientToken.length, serverProp);
+        String string = new String(bytes);
+
+        assertEquals("Baeldung", string);
+    }
+
+    @After
+    public void tearDown() throws SaslException, GSSException {
+        serverContext.dispose();
+        clientContext.dispose();
+    }
+
+}
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index 2dca62005d..ecf1f4147e 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -17,6 +17,7 @@
         <module>pre-jpms</module>
         <module>core-java-exceptions</module>
         <module>core-java-optional</module>
+        <module>core-java-lang-operators</module>
         <module>core-java-networking-2</module>
     </modules>
     
diff --git a/data-structures/README.md b/data-structures/README.md
index 2d92068390..5ea9657173 100644
--- a/data-structures/README.md
+++ b/data-structures/README.md
@@ -1,4 +1,5 @@
 ## Relevant articles:
 
-[The Trie Data Structure in Java](https://www.baeldung.com/trie-java)
-[Implementing a Binary Tree in Java](https://www.baeldung.com/java-binary-tree)
+- [The Trie Data Structure in Java](https://www.baeldung.com/trie-java)
+- [Implementing a Binary Tree in Java](https://www.baeldung.com/java-binary-tree)
+- [Depth First Search in Java](https://www.baeldung.com/java-depth-first-search)
diff --git a/data-structures/src/main/java/com/baeldung/graph/Graph.java b/data-structures/src/main/java/com/baeldung/graph/Graph.java
index 16b7e04297..40df2c713a 100644
--- a/data-structures/src/main/java/com/baeldung/graph/Graph.java
+++ b/data-structures/src/main/java/com/baeldung/graph/Graph.java
@@ -2,6 +2,7 @@ package com.baeldung.graph;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Stack;
@@ -29,7 +30,7 @@ public class Graph {
         while (!stack.isEmpty()) {
             int current = stack.pop();
             isVisited[current] = true;
-            System.out.print(" " + current);
+            visit(current);
             for (int dest : adjVertices.get(current)) {
                 if (!isVisited[dest])
                     stack.push(dest);
@@ -44,29 +45,30 @@ public class Graph {
 
     private void dfsRecursive(int current, boolean[] isVisited) {
         isVisited[current] = true;
-        System.out.print(" " + current);
+        visit(current);
         for (int dest : adjVertices.get(current)) {
             if (!isVisited[dest])
                 dfsRecursive(dest, isVisited);
         }
     }
 
-    public void topologicalSort(int start) {
-        Stack<Integer> result = new Stack<Integer>();
+    public List<Integer> topologicalSort(int start) {
+        LinkedList<Integer> result = new LinkedList<Integer>();
         boolean[] isVisited = new boolean[adjVertices.size()];
         topologicalSortRecursive(start, isVisited, result);
-        while (!result.isEmpty()) {
-            System.out.print(" " + result.pop());
-        }
+        return result;
     }
 
-    private void topologicalSortRecursive(int current, boolean[] isVisited, Stack<Integer> result) {
+    private void topologicalSortRecursive(int current, boolean[] isVisited, LinkedList<Integer> result) {
         isVisited[current] = true;
         for (int dest : adjVertices.get(current)) {
             if (!isVisited[dest])
                 topologicalSortRecursive(dest, isVisited, result);
         }
-        result.push(current);
+        result.addFirst(current);
     }
 
+    private void visit(int value) {
+        System.out.print(" " + value);        
+    }
 }
diff --git a/data-structures/src/main/java/com/baeldung/tree/BinaryTree.java b/data-structures/src/main/java/com/baeldung/tree/BinaryTree.java
index ff73ee8e54..bb62714006 100644
--- a/data-structures/src/main/java/com/baeldung/tree/BinaryTree.java
+++ b/data-structures/src/main/java/com/baeldung/tree/BinaryTree.java
@@ -103,14 +103,14 @@ public class BinaryTree {
     public void traverseInOrder(Node node) {
         if (node != null) {
             traverseInOrder(node.left);
-            System.out.print(" " + node.value);
+            visit(node.value);
             traverseInOrder(node.right);
         }
     }
 
     public void traversePreOrder(Node node) {
         if (node != null) {
-            System.out.print(" " + node.value);
+            visit(node.value);
             traversePreOrder(node.left);
             traversePreOrder(node.right);
         }
@@ -120,7 +120,7 @@ public class BinaryTree {
         if (node != null) {
             traversePostOrder(node.left);
             traversePostOrder(node.right);
-            System.out.print(" " + node.value);
+            visit(node.value);
         }
     }
 
@@ -159,7 +159,7 @@ public class BinaryTree {
                 stack.push(current);                
             }
             current = stack.pop();
-            System.out.print(" " + current.value);
+            visit(current.value);
             if(current.right != null) {
                 current = current.right;                
                 stack.push(current);
@@ -173,7 +173,7 @@ public class BinaryTree {
         stack.push(root);
         while(! stack.isEmpty()) {
             current = stack.pop();
-            System.out.print(" " + current.value);
+            visit(current.value);
             
             if(current.right != null)
                 stack.push(current.right);
@@ -196,7 +196,7 @@ public class BinaryTree {
 
             if (!hasChild || isPrevLastChild) {
                 current = stack.pop();
-                System.out.print(" " + current.value);
+                visit(current.value);
                 prev = current;
             } else {
                 if (current.right != null) {
@@ -209,6 +209,9 @@ public class BinaryTree {
         }   
     }    
     
+    private void visit(int value) {
+        System.out.print(" " + value);        
+    }
     
     class Node {
         int value;
diff --git a/data-structures/src/test/java/com/baeldung/graph/GraphUnitTest.java b/data-structures/src/test/java/com/baeldung/graph/GraphUnitTest.java
index 249cb6e093..09b92115d2 100644
--- a/data-structures/src/test/java/com/baeldung/graph/GraphUnitTest.java
+++ b/data-structures/src/test/java/com/baeldung/graph/GraphUnitTest.java
@@ -1,5 +1,7 @@
 package com.baeldung.graph;
 
+import java.util.List;
+
 import org.junit.Test;
 
 public class GraphUnitTest {
@@ -15,7 +17,8 @@ public class GraphUnitTest {
     @Test
     public void givenDirectedGraph_whenGetTopologicalSort_thenPrintValuesSorted() {
         Graph graph = createDirectedGraph();
-        graph.topologicalSort(0);
+        List<Integer> list = graph.topologicalSort(0);
+        System.out.println(list);
     }
 
     private Graph createDirectedGraph() {
diff --git a/intelliJ/intelliJ-formatter.xml b/intelliJ/intelliJ-formatter.xml
index 6dd1ae67f3..9b1d12a3be 100644
--- a/intelliJ/intelliJ-formatter.xml
+++ b/intelliJ/intelliJ-formatter.xml
@@ -1,19 +1,15 @@
-<code_scheme name="baeldung">
+<code_scheme name="baeldung-formatter" version="173">
   <option name="RIGHT_MARGIN" value="260" />
-  <option name="ENABLE_JAVADOC_FORMATTING" value="false" />
   <option name="FORMATTER_TAGS_ENABLED" value="true" />
   <JavaCodeStyleSettings>
-    <option name="SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_TYPE_ARGUMENT" value="true" />
-    <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
-    <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="300" />
+    <option name="ENABLE_JAVADOC_FORMATTING" value="false" />
   </JavaCodeStyleSettings>
-  <JetCodeStyleSettings>
-    <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="99" />
-    <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="99" />
-  </JetCodeStyleSettings>
   <codeStyleSettings language="JAVA">
     <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
     <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
@@ -29,19 +25,18 @@
     <option name="THROWS_LIST_WRAP" value="1" />
     <option name="EXTENDS_KEYWORD_WRAP" value="1" />
     <option name="THROWS_KEYWORD_WRAP" value="1" />
-    <option name="METHOD_CALL_CHAIN_WRAP" value="2" />
-    <option name="WRAP_FIRST_METHOD_IN_CALL_CHAIN" value="true" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
     <option name="BINARY_OPERATION_WRAP" value="1" />
     <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
     <option name="TERNARY_OPERATION_WRAP" value="5" />
-    <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
     <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-    <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
-    <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
-    <option name="PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE" value="true" />
+    <option name="METHOD_ANNOTATION_WRAP" value="0" />
+    <option name="CLASS_ANNOTATION_WRAP" value="0" />
+    <option name="FIELD_ANNOTATION_WRAP" value="0" />
     <indentOptions>
-      <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      <option name="TAB_SIZE" value="8" />
+      <option name="INDENT_SIZE" value="8" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="SMART_TABS" value="true" />
     </indentOptions>
   </codeStyleSettings>
 </code_scheme>
\ No newline at end of file
diff --git a/jackson-2/README.md b/jackson-2/README.md
index d8c233a00e..bb2a58483f 100644
--- a/jackson-2/README.md
+++ b/jackson-2/README.md
@@ -2,7 +2,7 @@
 
 ## Jackson Cookbooks and Examples
 
-###The Course
+### The Course
 The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
@@ -10,3 +10,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [How to Process YAML with Jackson](https://www.baeldung.com/jackson-yaml)
 - [Working with Tree Model Nodes in Jackson](https://www.baeldung.com/jackson-json-node-tree-model)
 - [Converting JSON to CSV in Java](https://www.baeldung.com/java-converting-json-to-csv)
+- [Compare Two JSON Objects with Jackson](https://www.baeldung.com/jackson-compare-two-json-objects)
diff --git a/jackson-2/src/main/java/com/baeldung/jackson/entities/File.java b/jackson-2/src/main/java/com/baeldung/jackson/entities/File.java
new file mode 100644
index 0000000000..0e8829e927
--- /dev/null
+++ b/jackson-2/src/main/java/com/baeldung/jackson/entities/File.java
@@ -0,0 +1,25 @@
+package com.baeldung.jackson.entities;
+
+public class File {
+
+    private Long id;
+
+    private String name;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
\ No newline at end of file
diff --git a/jackson-2/src/main/java/com/baeldung/jackson/entities/Folder.java b/jackson-2/src/main/java/com/baeldung/jackson/entities/Folder.java
new file mode 100644
index 0000000000..c49e46b204
--- /dev/null
+++ b/jackson-2/src/main/java/com/baeldung/jackson/entities/Folder.java
@@ -0,0 +1,82 @@
+package com.baeldung.jackson.entities;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class Folder {
+
+    private Long id;
+
+    private String name;
+
+    private String owner;
+
+    private Date created;
+
+    private Date modified;
+
+    private Date lastAccess;
+
+    @JsonIgnore
+    private List<File> files = new ArrayList<>();
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getOwner() {
+        return owner;
+    }
+
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public Date getModified() {
+        return modified;
+    }
+
+    public void setModified(Date modified) {
+        this.modified = modified;
+    }
+
+    public Date getLastAccess() {
+        return lastAccess;
+    }
+
+    public void setLastAccess(Date lastAccess) {
+        this.lastAccess = lastAccess;
+    }
+
+    public List<File> getFiles() {
+        return files;
+    }
+
+    public void setFiles(List<File> files) {
+        this.files = files;
+    }
+
+}
\ No newline at end of file
diff --git a/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderBeanSerializerModifier.java b/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderBeanSerializerModifier.java
new file mode 100644
index 0000000000..a3add58dc4
--- /dev/null
+++ b/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderBeanSerializerModifier.java
@@ -0,0 +1,21 @@
+package com.baeldung.jackson.serialization.custom.serializer;
+
+import com.baeldung.jackson.entities.Folder;
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
+
+public class FolderBeanSerializerModifier extends BeanSerializerModifier {
+
+    @Override
+    public JsonSerializer<?> modifySerializer(SerializationConfig config, BeanDescription beanDesc, JsonSerializer<?> serializer) {
+
+        if (beanDesc.getBeanClass().equals(Folder.class)) {
+            return new FolderSerializerWithDefaultSerializerStored((JsonSerializer<Object>) serializer);
+        }
+
+        return serializer;
+    }
+
+}
diff --git a/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializer.java b/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializer.java
new file mode 100644
index 0000000000..f385e63e09
--- /dev/null
+++ b/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializer.java
@@ -0,0 +1,36 @@
+package com.baeldung.jackson.serialization.custom.serializer;
+
+import java.io.IOException;
+
+import com.baeldung.jackson.entities.File;
+import com.baeldung.jackson.entities.Folder;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+public class FolderSerializer extends StdSerializer<Folder> {
+
+    public FolderSerializer() {
+        super(Folder.class);
+    }
+
+    @Override
+    public void serialize(Folder value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+
+        gen.writeStartObject();
+        gen.writeStringField("name", value.getName());
+
+        gen.writeArrayFieldStart("files");
+        for (File file : value.getFiles()) {
+            gen.writeStartObject();
+            gen.writeNumberField("id", file.getId());
+            gen.writeStringField("name", file.getName());
+            gen.writeEndObject();
+        }
+        gen.writeEndArray();
+
+        gen.writeEndObject();
+
+    }
+
+}
diff --git a/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializerWithCallingOwnSerializer.java b/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializerWithCallingOwnSerializer.java
new file mode 100644
index 0000000000..ed5d9fffb8
--- /dev/null
+++ b/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializerWithCallingOwnSerializer.java
@@ -0,0 +1,30 @@
+package com.baeldung.jackson.serialization.custom.serializer;
+
+import java.io.IOException;
+
+import com.baeldung.jackson.entities.Folder;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+public class FolderSerializerWithCallingOwnSerializer extends StdSerializer<Folder> {
+
+    public FolderSerializerWithCallingOwnSerializer() {
+        super(Folder.class);
+    }
+
+    @Override
+    public void serialize(Folder value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+
+        gen.writeStartObject();
+        gen.writeStringField("name", value.getName());
+
+        provider.defaultSerializeField("files", value.getFiles(), gen);
+
+        provider.defaultSerializeField("details", value, gen);
+
+        gen.writeEndObject();
+
+    }
+
+}
diff --git a/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializerWithDefaultSerializerStored.java b/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializerWithDefaultSerializerStored.java
new file mode 100644
index 0000000000..d4a95cd939
--- /dev/null
+++ b/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializerWithDefaultSerializerStored.java
@@ -0,0 +1,35 @@
+package com.baeldung.jackson.serialization.custom.serializer;
+
+import java.io.IOException;
+
+import com.baeldung.jackson.entities.Folder;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+public class FolderSerializerWithDefaultSerializerStored extends StdSerializer<Folder> {
+
+    private final JsonSerializer<Object> defaultSerializer;
+
+    public FolderSerializerWithDefaultSerializerStored(JsonSerializer<Object> defaultSerializer) {
+        super(Folder.class);
+        this.defaultSerializer = defaultSerializer;
+    }
+
+    @Override
+    public void serialize(Folder value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+
+        gen.writeStartObject();
+        gen.writeStringField("name", value.getName());
+
+        provider.defaultSerializeField("files", value.getFiles(), gen);
+
+        gen.writeFieldName("details");
+        defaultSerializer.serialize(value, gen, provider);
+
+        gen.writeEndObject();
+
+    }
+
+}
diff --git a/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializerWithInternalObjectMapper.java b/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializerWithInternalObjectMapper.java
new file mode 100644
index 0000000000..b23dc32205
--- /dev/null
+++ b/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializerWithInternalObjectMapper.java
@@ -0,0 +1,34 @@
+package com.baeldung.jackson.serialization.custom.serializer;
+
+import java.io.IOException;
+
+import com.baeldung.jackson.entities.Folder;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+public class FolderSerializerWithInternalObjectMapper extends StdSerializer<Folder> {
+
+    public FolderSerializerWithInternalObjectMapper() {
+        super(Folder.class);
+    }
+
+    @Override
+    public void serialize(Folder value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+
+        gen.writeStartObject();
+        gen.writeStringField("name", value.getName());
+
+        // we access internal mapper to delegate the serialization of File list  
+        ObjectMapper mapper = (ObjectMapper) gen.getCodec();
+
+        gen.writeFieldName("files");
+        String stringValue = mapper.writeValueAsString(value.getFiles());
+        gen.writeRawValue(stringValue);
+
+        gen.writeEndObject();
+
+    }
+
+}
diff --git a/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializerWithSerializerProvider.java b/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializerWithSerializerProvider.java
new file mode 100644
index 0000000000..81990a084d
--- /dev/null
+++ b/jackson-2/src/main/java/com/baeldung/jackson/serialization/custom/serializer/FolderSerializerWithSerializerProvider.java
@@ -0,0 +1,29 @@
+package com.baeldung.jackson.serialization.custom.serializer;
+
+import java.io.IOException;
+
+import com.baeldung.jackson.entities.Folder;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+public class FolderSerializerWithSerializerProvider extends StdSerializer<Folder> {
+
+    public FolderSerializerWithSerializerProvider() {
+        super(Folder.class);
+    }
+
+    @Override
+    public void serialize(Folder value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+
+        gen.writeStartObject();
+        gen.writeStringField("name", value.getName());
+
+        // we delegate the File list serialization to its default serializer
+        provider.defaultSerializeField("files", value.getFiles(), gen);
+
+        gen.writeEndObject();
+
+    }
+
+}
\ No newline at end of file
diff --git a/jackson-2/src/test/java/com/baeldung/jackson/serialization/custom/serializer/CallingDefaultSerializerUnitTest.java b/jackson-2/src/test/java/com/baeldung/jackson/serialization/custom/serializer/CallingDefaultSerializerUnitTest.java
new file mode 100644
index 0000000000..b067e7b501
--- /dev/null
+++ b/jackson-2/src/test/java/com/baeldung/jackson/serialization/custom/serializer/CallingDefaultSerializerUnitTest.java
@@ -0,0 +1,166 @@
+package com.baeldung.jackson.serialization.custom.serializer;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.baeldung.jackson.entities.File;
+import com.baeldung.jackson.entities.Folder;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+public class CallingDefaultSerializerUnitTest {
+
+    private ObjectMapper mapper;
+    private Folder mockFolder;
+    private TypeReference<HashMap<String, Object>> mapType;
+
+    @Before
+    public void setup() {
+
+        mapType = new TypeReference<HashMap<String, Object>>() {
+        };
+
+        mapper = new ObjectMapper();
+
+        mockFolder = new Folder();
+        mockFolder.setId(1L);
+        mockFolder.setName("Root Folder");
+        mockFolder.setOwner("root");
+        mockFolder.setCreated(Date.from(Instant.now().minusSeconds(60)));
+        mockFolder.setModified(Date.from(Instant.now().minusSeconds(30)));
+        mockFolder.setLastAccess(Date.from(Instant.now()));
+
+        File file1 = new File();
+        file1.setId(1L);
+        file1.setName("File 1");
+
+        File file2 = new File();
+        file2.setId(2L);
+        file2.setName("File 2");
+
+        List<File> files = new ArrayList<>();
+        files.add(file1);
+        files.add(file2);
+        mockFolder.setFiles(files);
+
+    }
+
+    @Test
+    public void givenFolder_whenSerialized_onlyNameAndFilesFieldsSerialized() throws IOException {
+
+        SimpleModule module = new SimpleModule();
+        module.addSerializer(new FolderSerializer());
+        mapper.registerModule(module);
+
+        String json = mapper.writeValueAsString(mockFolder);
+
+        HashMap<String, Object> actual = mapper.readValue(json, mapType);
+
+        assertTrue(actual.containsKey("name"));
+        assertTrue(actual.containsKey("files"));
+        assertEquals(mockFolder.getName(), actual.get("name"));
+
+        List actualFiles = (List) actual.get("files");
+        assertEquals(mockFolder.getFiles().size(), actualFiles.size());
+        
+    }
+
+    @Test
+    public void givenFolder_whenSerializedWithSerializerProvider_onlyNameAndFilesFieldsSerialized() throws IOException {
+
+        SimpleModule module = new SimpleModule();
+        module.addSerializer(new FolderSerializerWithSerializerProvider());
+        mapper.registerModule(module);
+
+        String json = mapper.writeValueAsString(mockFolder);
+
+        HashMap<String, Object> actual = mapper.readValue(json, mapType);
+
+        assertTrue(actual.containsKey("name"));
+        assertTrue(actual.containsKey("files"));
+        assertEquals(mockFolder.getName(), actual.get("name"));
+
+        List actualFiles = (List) actual.get("files");
+        assertEquals(mockFolder.getFiles().size(), actualFiles.size());
+
+    }
+
+    @Test
+    public void givenFolder_whenSerializedWithInternalObjectMapper_onlyNameAndFilesFieldsSerialized() throws IOException {
+
+        SimpleModule module = new SimpleModule();
+        module.addSerializer(new FolderSerializerWithInternalObjectMapper());
+        mapper.registerModule(module);
+
+        String json = mapper.writeValueAsString(mockFolder);
+
+        HashMap<String, Object> actual = mapper.readValue(json, mapType);
+
+        assertTrue(actual.containsKey("name"));
+        assertTrue(actual.containsKey("files"));
+        assertEquals(mockFolder.getName(), actual.get("name"));
+
+        List actualFiles = (List) actual.get("files");
+        assertEquals(mockFolder.getFiles().size(), actualFiles.size());
+
+    }
+
+    @Test(expected = StackOverflowError.class)
+    public void givenFolder_whenSerializedWithCallingOwnSerializer_exceptionOccured() throws IOException {
+
+        SimpleModule module = new SimpleModule();
+        module.addSerializer(new FolderSerializerWithCallingOwnSerializer());
+        mapper.registerModule(module);
+
+        mapper.writeValueAsString(mockFolder);
+        
+    }
+
+    @Test
+    public void givenFolder_whenSerializedWithDefaultSerializerStored_NameAndFilesAndDetailsFieldsSerialized() throws IOException {
+
+        SimpleModule module = new SimpleModule();
+        module.setSerializerModifier(new FolderBeanSerializerModifier());
+        mapper.registerModule(module);
+
+        String json = mapper.writeValueAsString(mockFolder);
+        
+        HashMap<String, Object> actual = mapper.readValue(json, mapType);
+
+        assertTrue(actual.containsKey("name"));
+        assertTrue(actual.containsKey("files"));
+        assertEquals(mockFolder.getName(), actual.get("name"));
+
+        List actualFiles = (List) actual.get("files");
+        assertEquals(mockFolder.getFiles().size(), actualFiles.size());
+        
+        Map actualDetails = (Map) actual.get("details");
+        assertTrue(actualDetails.containsKey("id"));
+        assertTrue(actualDetails.containsKey("name"));
+        assertTrue(actualDetails.containsKey("owner"));
+        assertTrue(actualDetails.containsKey("created"));
+        assertTrue(actualDetails.containsKey("modified"));
+        assertTrue(actualDetails.containsKey("lastAccess"));
+        
+        assertEquals(mockFolder.getId().longValue(), ((Number)actualDetails.get("id")).longValue());
+        assertEquals(mockFolder.getName(), actualDetails.get("name"));
+        assertEquals(mockFolder.getOwner(), actualDetails.get("owner"));
+        assertEquals(mockFolder.getCreated(), new Date((long) actualDetails.get("created")));
+        assertEquals(mockFolder.getModified(), new Date((long) actualDetails.get("modified")));
+        assertEquals(mockFolder.getLastAccess(), new Date((long) actualDetails.get("lastAccess")));
+
+    }
+
+}
diff --git a/java-dates-2/README.md b/java-dates-2/README.md
index 35286115d4..b2f8319e58 100644
--- a/java-dates-2/README.md
+++ b/java-dates-2/README.md
@@ -1,3 +1,4 @@
 ## Relevant Articles:
 - [Converting Between LocalDate and XMLGregorianCalendar](https://www.baeldung.com/java-localdate-to-xmlgregoriancalendar)
 - [Convert Time to Milliseconds in Java](https://www.baeldung.com/java-time-milliseconds)
+- [Check If a String Is a Valid Date in Java](https://www.baeldung.com/java-string-valid-date)
diff --git a/java-dates/README.md b/java-dates/README.md
index 8171e5def9..7da309924d 100644
--- a/java-dates/README.md
+++ b/java-dates/README.md
@@ -29,3 +29,4 @@
 - [A Guide to SimpleDateFormat](https://www.baeldung.com/java-simple-date-format)
 - [ZoneOffset in Java](https://www.baeldung.com/java-zone-offset)
 - [Differences Between ZonedDateTime and OffsetDateTime](https://www.baeldung.com/java-zoneddatetime-offsetdatetime)
+- [Introduction to Joda-Time](http://www.baeldung.com/joda-time)
diff --git a/java-math/pom.xml b/java-math/pom.xml
index f71577b707..b5c31c4487 100644
--- a/java-math/pom.xml
+++ b/java-math/pom.xml
@@ -17,6 +17,26 @@
             <artifactId>commons-math3</artifactId>
             <version>${commons-math3.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.ejml</groupId>
+            <artifactId>ejml-all</artifactId>
+            <version>${ejml.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.nd4j</groupId>
+            <artifactId>nd4j-native</artifactId>
+            <version>${nd4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.la4j</groupId>
+            <artifactId>la4j</artifactId>
+            <version>${la4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>colt</groupId>
+            <artifactId>colt</artifactId>
+            <version>${colt.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -44,6 +64,17 @@
             <artifactId>combinatoricslib3</artifactId>
             <version>${combinatoricslib3.version}</version>
          </dependency>
+        <!-- Benchmarking -->
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -64,6 +95,11 @@
         <commons-codec.version>1.11</commons-codec.version>
         <guava.version>27.0.1-jre</guava.version>
         <combinatoricslib3.version>3.3.0</combinatoricslib3.version>
+        <ejml.version>0.38</ejml.version>
+        <nd4j.version>1.0.0-beta4</nd4j.version>
+        <colt.version>1.2.0</colt.version>
+        <la4j.version>0.6.0</la4j.version>
+        <jmh.version>1.19</jmh.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/java-math/src/main/java/com/baeldung/algorithms/gcd/GCDImplementation.java b/java-math/src/main/java/com/baeldung/algorithms/gcd/GCDImplementation.java
new file mode 100644
index 0000000000..d4844abd9c
--- /dev/null
+++ b/java-math/src/main/java/com/baeldung/algorithms/gcd/GCDImplementation.java
@@ -0,0 +1,55 @@
+package com.baeldung.algorithms.gcd;
+
+public class GCDImplementation {
+
+    public static int gcdByBruteForce(int n1, int n2) {
+        int gcd = 1;
+        for (int i = 1; i <= n1 && i <= n2; i++) {
+            if (n1 % i == 0 && n2 % i == 0) {
+                gcd = i;
+            }
+        }
+        return gcd;
+    }
+
+    public static int gcdByEuclidsAlgorithm(int n1, int n2) {
+        if (n2 == 0) {
+            return n1;
+        }
+        return gcdByEuclidsAlgorithm(n2, n1 % n2);
+    }
+
+    public static int gcdBySteinsAlgorithm(int n1, int n2) {
+        if (n1 == 0) {
+            return n2;
+        }
+
+        if (n2 == 0) {
+            return n1;
+        }
+
+        int n;
+        for (n = 0; ((n1 | n2) & 1) == 0; n++) {
+            n1 >>= 1;
+            n2 >>= 1;
+        }
+
+        while ((n1 & 1) == 0) {
+            n1 >>= 1;
+        }
+
+        do {
+            while ((n2 & 1) == 0) {
+                n2 >>= 1;
+            }
+
+            if (n1 > n2) {
+                int temp = n1;
+                n1 = n2;
+                n2 = temp;
+            }
+            n2 = (n2 - n1);
+        } while (n2 != 0);
+        return n1 << n;
+    }
+}
diff --git a/java-math/src/test/java/com/baeldung/algorithms/gcd/GCDImplementationUnitTest.java b/java-math/src/test/java/com/baeldung/algorithms/gcd/GCDImplementationUnitTest.java
new file mode 100644
index 0000000000..d2c91a2eb8
--- /dev/null
+++ b/java-math/src/test/java/com/baeldung/algorithms/gcd/GCDImplementationUnitTest.java
@@ -0,0 +1,32 @@
+package com.baeldung.algorithms.gcd;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class GCDImplementationUnitTest {
+
+    @Test
+    public void whenCalculatingGCDByBruteForceMethod_thenCorrect() {
+        int n1 = 60;
+        int n2 = 90;
+        int gcd = GCDImplementation.gcdByBruteForce(n1, n2);
+        assertThat(gcd).isEqualTo(30);
+    }
+
+    @Test
+    public void whenCalculatingGCDByEuclidsAlgorithm_thenCorrect() {
+        int n1 = 60;
+        int n2 = 90;
+        int gcd = GCDImplementation.gcdByEuclidsAlgorithm(n1, n2);
+        assertThat(gcd).isEqualTo(30);
+    }
+
+    @Test
+    public void whenCalculatingGCDBySteinsAlgorithm_thenCorrect() {
+        int n1 = 60;
+        int n2 = 90;
+        int gcd = GCDImplementation.gcdBySteinsAlgorithm(n1, n2);
+        assertThat(gcd).isEqualTo(30);
+    }
+}
diff --git a/libraries-2/src/test/java/com/baeldung/matrices/MatrixMultiplicationBenchmarking.java b/java-math/src/test/java/com/baeldung/matrices/MatrixMultiplicationBenchmarking.java
similarity index 100%
rename from libraries-2/src/test/java/com/baeldung/matrices/MatrixMultiplicationBenchmarking.java
rename to java-math/src/test/java/com/baeldung/matrices/MatrixMultiplicationBenchmarking.java
diff --git a/libraries-2/src/test/java/com/baeldung/matrices/apache/RealMatrixUnitTest.java b/java-math/src/test/java/com/baeldung/matrices/apache/RealMatrixUnitTest.java
similarity index 100%
rename from libraries-2/src/test/java/com/baeldung/matrices/apache/RealMatrixUnitTest.java
rename to java-math/src/test/java/com/baeldung/matrices/apache/RealMatrixUnitTest.java
diff --git a/libraries-2/src/test/java/com/baeldung/matrices/colt/DoubleMatrix2DUnitTest.java b/java-math/src/test/java/com/baeldung/matrices/colt/DoubleMatrix2DUnitTest.java
similarity index 100%
rename from libraries-2/src/test/java/com/baeldung/matrices/colt/DoubleMatrix2DUnitTest.java
rename to java-math/src/test/java/com/baeldung/matrices/colt/DoubleMatrix2DUnitTest.java
diff --git a/libraries-2/src/test/java/com/baeldung/matrices/ejml/SimpleMatrixUnitTest.java b/java-math/src/test/java/com/baeldung/matrices/ejml/SimpleMatrixUnitTest.java
similarity index 100%
rename from libraries-2/src/test/java/com/baeldung/matrices/ejml/SimpleMatrixUnitTest.java
rename to java-math/src/test/java/com/baeldung/matrices/ejml/SimpleMatrixUnitTest.java
diff --git a/libraries-2/src/test/java/com/baeldung/matrices/homemade/HomemadeMatrixUnitTest.java b/java-math/src/test/java/com/baeldung/matrices/homemade/HomemadeMatrixUnitTest.java
similarity index 100%
rename from libraries-2/src/test/java/com/baeldung/matrices/homemade/HomemadeMatrixUnitTest.java
rename to java-math/src/test/java/com/baeldung/matrices/homemade/HomemadeMatrixUnitTest.java
diff --git a/libraries-2/src/test/java/com/baeldung/matrices/la4j/Basic2DMatrixUnitTest.java b/java-math/src/test/java/com/baeldung/matrices/la4j/Basic2DMatrixUnitTest.java
similarity index 100%
rename from libraries-2/src/test/java/com/baeldung/matrices/la4j/Basic2DMatrixUnitTest.java
rename to java-math/src/test/java/com/baeldung/matrices/la4j/Basic2DMatrixUnitTest.java
diff --git a/libraries-2/src/test/java/com/baeldung/matrices/nd4j/INDArrayUnitTest.java b/java-math/src/test/java/com/baeldung/matrices/nd4j/INDArrayUnitTest.java
similarity index 100%
rename from libraries-2/src/test/java/com/baeldung/matrices/nd4j/INDArrayUnitTest.java
rename to java-math/src/test/java/com/baeldung/matrices/nd4j/INDArrayUnitTest.java
diff --git a/java-numbers-2/.gitignore b/java-numbers-2/.gitignore
deleted file mode 100644
index 3de4cc647e..0000000000
--- a/java-numbers-2/.gitignore
+++ /dev/null
@@ -1,26 +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
-*.txt
-backup-pom.xml
-/bin/
-/temp
-
-#IntelliJ specific
-.idea/
-*.iml
\ No newline at end of file
diff --git a/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java b/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java
index effdee07ad..62cead726f 100644
--- a/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java
+++ b/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java
@@ -1,148 +1,140 @@
-package com.baeldung.binarynumbers;
-
-public class BinaryNumbers {
-
-    /**
-     * This method takes a decimal number and convert it into a binary number.
-     * example:- input:10, output:1010
-     *
-     * @param decimalNumber
-     * @return binary number
-     */
-    public Integer convertDecimalToBinary(Integer decimalNumber) {
-
-        if (decimalNumber == 0) {
-            return decimalNumber;
-        }
-
-        StringBuilder binaryNumber = new StringBuilder();
-
-        while (decimalNumber > 0) {
-
-            int remainder = decimalNumber % 2;
-            int result = decimalNumber / 2;
-
-            binaryNumber.append(remainder);
-            decimalNumber = result;
-        }
-
-        binaryNumber = binaryNumber.reverse();
-
-        return Integer.valueOf(binaryNumber.toString());
-    }
-
-    /**
-     * This method takes a binary number and convert it into a decimal number.
-     * example:- input:101, output:5
-     *
-     * @param binary number
-     * @return decimal Number
-     */
-    public Integer convertBinaryToDecimal(Integer binaryNumber) {
-
-        Integer result = 0;
-        Integer base = 1;
-
-        while (binaryNumber > 0) {
-
-            int lastDigit = binaryNumber % 10;
-            binaryNumber = binaryNumber / 10;
-
-            result += lastDigit * base;
-
-            base = base * 2;
-        }
-        return result;
-    }
-
-    /**
-     * This method accepts two binary numbers and returns sum of input numbers.
-     * Example:- firstNum: 101, secondNum: 100, output: 1001
-     *
-     * @param firstNum
-     * @param secondNum
-     * @return addition of input numbers
-     */
-    public Integer addBinaryNumber(Integer firstNum, Integer secondNum) {
-
-        StringBuilder output = new StringBuilder();
-
-        int carry = 0;
-        int temp;
-
-        while (firstNum != 0 || secondNum != 0) {
-
-            temp = (firstNum % 10 + secondNum % 10 + carry) % 2;
-            output.append(temp);
-
-            carry = (firstNum % 10 + secondNum % 10 + carry) / 2;
-
-            firstNum = firstNum / 10;
-            secondNum = secondNum / 10;
-        }
-
-        if (carry != 0) {
-            output.append(carry);
-        }
-
-        return Integer.valueOf(output.reverse()
-            .toString());
-    }
-
-    /**
-    * This method takes two binary number as input and subtract second number from the first number.
-    * example:- firstNum: 1000, secondNum: 11, output: 101
-    * @param firstNum
-    * @param secondNum
-    * @return Result of subtraction of secondNum from first
-    */
-    public Integer substractBinaryNumber(Integer firstNum, Integer secondNum) {
-
-        int onesComplement = Integer.valueOf(getOnesComplement(secondNum));
-
-        StringBuilder output = new StringBuilder();
-
-        int carry = 0;
-        int temp;
-
-        while (firstNum != 0 || onesComplement != 0) {
-
-            temp = (firstNum % 10 + onesComplement % 10 + carry) % 2;
-            output.append(temp);
-
-            carry = (firstNum % 10 + onesComplement % 10 + carry) / 2;
-
-            firstNum = firstNum / 10;
-            onesComplement = onesComplement / 10;
-        }
-
-        String additionOfFirstNumAndOnesComplement = output.reverse()
-            .toString();
-
-        if (carry == 1) {
-            return addBinaryNumber(Integer.valueOf(additionOfFirstNumAndOnesComplement), carry);
-        } else {
-            return getOnesComplement(Integer.valueOf(additionOfFirstNumAndOnesComplement));
-        }
-
-    }
-
-    public Integer getOnesComplement(Integer num) {
-
-        StringBuilder onesComplement = new StringBuilder();
-
-        while (num > 0) {
-            int lastDigit = num % 10;
-            if (lastDigit == 0) {
-                onesComplement.append(1);
-            } else {
-                onesComplement.append(0);
-            }
-            num = num / 10;
-        }
-
-        return Integer.valueOf(onesComplement.reverse()
-            .toString());
-    }
-
-}
+package com.baeldung.binarynumbers;
+
+public class BinaryNumbers {
+
+    /**
+     * This method takes a decimal number and convert it into a binary number.
+     * example:- input:10, output:1010
+     *
+     * @param decimalNumber
+     * @return binary number
+     */
+    public Integer convertDecimalToBinary(Integer decimalNumber) {
+
+        if (decimalNumber == 0) {
+            return decimalNumber;
+        }
+
+        StringBuilder binaryNumber = new StringBuilder();
+        Integer quotient = decimalNumber;
+
+        while (quotient > 0) {
+
+            int remainder = quotient % 2;
+            binaryNumber.append(remainder);
+            quotient /= 2;
+        }
+
+        binaryNumber = binaryNumber.reverse();
+        return Integer.valueOf(binaryNumber.toString());
+    }
+
+    /**
+     * This method takes a binary number and convert it into a decimal number.
+     * example:- input:101, output:5
+     *
+     * @param binary number
+     * @return decimal Number
+     */
+    public Integer convertBinaryToDecimal(Integer binaryNumber) {
+
+        Integer decimalNumber = 0;
+        Integer base = 1;
+
+        while (binaryNumber > 0) {
+
+            int lastDigit = binaryNumber % 10;
+            binaryNumber = binaryNumber / 10;
+
+            decimalNumber += lastDigit * base;
+            base = base * 2;
+        }
+        return decimalNumber;
+    }
+
+    /**
+     * This method accepts two binary numbers and returns sum of input numbers.
+     * Example:- firstNum: 101, secondNum: 100, output: 1001
+     *
+     * @param firstNum
+     * @param secondNum
+     * @return addition of input numbers
+     */
+    public Integer addBinaryNumber(Integer firstNum, Integer secondNum) {
+
+        StringBuilder output = new StringBuilder();
+
+        int carry = 0;
+        int temp;
+
+        while (firstNum != 0 || secondNum != 0) {
+
+            temp = (firstNum % 10 + secondNum % 10 + carry) % 2;
+            output.append(temp);
+
+            carry = (firstNum % 10 + secondNum % 10 + carry) / 2;
+
+            firstNum = firstNum / 10;
+            secondNum = secondNum / 10;
+        }
+
+        if (carry != 0) {
+            output.append(carry);
+        }
+
+        return Integer.valueOf(output.reverse()
+            .toString());
+    }
+
+    /**
+    * This method takes two binary number as input and subtract second number from the first number.
+    * example:- firstNum: 1000, secondNum: 11, output: 101
+    * @param firstNum
+    * @param secondNum
+    * @return Result of subtraction of secondNum from first
+    */
+    public Integer substractBinaryNumber(Integer firstNum, Integer secondNum) {
+
+        int onesComplement = Integer.valueOf(getOnesComplement(secondNum));
+        StringBuilder output = new StringBuilder();
+        int carry = 0;
+        int temp;
+
+        while (firstNum != 0 || onesComplement != 0) {
+
+            temp = (firstNum % 10 + onesComplement % 10 + carry) % 2;
+            output.append(temp);
+
+            carry = (firstNum % 10 + onesComplement % 10 + carry) / 2;
+
+            firstNum = firstNum / 10;
+            onesComplement = onesComplement / 10;
+        }
+
+        String additionOfFirstNumAndOnesComplement = output.reverse()
+            .toString();
+
+        if (carry == 1) {
+            return addBinaryNumber(Integer.valueOf(additionOfFirstNumAndOnesComplement), carry);
+        } else {
+            return getOnesComplement(Integer.valueOf(additionOfFirstNumAndOnesComplement));
+        }
+    }
+
+    public Integer getOnesComplement(Integer num) {
+
+        StringBuilder onesComplement = new StringBuilder();
+        while (num > 0) {
+            int lastDigit = num % 10;
+            if (lastDigit == 0) {
+                onesComplement.append(1);
+            } else {
+                onesComplement.append(0);
+            }
+            num = num / 10;
+        }
+        return Integer.valueOf(onesComplement.reverse()
+            .toString());
+    }
+
+}
\ No newline at end of file
diff --git a/java-strings-2/README.MD b/java-strings-2/README.MD
deleted file mode 100644
index c6d4f0222a..0000000000
--- a/java-strings-2/README.MD
+++ /dev/null
@@ -1,7 +0,0 @@
-## Relevant Articles
-
-- [Java Localization – Formatting Messages](https://www.baeldung.com/java-localization-messages-formatting)
-- [Check If a String Contains a Substring](https://www.baeldung.com/java-string-contains-substring)
-- [Removing Stopwords from a String in Java](https://www.baeldung.com/java-string-remove-stopwords)
-- [Blank and Empty Strings in Java](https://www.baeldung.com/java-blank-empty-strings)
-- [String Initialization in Java](https://www.baeldung.com/java-string-initialization)
diff --git a/java-strings-2/README.md b/java-strings-2/README.md
new file mode 100644
index 0000000000..55760bfac7
--- /dev/null
+++ b/java-strings-2/README.md
@@ -0,0 +1,25 @@
+## Relevant Articles:
+
+- [Java Localization – Formatting Messages](https://www.baeldung.com/java-localization-messages-formatting)
+- [Check If a String Contains a Substring](https://www.baeldung.com/java-string-contains-substring)
+- [Removing Stopwords from a String in Java](https://www.baeldung.com/java-string-remove-stopwords)
+- [Java – Generate Random String](http://www.baeldung.com/java-random-string)
+- [Image to Base64 String Conversion](http://www.baeldung.com/java-base64-image-string)
+- [Java Base64 Encoding and Decoding](https://www.baeldung.com/java-base64-encode-and-decode)
+- [Generate a Secure Random Password in Java](https://www.baeldung.com/java-generate-secure-password)
+- [Removing Repeated Characters from a String](https://www.baeldung.com/java-remove-repeated-char)
+- [Join Array of Primitives with Separator in Java](https://www.baeldung.com/java-join-primitive-array)
+- [Pad a String with Zeros or Spaces in Java](https://www.baeldung.com/java-pad-string)
+- [Remove Emojis from a Java String](https://www.baeldung.com/java-string-remove-emojis)
+- [Convert a Comma Separated String to a List in Java](https://www.baeldung.com/java-string-with-separator-to-list)
+- [Guide to java.util.Formatter](http://www.baeldung.com/java-string-formatter)
+- [Remove Leading and Trailing Characters from a String](https://www.baeldung.com/java-remove-trailing-characters)
+- [Concatenating Strings In Java](https://www.baeldung.com/java-strings-concatenation)
+- [Java String Interview Questions and Answers](https://www.baeldung.com/java-string-interview-questions)
+- [Check if a String is a Pangram in Java](https://www.baeldung.com/java-string-pangram)
+- [Check If a String Contains Multiple Keywords](https://www.baeldung.com/string-contains-multiple-words)
+- [Checking for Empty or Blank Strings in Java](https://www.baeldung.com/java-blank-empty-strings)
+- [String Initialization in Java](https://www.baeldung.com/java-string-initialization)
+- [Java Multi-line String](https://www.baeldung.com/java-multiline-string)
+- [Checking If a String Is a Repeated Substring](https://www.baeldung.com/java-repeated-substring)
+- [How to Reverse a String in Java](https://www.baeldung.com/java-reverse-string)
diff --git a/java-strings-2/pom.xml b/java-strings-2/pom.xml
index 7342953d15..be47b1ec89 100755
--- a/java-strings-2/pom.xml
+++ b/java-strings-2/pom.xml
@@ -40,6 +40,16 @@
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>${commons-codec.version}</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -52,32 +62,54 @@
             <version>${org.hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Added for password generation -->
+        <dependency>
+            <groupId>org.passay</groupId>
+            <artifactId>passay</artifactId>
+            <version>${passay.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
             <version>${commons-text.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.vdurmont</groupId>
+            <artifactId>emoji-java</artifactId>
+            <version>${emoji-java.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ahocorasick</groupId>
+            <artifactId>ahocorasick</artifactId>
+            <version>${ahocorasick.version}</version>
+        </dependency>
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
-            <version>2.0.0.Final</version>
+            <version>${validation-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>6.0.2.Final</version>
+            <version>${hibernate-validator.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.el</groupId>
             <artifactId>javax.el-api</artifactId>
-            <version>3.0.0</version>
+            <version>${javax.el-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.web</groupId>
             <artifactId>javax.el</artifactId>
-            <version>2.2.6</version>
+            <version>${javax.el.version}</version>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -105,9 +137,19 @@
 
     <properties>
         <commons-lang3.version>3.8.1</commons-lang3.version>
+        <commons-codec.version>1.10</commons-codec.version>
+        <passay.version>1.3.1</passay.version>
+        <!-- testing -->
+        <assertj.version>3.6.1</assertj.version>
+        <emoji-java.version>4.0.0</emoji-java.version>
+        <ahocorasick.version>0.4.0</ahocorasick.version>
         <icu4j.version>61.1</icu4j.version>
         <guava.version>28.0-jre</guava.version>
         <commons-text.version>1.4</commons-text.version>
+        <validation-api.version>2.0.0.Final</validation-api.version>
+        <hibernate-validator.version>6.0.2.Final</hibernate-validator.version>
+        <javax.el-api.version>3.0.0</javax.el-api.version>
+        <javax.el.version>2.2.6</javax.el.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings-2/src/main/java/com/baeldung/string/MatchWords.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/MatchWords.java
rename to java-strings-2/src/main/java/com/baeldung/string/MatchWords.java
diff --git a/java-strings/src/main/java/com/baeldung/string/Pangram.java b/java-strings-2/src/main/java/com/baeldung/string/Pangram.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/Pangram.java
rename to java-strings-2/src/main/java/com/baeldung/string/Pangram.java
diff --git a/java-strings/src/main/java/com/baeldung/string/padding/StringPaddingUtil.java b/java-strings-2/src/main/java/com/baeldung/string/padding/StringPaddingUtil.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/padding/StringPaddingUtil.java
rename to java-strings-2/src/main/java/com/baeldung/string/padding/StringPaddingUtil.java
diff --git a/java-strings/src/main/java/com/baeldung/string/password/RandomPasswordGenerator.java b/java-strings-2/src/main/java/com/baeldung/string/password/RandomPasswordGenerator.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/password/RandomPasswordGenerator.java
rename to java-strings-2/src/main/java/com/baeldung/string/password/RandomPasswordGenerator.java
diff --git a/java-strings/src/main/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroes.java b/java-strings-2/src/main/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroes.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroes.java
rename to java-strings-2/src/main/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroes.java
diff --git a/java-strings/src/main/java/com/baeldung/stringduplicates/RemoveDuplicateFromString.java b/java-strings-2/src/main/java/com/baeldung/stringduplicates/RemoveDuplicateFromString.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/stringduplicates/RemoveDuplicateFromString.java
rename to java-strings-2/src/main/java/com/baeldung/stringduplicates/RemoveDuplicateFromString.java
diff --git a/java-strings/src/test/java/com/baeldung/ConvertStringToListUnitTest.java b/java-strings-2/src/test/java/com/baeldung/ConvertStringToListUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/ConvertStringToListUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/ConvertStringToListUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/StringConcatenationUnitTest.java b/java-strings-2/src/test/java/com/baeldung/StringConcatenationUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/StringConcatenationUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/StringConcatenationUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java b/java-strings-2/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java b/java-strings-2/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java b/java-strings-2/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/java8/base64/StringToByteArrayUnitTest.java b/java-strings-2/src/test/java/com/baeldung/java8/base64/StringToByteArrayUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/java8/base64/StringToByteArrayUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/java8/base64/StringToByteArrayUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/MatchWordsUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/MatchWordsUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/MatchWordsUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/MatchWordsUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/PangramUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/PangramUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/PangramUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/PangramUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/RemovingEmojiFromStringUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/RemovingEmojiFromStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/RemovingEmojiFromStringUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/RemovingEmojiFromStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/StringFromPrimitiveArrayUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/StringFromPrimitiveArrayUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/StringFromPrimitiveArrayUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/StringFromPrimitiveArrayUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/formatter/DateToStringFormatterUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/formatter/DateToStringFormatterUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/formatter/DateToStringFormatterUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/formatter/DateToStringFormatterUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/LocaleUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/LocaleUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/LocaleUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/LocaleUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringAnagramUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringAnagramUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringAnagramUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringAnagramUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringChangeCaseUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringChangeCaseUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringChangeCaseUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringChangeCaseUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringCountOccurrencesUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringCountOccurrencesUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringCountOccurrencesUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringCountOccurrencesUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringFormatUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringFormatUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringFormatUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringFormatUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringInternUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringInternUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringInternUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringInternUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringJoinerUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringJoinerUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringJoinerUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringJoinerUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringPalindromeUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringPalindromeUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringPalindromeUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringPalindromeUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringReverseUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringReverseUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringReverseUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringReverseUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringSplitUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringSplitUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringSplitUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringSplitUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringToByteArrayUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringToByteArrayUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringToByteArrayUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringToByteArrayUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringToCharArrayUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringToCharArrayUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringToCharArrayUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringToCharArrayUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringToIntegerUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringToIntegerUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringToIntegerUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringToIntegerUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/padding/StringPaddingUtilUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/padding/StringPaddingUtilUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/padding/StringPaddingUtilUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/padding/StringPaddingUtilUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/password/StringPasswordUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/password/StringPasswordUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/password/StringPasswordUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/password/StringPasswordUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroesUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroesUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroesUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroesUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/stringduplicates/RemoveDuplicateFromStringUnitTest.java b/java-strings-2/src/test/java/com/baeldung/stringduplicates/RemoveDuplicateFromStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/stringduplicates/RemoveDuplicateFromStringUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/stringduplicates/RemoveDuplicateFromStringUnitTest.java
diff --git a/java-strings/src/test/resources/test_image.jpg b/java-strings-2/src/test/resources/test_image.jpg
similarity index 100%
rename from java-strings/src/test/resources/test_image.jpg
rename to java-strings-2/src/test/resources/test_image.jpg
diff --git a/java-strings-3/README.md b/java-strings-3/README.md
new file mode 100644
index 0000000000..6c2339028f
--- /dev/null
+++ b/java-strings-3/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles:
+
+- [Converting Java String to Double](https://www.baeldung.com/java-string-to-double)
diff --git a/java-strings-3/pom.xml b/java-strings-3/pom.xml
new file mode 100644
index 0000000000..1e5f757943
--- /dev/null
+++ b/java-strings-3/pom.xml
@@ -0,0 +1,155 @@
+<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>java-strings-3</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>java-strings-3</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <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-core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.ibm.icu</groupId>
+            <artifactId>icu4j</artifactId>
+            <version>${icu4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>${commons-codec.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>${org.hamcrest.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Added for password generation -->
+        <dependency>
+            <groupId>org.passay</groupId>
+            <artifactId>passay</artifactId>
+            <version>${passay.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>${commons-text.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vdurmont</groupId>
+            <artifactId>emoji-java</artifactId>
+            <version>${emoji-java.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ahocorasick</groupId>
+            <artifactId>ahocorasick</artifactId>
+            <version>${ahocorasick.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>${validation-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.el</groupId>
+            <artifactId>javax.el-api</artifactId>
+            <version>${javax.el-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>javax.el</artifactId>
+            <version>${javax.el.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>java-strings-3</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <compilerArgument>-parameters</compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <commons-codec.version>1.10</commons-codec.version>
+        <passay.version>1.3.1</passay.version>
+        <!-- testing -->
+        <assertj.version>3.6.1</assertj.version>
+        <emoji-java.version>4.0.0</emoji-java.version>
+        <ahocorasick.version>0.4.0</ahocorasick.version>
+        <icu4j.version>61.1</icu4j.version>
+        <guava.version>28.0-jre</guava.version>
+        <commons-text.version>1.4</commons-text.version>
+        <validation-api.version>2.0.0.Final</validation-api.version>
+        <hibernate-validator.version>6.0.2.Final</hibernate-validator.version>
+        <javax.el-api.version>3.0.0</javax.el-api.version>
+        <javax.el.version>2.2.6</javax.el.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/java-strings-3/src/main/java/com/baeldung/string/README.md b/java-strings-3/src/main/java/com/baeldung/string/README.md
new file mode 100644
index 0000000000..e02980e93f
--- /dev/null
+++ b/java-strings-3/src/main/java/com/baeldung/string/README.md
@@ -0,0 +1,3 @@
+This file exists to ensure this empty directory is committed in Git.
+
+Please remove this file when this directory is populated.
\ No newline at end of file
diff --git a/java-strings-3/src/main/resources/.gitignore b/java-strings-3/src/main/resources/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/java-strings-3/src/main/resources/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file
diff --git a/java-strings-3/src/test/java/com/baeldung/string/equalsIgnoreCase/StringEqualsIgnoreCaseUnitTest.java b/java-strings-3/src/test/java/com/baeldung/string/equalsIgnoreCase/StringEqualsIgnoreCaseUnitTest.java
new file mode 100644
index 0000000000..5aab63db94
--- /dev/null
+++ b/java-strings-3/src/test/java/com/baeldung/string/equalsIgnoreCase/StringEqualsIgnoreCaseUnitTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.string.equalsIgnoreCase;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class StringEqualsIgnoreCaseUnitTest {
+    private String string1 = "equals ignore case";
+    private String string2 = "EQUALS IGNORE CASE";
+
+    @Test
+    public void givenEqualStringsWithDifferentCase_whenUsingEqualsIgnoreCase_ThenTheyAreEqual() {
+        assertThat(string1.equalsIgnoreCase(string2)).isTrue();
+    }
+
+    @Test
+    public void givenEqualStringsWithDifferentCase_whenUsingApacheCommonsEqualsIgnoreCase_ThenTheyAreEqual() {
+        assertThat(StringUtils.equalsIgnoreCase(string1, string2)).isTrue();
+    }
+
+    @Test
+    public void givenAStringAndNullValue_whenUsingApacheCommonsEqualsIgnoreCase_ThenTheyAreNotEqual() {
+        assertThat(StringUtils.equalsIgnoreCase(string1, null)).isFalse();
+    }
+}
diff --git a/java-strings-2/src/test/java/com/baeldung/string/todouble/StringToDoubleConversionUnitTest.java b/java-strings-3/src/test/java/com/baeldung/string/todouble/StringToDoubleConversionUnitTest.java
similarity index 97%
rename from java-strings-2/src/test/java/com/baeldung/string/todouble/StringToDoubleConversionUnitTest.java
rename to java-strings-3/src/test/java/com/baeldung/string/todouble/StringToDoubleConversionUnitTest.java
index 9abb7ac453..2c87af53f8 100644
--- a/java-strings-2/src/test/java/com/baeldung/string/todouble/StringToDoubleConversionUnitTest.java
+++ b/java-strings-3/src/test/java/com/baeldung/string/todouble/StringToDoubleConversionUnitTest.java
@@ -1,56 +1,56 @@
-package com.baeldung.string.todouble;
-
-import static org.junit.Assert.assertEquals;
-
-import java.text.DecimalFormat;
-import java.text.ParseException;
-
-import org.junit.Test;
-
-public class StringToDoubleConversionUnitTest {
-
-    @Test
-    public void givenValidString_WhenParseDouble_ThenResultIsPrimitiveDouble() {
-        assertEquals(1.23, Double.parseDouble("1.23"), 0.000001);
-    }
-    
-    @Test(expected = NullPointerException.class)
-    public void givenNullString_WhenParseDouble_ThenNullPointerExceptionIsThrown() {
-        Double.parseDouble(null);
-    }
-    
-    @Test(expected = NumberFormatException.class)
-    public void givenInalidString_WhenParseDouble_ThenNumberFormatExceptionIsThrown() {
-        Double.parseDouble("&");
-    }
-    
-    @Test
-    public void givenValidString_WhenValueOf_ThenResultIsPrimitiveDouble() {
-        assertEquals(1.23, Double.valueOf("1.23"), 0.000001);
-    }
-    
-    @Test(expected = NullPointerException.class)
-    public void givenNullString_WhenValueOf_ThenNullPointerExceptionIsThrown() {
-        Double.valueOf(null);
-    }
-    
-    @Test(expected = NumberFormatException.class)
-    public void givenInalidString_WhenValueOf_ThenNumberFormatExceptionIsThrown() {
-        Double.valueOf("&");
-    }
-    
-    @Test
-    public void givenValidString_WhenDecimalFormat_ThenResultIsValidDouble() throws ParseException {
-        assertEquals(1.23, new DecimalFormat("#").parse("1.23").doubleValue(), 0.000001);
-    }
-    
-    @Test(expected = NullPointerException.class)
-    public void givenNullString_WhenDecimalFormat_ThenNullPointerExceptionIsThrown() throws ParseException {
-        new DecimalFormat("#").parse(null);
-    }
-    
-    @Test(expected = ParseException.class)
-    public void givenInvalidString_WhenDecimalFormat_ThenParseExceptionIsThrown() throws ParseException {
-        new DecimalFormat("#").parse("&");
-    }
-}
+package com.baeldung.string.todouble;
+
+import static org.junit.Assert.assertEquals;
+
+import java.text.DecimalFormat;
+import java.text.ParseException;
+
+import org.junit.Test;
+
+public class StringToDoubleConversionUnitTest {
+
+    @Test
+    public void givenValidString_WhenParseDouble_ThenResultIsPrimitiveDouble() {
+        assertEquals(1.23, Double.parseDouble("1.23"), 0.000001);
+    }
+    
+    @Test(expected = NullPointerException.class)
+    public void givenNullString_WhenParseDouble_ThenNullPointerExceptionIsThrown() {
+        Double.parseDouble(null);
+    }
+    
+    @Test(expected = NumberFormatException.class)
+    public void givenInalidString_WhenParseDouble_ThenNumberFormatExceptionIsThrown() {
+        Double.parseDouble("&");
+    }
+    
+    @Test
+    public void givenValidString_WhenValueOf_ThenResultIsPrimitiveDouble() {
+        assertEquals(1.23, Double.valueOf("1.23"), 0.000001);
+    }
+    
+    @Test(expected = NullPointerException.class)
+    public void givenNullString_WhenValueOf_ThenNullPointerExceptionIsThrown() {
+        Double.valueOf(null);
+    }
+    
+    @Test(expected = NumberFormatException.class)
+    public void givenInalidString_WhenValueOf_ThenNumberFormatExceptionIsThrown() {
+        Double.valueOf("&");
+    }
+    
+    @Test
+    public void givenValidString_WhenDecimalFormat_ThenResultIsValidDouble() throws ParseException {
+        assertEquals(1.23, new DecimalFormat("#").parse("1.23").doubleValue(), 0.000001);
+    }
+    
+    @Test(expected = NullPointerException.class)
+    public void givenNullString_WhenDecimalFormat_ThenNullPointerExceptionIsThrown() throws ParseException {
+        new DecimalFormat("#").parse(null);
+    }
+    
+    @Test(expected = ParseException.class)
+    public void givenInvalidString_WhenDecimalFormat_ThenParseExceptionIsThrown() throws ParseException {
+        new DecimalFormat("#").parse("&");
+    }
+}
diff --git a/java-strings-3/src/test/resources/.gitignore b/java-strings-3/src/test/resources/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/java-strings-3/src/test/resources/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file
diff --git a/java-strings-ops/README.md b/java-strings-ops/README.md
new file mode 100644
index 0000000000..d909f171a7
--- /dev/null
+++ b/java-strings-ops/README.md
@@ -0,0 +1,22 @@
+=========
+
+## Java Strings Cookbooks and Examples
+
+### Relevant Articles:
+- [Convert char to String in Java](http://www.baeldung.com/java-convert-char-to-string)
+- [Convert String to int or Integer in Java](http://www.baeldung.com/java-convert-string-to-int-or-integer)
+- [Java String Conversions](https://www.baeldung.com/java-string-conversions)
+- [Check if a String is a Palindrome](http://www.baeldung.com/java-palindrome)
+- [Comparing Strings in Java](http://www.baeldung.com/java-compare-strings)
+- [Check If a String Is Numeric in Java](http://www.baeldung.com/java-check-string-number)
+- [Get Substring from String in Java](https://www.baeldung.com/java-substring)
+- [How to Remove the Last Character of a String?](http://www.baeldung.com/java-remove-last-character-of-string)
+- [Add a Character to a String at a Given Position](https://www.baeldung.com/java-add-character-to-string)
+- [Count Occurrences of a Char in a String](http://www.baeldung.com/java-count-chars)
+- [Guide to Java String Pool](http://www.baeldung.com/java-string-pool)
+- [Split a String in Java](http://www.baeldung.com/java-split-string)
+- [Common String Operations in Java](https://www.baeldung.com/java-string-operations)
+- [Convert String to Byte Array and Reverse in Java](https://www.baeldung.com/java-string-to-byte-array)
+- [Java toString() Method](https://www.baeldung.com/java-tostring)
+- [CharSequence vs. String in Java](http://www.baeldung.com/java-char-sequence-string)
+- [StringBuilder and StringBuffer in Java](http://www.baeldung.com/java-string-builder-string-buffer)
\ No newline at end of file
diff --git a/java-strings-ops/pom.xml b/java-strings-ops/pom.xml
new file mode 100644
index 0000000000..b6a7ea2728
--- /dev/null
+++ b/java-strings-ops/pom.xml
@@ -0,0 +1,99 @@
+<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>
+    <groupId>com.baeldung</groupId>
+    <artifactId>java-strings-ops</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>java-strings-ops</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </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>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter-api.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>${org.hamcrest.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>java-strings-ops</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <compilerArgument>-parameters</compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- util -->
+        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <!-- testing -->
+        <assertj.version>3.6.1</assertj.version>
+        <guava.version>27.0.1-jre</guava.version>
+		<junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
+    </properties>
+
+</project>
diff --git a/java-strings/src/main/java/com/baeldung/datetime/UseLocalDateTime.java b/java-strings-ops/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
rename to java-strings-ops/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
diff --git a/java-strings/src/main/java/com/baeldung/string/AppendCharAtPositionX.java b/java-strings-ops/src/main/java/com/baeldung/string/AppendCharAtPositionX.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/AppendCharAtPositionX.java
rename to java-strings-ops/src/main/java/com/baeldung/string/AppendCharAtPositionX.java
diff --git a/java-strings/src/main/java/com/baeldung/string/Palindrome.java b/java-strings-ops/src/main/java/com/baeldung/string/Palindrome.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/Palindrome.java
rename to java-strings-ops/src/main/java/com/baeldung/string/Palindrome.java
diff --git a/java-strings/src/main/java/com/baeldung/string/StringHelper.java b/java-strings-ops/src/main/java/com/baeldung/string/StringHelper.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/StringHelper.java
rename to java-strings-ops/src/main/java/com/baeldung/string/StringHelper.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/Customer.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/Customer.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/Customer.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/Customer.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/CustomerArrayToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerArrayToString.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/CustomerArrayToString.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerArrayToString.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/CustomerComplexObjectToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerComplexObjectToString.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/CustomerComplexObjectToString.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerComplexObjectToString.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/CustomerPrimitiveToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerPrimitiveToString.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/CustomerPrimitiveToString.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerPrimitiveToString.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/CustomerReflectionToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerReflectionToString.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/CustomerReflectionToString.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerReflectionToString.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/CustomerWrapperCollectionToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerWrapperCollectionToString.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/CustomerWrapperCollectionToString.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerWrapperCollectionToString.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/Order.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/Order.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/Order.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/Order.java
diff --git a/spring-amqp-simple/src/main/resources/logback.xml b/java-strings-ops/src/main/resources/logback.xml
similarity index 100%
rename from spring-amqp-simple/src/main/resources/logback.xml
rename to java-strings-ops/src/main/resources/logback.xml
diff --git a/java-strings/src/test/java/com/baeldung/CharToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/CharToStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/CharToStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/CharToStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/java/conversion/README.md b/java-strings-ops/src/test/java/com/baeldung/java/conversion/README.md
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/java/conversion/README.md
rename to java-strings-ops/src/test/java/com/baeldung/java/conversion/README.md
diff --git a/java-strings/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/AppendCharAtPositionXUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/AppendCharAtPositionXUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/AppendCharAtPositionXUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/AppendCharAtPositionXUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/PalindromeUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/PalindromeUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/PalindromeUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/PalindromeUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/SplitUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/SplitUnitTest.java
diff --git a/java-strings/src/main/java/com/baeldung/string/StringBufferStringBuilder.java b/java-strings-ops/src/test/java/com/baeldung/string/StringBufferStringBuilder.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/StringBufferStringBuilder.java
rename to java-strings-ops/src/test/java/com/baeldung/string/StringBufferStringBuilder.java
diff --git a/java-strings/src/test/java/com/baeldung/string/StringComparisonUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/StringComparisonUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/StringComparisonUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/StringComparisonUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/StringHelperUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/StringHelperUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/StringHelperUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/StringHelperUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/SubstringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/SubstringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/SubstringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/SubstringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/conversion/ByteArrayToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/conversion/ByteArrayToStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/conversion/ByteArrayToStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/conversion/ByteArrayToStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/conversion/StringToByteArrayUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/conversion/StringToByteArrayUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/conversion/StringToByteArrayUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/conversion/StringToByteArrayUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java
diff --git a/java-strings-ops/src/test/resources/.gitignore b/java-strings-ops/src/test/resources/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/java-strings-ops/src/test/resources/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file
diff --git a/java-strings/README.md b/java-strings/README.md
index b342f53918..ef536b4099 100644
--- a/java-strings/README.md
+++ b/java-strings/README.md
@@ -6,51 +6,18 @@
 - [String Operations with Java Streams](http://www.baeldung.com/java-stream-operations-on-strings)
 - [Converting String to Stream of chars](http://www.baeldung.com/java-string-to-stream)
 - [Java 8 StringJoiner](http://www.baeldung.com/java-string-joiner)
-- [Image to Base64 String Conversion](http://www.baeldung.com/java-base64-image-string)
-- [Java – Generate Random String](http://www.baeldung.com/java-random-string)
-- [Convert char to String in Java](http://www.baeldung.com/java-convert-char-to-string)
-- [Convert String to int or Integer in Java](http://www.baeldung.com/java-convert-string-to-int-or-integer)
-- [Java String Conversions](https://www.baeldung.com/java-string-conversions)
 - [Converting Strings to Enums in Java](http://www.baeldung.com/java-string-to-enum)
 - [Quick Guide to the Java StringTokenizer](http://www.baeldung.com/java-stringtokenizer)
-- [Count Occurrences of a Char in a String](http://www.baeldung.com/java-count-chars)
-- [Split a String in Java](http://www.baeldung.com/java-split-string)
-- [How to Remove the Last Character of a String?](http://www.baeldung.com/java-remove-last-character-of-string)
-- [CharSequence vs. String in Java](http://www.baeldung.com/java-char-sequence-string)
-- [StringBuilder and StringBuffer in Java](http://www.baeldung.com/java-string-builder-string-buffer)
-- [Guide to Java String Pool](http://www.baeldung.com/java-string-pool)
-- [Check if a String is a Palindrome](http://www.baeldung.com/java-palindrome)
-- [Comparing Strings in Java](http://www.baeldung.com/java-compare-strings)
-- [Check If a String Is Numeric in Java](http://www.baeldung.com/java-check-string-number)
 - [Use char[] Array Over a String for Manipulating Passwords in Java?](http://www.baeldung.com/java-storing-passwords)
 - [Convert a String to Title Case](http://www.baeldung.com/java-string-title-case)
 - [Compact Strings in Java 9](http://www.baeldung.com/java-9-compact-string)
 - [Java Check a String for Lowercase/Uppercase Letter, Special Character and Digit](https://www.baeldung.com/java-lowercase-uppercase-special-character-digit-regex)
 - [Convert java.util.Date to String](https://www.baeldung.com/java-util-date-to-string)
-- [Get Substring from String in Java](https://www.baeldung.com/java-substring)
 - [Converting a Stack Trace to a String in Java](https://www.baeldung.com/java-stacktrace-to-string)
 - [Sorting a String Alphabetically in Java](https://www.baeldung.com/java-sort-string-alphabetically)
-- [Remove Emojis from a Java String](https://www.baeldung.com/java-string-remove-emojis)
 - [String Not Empty Test Assertions in Java](https://www.baeldung.com/java-assert-string-not-empty)
 - [String Performance Hints](https://www.baeldung.com/java-string-performance)
 - [Using indexOf to Find All Occurrences of a Word in a String](https://www.baeldung.com/java-indexOf-find-string-occurrences)
-- [Convert String to Byte Array and Reverse in Java](https://www.baeldung.com/java-string-to-byte-array)
-- [Java Base64 Encoding and Decoding](https://www.baeldung.com/java-base64-encode-and-decode)
-- [Generate a Secure Random Password in Java](https://www.baeldung.com/java-generate-secure-password)
-- [Removing Repeated Characters from a String](https://www.baeldung.com/java-remove-repeated-char)
-- [Join Array of Primitives with Separator in Java](https://www.baeldung.com/java-join-primitive-array)
-- [Convert String to Byte Array and Reverse in Java](https://www.baeldung.com/java-string-to-byte-array)
-- [Pad a String with Zeros or Spaces in Java](https://www.baeldung.com/java-pad-string)
 - [Adding a Newline Character to a String in Java](https://www.baeldung.com/java-string-newline)
 - [Remove or Replace part of a String in Java](https://www.baeldung.com/java-remove-replace-string-part)
-- [Replace a Character at a Specific Index in a String in Java](https://www.baeldung.com/java-replace-character-at-index)
-- [Convert a Comma Separated String to a List in Java](https://www.baeldung.com/java-string-with-separator-to-list)
-- [Guide to java.util.Formatter](http://www.baeldung.com/java-string-formatter)
-- [Add a Character to a String at a Given Position](https://www.baeldung.com/java-add-character-to-string)
-- [Remove Leading and Trailing Characters from a String](https://www.baeldung.com/java-remove-trailing-characters)
-- [Concatenating Strings In Java](https://www.baeldung.com/java-strings-concatenation)
-- [Java toString() Method](https://www.baeldung.com/java-tostring)
-- [Java String Interview Questions and Answers](https://www.baeldung.com/java-string-interview-questions)
-- [Check if a String is a Pangram in Java](https://www.baeldung.com/java-string-pangram)
-- [Check If a String Contains Multiple Keywords](https://www.baeldung.com/string-contains-multiple-words)
-- [Common String Operations in Java](https://www.baeldung.com/java-string-operations)
+- [Replace a Character at a Specific Index in a String in Java](https://www.baeldung.com/java-replace-character-at-index)
\ No newline at end of file
diff --git a/java-strings/pom.xml b/java-strings/pom.xml
index 7f66b95355..42a57bfb42 100755
--- a/java-strings/pom.xml
+++ b/java-strings/pom.xml
@@ -62,12 +62,6 @@
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
-        
-        <dependency>
-            <groupId>com.vdurmont</groupId>
-            <artifactId>emoji-java</artifactId>
-            <version>${emoji-java.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -83,24 +77,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- Added for password generation -->
-        <dependency>
-            <groupId>org.passay</groupId>
-            <artifactId>passay</artifactId>
-            <version>${passay.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>${commons-text.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.ahocorasick</groupId>
-            <artifactId>ahocorasick</artifactId>
-            <version>${ahocorasick.version}</version>
-        </dependency>
-
     </dependencies>
 
     <build>
@@ -134,11 +110,8 @@
         <assertj.version>3.6.1</assertj.version>
         <icu4j.version>61.1</icu4j.version>
         <guava.version>27.0.1-jre</guava.version>
-		<emoji-java.version>4.0.0</emoji-java.version>
 		<junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
-		<passay.version>1.3.1</passay.version>
 		<commons-text.version>1.4</commons-text.version>
-		<ahocorasick.version>0.4.0</ahocorasick.version>
     </properties>
 
 </project>
diff --git a/javax-servlets/src/main/java/com/baeldung/servlets/MyHttpServlet.java b/javax-servlets/src/main/java/com/baeldung/servlets/MyHttpServlet.java
new file mode 100644
index 0000000000..b4d80db0ab
--- /dev/null
+++ b/javax-servlets/src/main/java/com/baeldung/servlets/MyHttpServlet.java
@@ -0,0 +1,57 @@
+package com.baeldung.servlets;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(name = "MyHttpServlet", urlPatterns = "/servlet-mapping")
+public class MyHttpServlet extends HttpServlet {
+
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        PrintWriter writer = response.getWriter();
+        writer.println(request.getParameter("function"));
+        if ("getContextPath".equals(request.getParameter("function"))) {
+            writer.println(request.getContextPath());
+        } else if ("getLocalAddr".equals(request.getParameter("function"))) {
+            writer.println(request.getLocalAddr());
+        } else if ("getLocalName".equals(request.getParameter("function"))) {
+            writer.println(request.getLocalName());
+        } else if ("getLocalAPort".equals(request.getParameter("function"))) {
+            writer.println(request.getLocalPort());
+        } else if ("getMethod".equals(request.getParameter("function"))) {
+            writer.println(request.getMethod());
+        } else if ("getParameterNames".equals(request.getParameter("function"))) {
+            writer.println(request.getParameterNames());
+        } else if ("getPathInfo".equals(request.getParameter("function"))) {
+            writer.println(request.getPathInfo());
+        } else if ("getProtocol".equals(request.getParameter("function"))) {
+            writer.println(request.getProtocol());
+        } else if ("getQueryString".equals(request.getParameter("function"))) {
+            writer.println(request.getQueryString());
+        } else if ("getRequestedSessionId".equals(request.getParameter("function"))) {
+            writer.println(request.getRequestedSessionId());
+        } else if ("getRequestURI".equals(request.getParameter("function"))) {
+            writer.println(request.getRequestURI());
+        } else if ("getRequestURL".equals(request.getParameter("function"))) {
+            writer.println(request.getRequestURL());
+        } else if ("getScheme".equals(request.getParameter("function"))) {
+            writer.println(request.getScheme());
+        } else if ("getServerName".equals(request.getParameter("function"))) {
+            writer.println(request.getServerName());
+        } else if ("getServerPort".equals(request.getParameter("function"))) {
+            writer.println(request.getServerPort());
+        } else if ("getServletPath".equals(request.getParameter("function"))) {
+            writer.println(request.getServletPath());
+        } else {
+            writer.println("INVALID FUNCTION");
+        }
+        writer.flush();
+    }
+    
+}
+
+
diff --git a/jenkins/README.md b/jenkins/README.md
index da60e556df..6b28b61277 100644
--- a/jenkins/README.md
+++ b/jenkins/README.md
@@ -1,3 +1,2 @@
-## Relevant articles:
 
-- [Writing a Jenkins Plugin](http://www.baeldung.com/jenkins-custom-plugin)
+This is an aggregator modules for Jenkins-related modules.
diff --git a/jenkins/hello-world/README.md b/jenkins/hello-world/README.md
new file mode 100644
index 0000000000..da60e556df
--- /dev/null
+++ b/jenkins/hello-world/README.md
@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Writing a Jenkins Plugin](http://www.baeldung.com/jenkins-custom-plugin)
diff --git a/jhipster-5/README.md b/jhipster-5/README.md
index 0537f5b1a5..2731281b3e 100644
--- a/jhipster-5/README.md
+++ b/jhipster-5/README.md
@@ -1,3 +1,2 @@
-## Relevant articles:
 
-- [Creating New APIs and Views in JHipster](https://www.baeldung.com/jhipster-new-apis-and-views)
+This is an aggregator module for JHipster 5 modules.
diff --git a/jhipster-5/bookstore-monolith/README.md b/jhipster-5/bookstore-monolith/README.md
index 1387b82163..0537f5b1a5 100644
--- a/jhipster-5/bookstore-monolith/README.md
+++ b/jhipster-5/bookstore-monolith/README.md
@@ -1,179 +1,3 @@
-# Bookstore
+## Relevant articles:
 
-This application was generated using JHipster 5.8.2, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v5.8.2](https://www.jhipster.tech/documentation-archive/v5.8.2).
-
-## Development
-
-Before you can build this project, you must install and configure the following dependencies on your machine:
-
-1.  [Node.js][]: We use Node to run a development web server and build the project.
-    Depending on your system, you can install Node either from source or as a pre-packaged bundle.
-
-After installing Node, you should be able to run the following command to install development tools.
-You will only need to run this command when dependencies change in [package.json](package.json).
-
-    npm install
-
-We use npm scripts and [Webpack][] as our build system.
-
-Run the following commands in two separate terminals to create a blissful development experience where your browser
-auto-refreshes when files change on your hard drive.
-
-    ./mvnw
-    npm start
-
-Npm is also used to manage CSS and JavaScript dependencies used in this application. You can upgrade dependencies by
-specifying a newer version in [package.json](package.json). You can also run `npm update` and `npm install` to manage dependencies.
-Add the `help` flag on any command to see how you can use it. For example, `npm help update`.
-
-The `npm run` command will list all of the scripts available to run for this project.
-
-### Service workers
-
-Service workers are commented by default, to enable them please uncomment the following code.
-
--   The service worker registering script in index.html
-
-```html
-<script>
-    if ('serviceWorker' in navigator) {
-        navigator.serviceWorker.register('./service-worker.js').then(function() {
-            console.log('Service Worker Registered');
-        });
-    }
-</script>
-```
-
-Note: workbox creates the respective service worker and dynamically generate the `service-worker.js`
-
-### Managing dependencies
-
-For example, to add [Leaflet][] library as a runtime dependency of your application, you would run following command:
-
-    npm install --save --save-exact leaflet
-
-To benefit from TypeScript type definitions from [DefinitelyTyped][] repository in development, you would run following command:
-
-    npm install --save-dev --save-exact @types/leaflet
-
-Then you would import the JS and CSS files specified in library's installation instructions so that [Webpack][] knows about them:
-Edit [src/main/webapp/app/vendor.ts](src/main/webapp/app/vendor.ts) file:
-
-```
-import 'leaflet/dist/leaflet.js';
-```
-
-Edit [src/main/webapp/content/css/vendor.css](src/main/webapp/content/css/vendor.css) file:
-
-```
-@import '~leaflet/dist/leaflet.css';
-```
-
-Note: there are still few other things remaining to do for Leaflet that we won't detail here.
-
-For further instructions on how to develop with JHipster, have a look at [Using JHipster in development][].
-
-### Using angular-cli
-
-You can also use [Angular CLI][] to generate some custom client code.
-
-For example, the following command:
-
-    ng generate component my-component
-
-will generate few files:
-
-    create src/main/webapp/app/my-component/my-component.component.html
-    create src/main/webapp/app/my-component/my-component.component.ts
-    update src/main/webapp/app/app.module.ts
-
-## Building for production
-
-To optimize the Bookstore application for production, run:
-
-    ./mvnw -Pprod clean package
-
-This will concatenate and minify the client CSS and JavaScript files. It will also modify `index.html` so it references these new files.
-To ensure everything worked, run:
-
-    java -jar target/*.war
-
-Then navigate to [http://localhost:8080](http://localhost:8080) in your browser.
-
-Refer to [Using JHipster in production][] for more details.
-
-## Testing
-
-To launch your application's tests, run:
-
-    ./mvnw clean test
-
-### Client tests
-
-Unit tests are run by [Jest][] and written with [Jasmine][]. They're located in [src/test/javascript/](src/test/javascript/) and can be run with:
-
-    npm test
-
-For more information, refer to the [Running tests page][].
-
-### Code quality
-
-Sonar is used to analyse code quality. You can start a local Sonar server (accessible on http://localhost:9001) with:
-
-```
-docker-compose -f src/main/docker/sonar.yml up -d
-```
-
-Then, run a Sonar analysis:
-
-```
-./mvnw -Pprod clean test sonar:sonar
-```
-
-For more information, refer to the [Code quality page][].
-
-## Using Docker to simplify development (optional)
-
-You can use Docker to improve your JHipster development experience. A number of docker-compose configuration are available in the [src/main/docker](src/main/docker) folder to launch required third party services.
-
-For example, to start a mysql database in a docker container, run:
-
-    docker-compose -f src/main/docker/mysql.yml up -d
-
-To stop it and remove the container, run:
-
-    docker-compose -f src/main/docker/mysql.yml down
-
-You can also fully dockerize your application and all the services that it depends on.
-To achieve this, first build a docker image of your app by running:
-
-    ./mvnw package -Pprod verify jib:dockerBuild
-
-Then run:
-
-    docker-compose -f src/main/docker/app.yml up -d
-
-For more information refer to [Using Docker and Docker-Compose][], this page also contains information on the docker-compose sub-generator (`jhipster docker-compose`), which is able to generate docker configurations for one or several JHipster applications.
-
-## Continuous Integration (optional)
-
-To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.
-
-[jhipster homepage and latest documentation]: https://www.jhipster.tech
-[jhipster 5.8.2 archive]: https://www.jhipster.tech/documentation-archive/v5.8.2
-[using jhipster in development]: https://www.jhipster.tech/documentation-archive/v5.8.2/development/
-[using docker and docker-compose]: https://www.jhipster.tech/documentation-archive/v5.8.2/docker-compose
-[using jhipster in production]: https://www.jhipster.tech/documentation-archive/v5.8.2/production/
-[running tests page]: https://www.jhipster.tech/documentation-archive/v5.8.2/running-tests/
-[code quality page]: https://www.jhipster.tech/documentation-archive/v5.8.2/code-quality/
-[setting up continuous integration]: https://www.jhipster.tech/documentation-archive/v5.8.2/setting-up-ci/
-[node.js]: https://nodejs.org/
-[yarn]: https://yarnpkg.org/
-[webpack]: https://webpack.github.io/
-[angular cli]: https://cli.angular.io/
-[browsersync]: http://www.browsersync.io/
-[jest]: https://facebook.github.io/jest/
-[jasmine]: http://jasmine.github.io/2.0/introduction.html
-[protractor]: https://angular.github.io/protractor/
-[leaflet]: http://leafletjs.com/
-[definitelytyped]: http://definitelytyped.org/
+- [Creating New APIs and Views in JHipster](https://www.baeldung.com/jhipster-new-apis-and-views)
diff --git a/libraries-2/README.md b/libraries-2/README.md
index 1b042ac3c5..400aa475d1 100644
--- a/libraries-2/README.md
+++ b/libraries-2/README.md
@@ -1,5 +1,4 @@
-
-### Relevant Articles: 
+## Relevant Articles: 
 
 - [A Guide to jBPM with Java](https://www.baeldung.com/jbpm-java)
 - [Guide to Classgraph Library](https://www.baeldung.com/classgraph)
@@ -8,3 +7,7 @@
 - [Templating with Handlebars](https://www.baeldung.com/handlebars)
 - [A Guide to Crawler4j](https://www.baeldung.com/crawler4j)
 - [Decode an OkHttp JSON Response](https://www.baeldung.com/okhttp-json-response)
+- [Key Value Store with Chronicle Map](https://www.baeldung.com/java-chronicle-map)
+- [Matrix Multiplication in Java](https://www.baeldung.com/java-matrix-multiplication)
+- [Guide to MapDB](https://www.baeldung.com/mapdb)
+- [A Guide to Apache Mesos](https://www.baeldung.com/apache-mesos)
diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml
index ff73888b69..83adf1e199 100644
--- a/libraries-2/pom.xml
+++ b/libraries-2/pom.xml
@@ -59,26 +59,6 @@
             <artifactId>picocli</artifactId>
             <version>${picocli.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.ejml</groupId>
-            <artifactId>ejml-all</artifactId>
-            <version>${ejml.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nd4j</groupId>
-            <artifactId>nd4j-native</artifactId>
-            <version>${nd4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.la4j</groupId>
-            <artifactId>la4j</artifactId>
-            <version>${la4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>colt</groupId>
-            <artifactId>colt</artifactId>
-            <version>${colt.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -127,17 +107,6 @@
             <artifactId>handlebars</artifactId>
             <version>${handlebars.version}</version>
         </dependency>
-        <!-- Benchmarking -->
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.mesos</groupId>
             <artifactId>mesos</artifactId>
@@ -154,11 +123,6 @@
         <chronicle.map.version>3.17.2</chronicle.map.version>
         <crawler4j.version>4.4.0</crawler4j.version>
         <spring-boot-starter.version>2.1.4.RELEASE</spring-boot-starter.version>
-        <ejml.version>0.38</ejml.version>
-        <nd4j.version>1.0.0-beta4</nd4j.version>
-        <colt.version>1.2.0</colt.version>
-        <la4j.version>0.6.0</la4j.version>
-        <jmh.version>1.19</jmh.version>
         <mesos.library.version>0.28.3</mesos.library.version>
         <parallel-collectors.version>1.1.0</parallel-collectors.version>
         <okhttp.version>3.14.2</okhttp.version>
diff --git a/libraries-data-2/README.md b/libraries-data-2/README.md
new file mode 100644
index 0000000000..8101138c0e
--- /dev/null
+++ b/libraries-data-2/README.md
@@ -0,0 +1,11 @@
+### Relevant articles
+- [Introduction to Apache Flink with Java](http://www.baeldung.com/apache-flink)
+- [Guide to the HyperLogLog Algorithm](http://www.baeldung.com/java-hyperloglog)
+- [Introduction to Conflict-Free Replicated Data Types](http://www.baeldung.com/java-conflict-free-replicated-data-types)
+- [Introduction to javax.measure](http://www.baeldung.com/javax-measure)
+- [Introduction To Docx4J](http://www.baeldung.com/docx4j)
+- [Interact with Google Sheets from Java](http://www.baeldung.com/google-sheets-java-client)
+- [Introduction To OpenCSV](http://www.baeldung.com/opencsv)
+- [Introduction to Smooks](http://www.baeldung.com/smooks)
+- [A Guide to Infinispan in Java](http://www.baeldung.com/infinispan)
+
diff --git a/libraries-data-2/log4j.properties b/libraries-data-2/log4j.properties
new file mode 100644
index 0000000000..2173c5d96f
--- /dev/null
+++ b/libraries-data-2/log4j.properties
@@ -0,0 +1 @@
+log4j.rootLogger=INFO, stdout
diff --git a/libraries-data-2/pom.xml b/libraries-data-2/pom.xml
new file mode 100644
index 0000000000..87c620f438
--- /dev/null
+++ b/libraries-data-2/pom.xml
@@ -0,0 +1,145 @@
+<?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>libraries-data-2</artifactId>
+    <name>libraries-data-2</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-kafka-0.11_2.11</artifactId>
+            <version>${flink.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-streaming-java_2.11</artifactId>
+            <version>${flink.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-core</artifactId>
+            <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-java</artifactId>
+            <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-test-utils_2.11</artifactId>
+            <version>${flink.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.agkn</groupId>
+            <artifactId>hll</artifactId>
+            <version>${hll.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.netopyr.wurmloch</groupId>
+            <artifactId>wurmloch-crdt</artifactId>
+            <version>${crdt.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>tec.units</groupId>
+            <artifactId>unit-ri</artifactId>
+            <version>${unit-ri.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.docx4j</groupId>
+            <artifactId>docx4j</artifactId>
+            <version>${docx4j.version}</version>
+        </dependency>
+        <!-- google api -->
+        <dependency>
+            <groupId>com.google.api-client</groupId>
+            <artifactId>google-api-client</artifactId>
+            <version>${google-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.oauth-client</groupId>
+            <artifactId>google-oauth-client-jetty</artifactId>
+            <version>${google-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.apis</groupId>
+            <artifactId>google-api-services-sheets</artifactId>
+            <version>${google-sheets.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.opencsv/opencsv -->
+        <dependency>
+            <groupId>com.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
+            <version>${opencsv.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.milyn</groupId>
+            <artifactId>milyn-smooks-all</artifactId>
+            <version>${smooks.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-core</artifactId>
+            <version>${infinispan.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <properties>
+        <flink.version>1.5.0</flink.version>
+        <hll.version>1.6.0</hll.version>
+        <crdt.version>0.1.0</crdt.version>
+        <unit-ri.version>1.0.3</unit-ri.version>
+        <docx4j.version>3.3.5</docx4j.version>
+        <jaxb-api.version>2.1</jaxb-api.version>
+        <google-api.version>1.23.0</google-api.version>
+        <opencsv.version>4.1</opencsv.version>
+        <smooks.version>1.7.0</smooks.version>
+        <infinispan.version>9.1.5.Final</infinispan.version>
+        <google-sheets.version>v4-rev493-1.21.0</google-sheets.version>
+        <jackson.version>2.9.8</jackson.version>
+        <spring.version>4.3.8.RELEASE</spring.version>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/libraries/src/main/java/com/baeldung/docx/Docx4jExample.java b/libraries-data-2/src/main/java/com/baeldung/docx/Docx4jExample.java
similarity index 97%
rename from libraries/src/main/java/com/baeldung/docx/Docx4jExample.java
rename to libraries-data-2/src/main/java/com/baeldung/docx/Docx4jExample.java
index 97fbf4adc7..6fe29d26e3 100644
--- a/libraries/src/main/java/com/baeldung/docx/Docx4jExample.java
+++ b/libraries-data-2/src/main/java/com/baeldung/docx/Docx4jExample.java
@@ -1,105 +1,105 @@
-package com.baeldung.docx;
-
-import org.docx4j.dml.wordprocessingDrawing.Inline;
-import org.docx4j.jaxb.Context;
-import org.docx4j.model.table.TblFactory;
-import org.docx4j.openpackaging.exceptions.Docx4JException;
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPartAbstractImage;
-import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
-import org.docx4j.wml.BooleanDefaultTrue;
-import org.docx4j.wml.Color;
-import org.docx4j.wml.Drawing;
-import org.docx4j.wml.ObjectFactory;
-import org.docx4j.wml.P;
-import org.docx4j.wml.R;
-import org.docx4j.wml.RPr;
-import org.docx4j.wml.Tbl;
-import org.docx4j.wml.Tc;
-import org.docx4j.wml.Text;
-import org.docx4j.wml.Tr;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import java.io.File;
-import java.nio.file.Files;
-import java.util.List;
-
-class Docx4jExample {
-
-    void createDocumentPackage(String outputPath, String imagePath) throws Exception {
-        WordprocessingMLPackage wordPackage = WordprocessingMLPackage.createPackage();
-        MainDocumentPart mainDocumentPart = wordPackage.getMainDocumentPart();
-        mainDocumentPart.addStyledParagraphOfText("Title", "Hello World!");
-        mainDocumentPart.addParagraphOfText("Welcome To Baeldung!");
-
-        ObjectFactory factory = Context.getWmlObjectFactory();
-        P p = factory.createP();
-        R r = factory.createR();
-        Text t = factory.createText();
-        t.setValue("Welcome To Baeldung");
-        r.getContent().add(t);
-        p.getContent().add(r);
-        RPr rpr = factory.createRPr();
-        BooleanDefaultTrue b = new BooleanDefaultTrue();
-        rpr.setB(b);
-        rpr.setI(b);
-        rpr.setCaps(b);
-        Color red = factory.createColor();
-        red.setVal("green");
-        rpr.setColor(red);
-        r.setRPr(rpr);
-        mainDocumentPart.getContent().add(p);
-
-        File image = new File(imagePath);
-        byte[] fileContent = Files.readAllBytes(image.toPath());
-        BinaryPartAbstractImage imagePart = BinaryPartAbstractImage.createImagePart(wordPackage, fileContent);
-        Inline inline = imagePart.createImageInline("Baeldung Image", "Alt Text", 1, 2, false);
-        P Imageparagraph = addImageToParagraph(inline);
-        mainDocumentPart.getContent().add(Imageparagraph);
-
-        int writableWidthTwips = wordPackage.getDocumentModel().getSections().get(0).getPageDimensions().getWritableWidthTwips();
-        int columnNumber = 3;
-        Tbl tbl = TblFactory.createTable(3, 3, writableWidthTwips / columnNumber);
-        List<Object> rows = tbl.getContent();
-        for (Object row : rows) {
-            Tr tr = (Tr) row;
-            List<Object> cells = tr.getContent();
-            for (Object cell : cells) {
-                Tc td = (Tc) cell;
-                td.getContent().add(p);
-            }
-        }
-
-        mainDocumentPart.getContent().add(tbl);
-        File exportFile = new File(outputPath);
-        wordPackage.save(exportFile);
-    }
-
-    boolean isTextExist(String testText) throws Docx4JException, JAXBException {
-        File doc = new File("helloWorld.docx");
-        WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(doc);
-        MainDocumentPart mainDocumentPart = wordMLPackage.getMainDocumentPart();
-        String textNodesXPath = "//w:t";
-        List<Object> paragraphs = mainDocumentPart.getJAXBNodesViaXPath(textNodesXPath, true);
-        for (Object obj : paragraphs) {
-            Text text = (Text) ((JAXBElement) obj).getValue();
-            String textValue = text.getValue();
-            if (textValue != null && textValue.contains(testText)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static P addImageToParagraph(Inline inline) {
-        ObjectFactory factory = new ObjectFactory();
-        P p = factory.createP();
-        R r = factory.createR();
-        p.getContent().add(r);
-        Drawing drawing = factory.createDrawing();
-        r.getContent().add(drawing);
-        drawing.getAnchorOrInline().add(inline);
-        return p;
-    }
-}
+package com.baeldung.docx;
+
+import org.docx4j.dml.wordprocessingDrawing.Inline;
+import org.docx4j.jaxb.Context;
+import org.docx4j.model.table.TblFactory;
+import org.docx4j.openpackaging.exceptions.Docx4JException;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPartAbstractImage;
+import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
+import org.docx4j.wml.BooleanDefaultTrue;
+import org.docx4j.wml.Color;
+import org.docx4j.wml.Drawing;
+import org.docx4j.wml.ObjectFactory;
+import org.docx4j.wml.P;
+import org.docx4j.wml.R;
+import org.docx4j.wml.RPr;
+import org.docx4j.wml.Tbl;
+import org.docx4j.wml.Tc;
+import org.docx4j.wml.Text;
+import org.docx4j.wml.Tr;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import java.io.File;
+import java.nio.file.Files;
+import java.util.List;
+
+class Docx4jExample {
+
+    void createDocumentPackage(String outputPath, String imagePath) throws Exception {
+        WordprocessingMLPackage wordPackage = WordprocessingMLPackage.createPackage();
+        MainDocumentPart mainDocumentPart = wordPackage.getMainDocumentPart();
+        mainDocumentPart.addStyledParagraphOfText("Title", "Hello World!");
+        mainDocumentPart.addParagraphOfText("Welcome To Baeldung!");
+
+        ObjectFactory factory = Context.getWmlObjectFactory();
+        P p = factory.createP();
+        R r = factory.createR();
+        Text t = factory.createText();
+        t.setValue("Welcome To Baeldung");
+        r.getContent().add(t);
+        p.getContent().add(r);
+        RPr rpr = factory.createRPr();
+        BooleanDefaultTrue b = new BooleanDefaultTrue();
+        rpr.setB(b);
+        rpr.setI(b);
+        rpr.setCaps(b);
+        Color red = factory.createColor();
+        red.setVal("green");
+        rpr.setColor(red);
+        r.setRPr(rpr);
+        mainDocumentPart.getContent().add(p);
+
+        File image = new File(imagePath);
+        byte[] fileContent = Files.readAllBytes(image.toPath());
+        BinaryPartAbstractImage imagePart = BinaryPartAbstractImage.createImagePart(wordPackage, fileContent);
+        Inline inline = imagePart.createImageInline("Baeldung Image", "Alt Text", 1, 2, false);
+        P Imageparagraph = addImageToParagraph(inline);
+        mainDocumentPart.getContent().add(Imageparagraph);
+
+        int writableWidthTwips = wordPackage.getDocumentModel().getSections().get(0).getPageDimensions().getWritableWidthTwips();
+        int columnNumber = 3;
+        Tbl tbl = TblFactory.createTable(3, 3, writableWidthTwips / columnNumber);
+        List<Object> rows = tbl.getContent();
+        for (Object row : rows) {
+            Tr tr = (Tr) row;
+            List<Object> cells = tr.getContent();
+            for (Object cell : cells) {
+                Tc td = (Tc) cell;
+                td.getContent().add(p);
+            }
+        }
+
+        mainDocumentPart.getContent().add(tbl);
+        File exportFile = new File(outputPath);
+        wordPackage.save(exportFile);
+    }
+
+    boolean isTextExist(String testText) throws Docx4JException, JAXBException {
+        File doc = new File("helloWorld.docx");
+        WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(doc);
+        MainDocumentPart mainDocumentPart = wordMLPackage.getMainDocumentPart();
+        String textNodesXPath = "//w:t";
+        List<Object> paragraphs = mainDocumentPart.getJAXBNodesViaXPath(textNodesXPath, true);
+        for (Object obj : paragraphs) {
+            Text text = (Text) ((JAXBElement) obj).getValue();
+            String textValue = text.getValue();
+            if (textValue != null && textValue.contains(testText)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static P addImageToParagraph(Inline inline) {
+        ObjectFactory factory = new ObjectFactory();
+        P p = factory.createP();
+        R r = factory.createR();
+        p.getContent().add(r);
+        Drawing drawing = factory.createDrawing();
+        r.getContent().add(drawing);
+        drawing.getAnchorOrInline().add(inline);
+        return p;
+    }
+}
diff --git a/libraries-data/src/main/java/com/baeldung/flink/FlinkDataPipeline.java b/libraries-data-2/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
similarity index 100%
rename from libraries-data/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
rename to libraries-data-2/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
diff --git a/libraries-data/src/main/java/com/baeldung/flink/LineSplitter.java b/libraries-data-2/src/main/java/com/baeldung/flink/LineSplitter.java
similarity index 100%
rename from libraries-data/src/main/java/com/baeldung/flink/LineSplitter.java
rename to libraries-data-2/src/main/java/com/baeldung/flink/LineSplitter.java
diff --git a/libraries-data/src/main/java/com/baeldung/flink/WordCount.java b/libraries-data-2/src/main/java/com/baeldung/flink/WordCount.java
similarity index 100%
rename from libraries-data/src/main/java/com/baeldung/flink/WordCount.java
rename to libraries-data-2/src/main/java/com/baeldung/flink/WordCount.java
diff --git a/libraries-data/src/main/java/com/baeldung/flink/connector/Consumers.java b/libraries-data-2/src/main/java/com/baeldung/flink/connector/Consumers.java
similarity index 100%
rename from libraries-data/src/main/java/com/baeldung/flink/connector/Consumers.java
rename to libraries-data-2/src/main/java/com/baeldung/flink/connector/Consumers.java
diff --git a/libraries-data/src/main/java/com/baeldung/flink/connector/Producers.java b/libraries-data-2/src/main/java/com/baeldung/flink/connector/Producers.java
similarity index 100%
rename from libraries-data/src/main/java/com/baeldung/flink/connector/Producers.java
rename to libraries-data-2/src/main/java/com/baeldung/flink/connector/Producers.java
diff --git a/libraries-data/src/main/java/com/baeldung/flink/model/Backup.java b/libraries-data-2/src/main/java/com/baeldung/flink/model/Backup.java
similarity index 100%
rename from libraries-data/src/main/java/com/baeldung/flink/model/Backup.java
rename to libraries-data-2/src/main/java/com/baeldung/flink/model/Backup.java
diff --git a/libraries-data/src/main/java/com/baeldung/flink/model/InputMessage.java b/libraries-data-2/src/main/java/com/baeldung/flink/model/InputMessage.java
similarity index 100%
rename from libraries-data/src/main/java/com/baeldung/flink/model/InputMessage.java
rename to libraries-data-2/src/main/java/com/baeldung/flink/model/InputMessage.java
diff --git a/libraries-data/src/main/java/com/baeldung/flink/operator/BackupAggregator.java b/libraries-data-2/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
similarity index 100%
rename from libraries-data/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
rename to libraries-data-2/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
diff --git a/libraries-data/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java b/libraries-data-2/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
similarity index 100%
rename from libraries-data/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
rename to libraries-data-2/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
diff --git a/libraries-data/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java b/libraries-data-2/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
similarity index 100%
rename from libraries-data/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
rename to libraries-data-2/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
diff --git a/libraries-data/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java b/libraries-data-2/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
similarity index 100%
rename from libraries-data/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
rename to libraries-data-2/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
diff --git a/libraries-data/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java b/libraries-data-2/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
similarity index 100%
rename from libraries-data/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
rename to libraries-data-2/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
diff --git a/libraries/src/main/java/com/baeldung/google/sheets/GoogleAuthorizeUtil.java b/libraries-data-2/src/main/java/com/baeldung/google/sheets/GoogleAuthorizeUtil.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/google/sheets/GoogleAuthorizeUtil.java
rename to libraries-data-2/src/main/java/com/baeldung/google/sheets/GoogleAuthorizeUtil.java
diff --git a/libraries/src/main/java/com/baeldung/google/sheets/SheetsServiceUtil.java b/libraries-data-2/src/main/java/com/baeldung/google/sheets/SheetsServiceUtil.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/google/sheets/SheetsServiceUtil.java
rename to libraries-data-2/src/main/java/com/baeldung/google/sheets/SheetsServiceUtil.java
diff --git a/libraries/src/main/java/com/baeldung/infinispan/CacheConfiguration.java b/libraries-data-2/src/main/java/com/baeldung/infinispan/CacheConfiguration.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/infinispan/CacheConfiguration.java
rename to libraries-data-2/src/main/java/com/baeldung/infinispan/CacheConfiguration.java
diff --git a/libraries/src/main/java/com/baeldung/infinispan/listener/CacheListener.java b/libraries-data-2/src/main/java/com/baeldung/infinispan/listener/CacheListener.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/infinispan/listener/CacheListener.java
rename to libraries-data-2/src/main/java/com/baeldung/infinispan/listener/CacheListener.java
diff --git a/libraries/src/main/java/com/baeldung/infinispan/repository/HelloWorldRepository.java b/libraries-data-2/src/main/java/com/baeldung/infinispan/repository/HelloWorldRepository.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/infinispan/repository/HelloWorldRepository.java
rename to libraries-data-2/src/main/java/com/baeldung/infinispan/repository/HelloWorldRepository.java
diff --git a/libraries/src/main/java/com/baeldung/infinispan/service/HelloWorldService.java b/libraries-data-2/src/main/java/com/baeldung/infinispan/service/HelloWorldService.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/infinispan/service/HelloWorldService.java
rename to libraries-data-2/src/main/java/com/baeldung/infinispan/service/HelloWorldService.java
diff --git a/libraries/src/main/java/com/baeldung/infinispan/service/TransactionalService.java b/libraries-data-2/src/main/java/com/baeldung/infinispan/service/TransactionalService.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/infinispan/service/TransactionalService.java
rename to libraries-data-2/src/main/java/com/baeldung/infinispan/service/TransactionalService.java
diff --git a/libraries/src/main/java/com/baeldung/measurement/WaterTank.java b/libraries-data-2/src/main/java/com/baeldung/measurement/WaterTank.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/measurement/WaterTank.java
rename to libraries-data-2/src/main/java/com/baeldung/measurement/WaterTank.java
diff --git a/libraries/src/main/java/com/baeldung/opencsv/Application.java b/libraries-data-2/src/main/java/com/baeldung/opencsv/Application.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/opencsv/Application.java
rename to libraries-data-2/src/main/java/com/baeldung/opencsv/Application.java
diff --git a/libraries/src/main/java/com/baeldung/opencsv/Constants.java b/libraries-data-2/src/main/java/com/baeldung/opencsv/Constants.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/opencsv/Constants.java
rename to libraries-data-2/src/main/java/com/baeldung/opencsv/Constants.java
diff --git a/libraries/src/main/java/com/baeldung/opencsv/beans/CsvBean.java b/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/CsvBean.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/opencsv/beans/CsvBean.java
rename to libraries-data-2/src/main/java/com/baeldung/opencsv/beans/CsvBean.java
diff --git a/libraries/src/main/java/com/baeldung/opencsv/beans/NamedColumnBean.java b/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/NamedColumnBean.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/opencsv/beans/NamedColumnBean.java
rename to libraries-data-2/src/main/java/com/baeldung/opencsv/beans/NamedColumnBean.java
diff --git a/libraries/src/main/java/com/baeldung/opencsv/beans/SimplePositionBean.java b/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/SimplePositionBean.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/opencsv/beans/SimplePositionBean.java
rename to libraries-data-2/src/main/java/com/baeldung/opencsv/beans/SimplePositionBean.java
diff --git a/libraries/src/main/java/com/baeldung/opencsv/beans/WriteExampleBean.java b/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/WriteExampleBean.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/opencsv/beans/WriteExampleBean.java
rename to libraries-data-2/src/main/java/com/baeldung/opencsv/beans/WriteExampleBean.java
diff --git a/libraries/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java b/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java
rename to libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java
diff --git a/libraries/src/main/java/com/baeldung/opencsv/examples/sync/CsvReaderExamples.java b/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvReaderExamples.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/opencsv/examples/sync/CsvReaderExamples.java
rename to libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvReaderExamples.java
diff --git a/libraries/src/main/java/com/baeldung/opencsv/examples/sync/CsvWriterExamples.java b/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvWriterExamples.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/opencsv/examples/sync/CsvWriterExamples.java
rename to libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvWriterExamples.java
diff --git a/libraries/src/main/java/com/baeldung/opencsv/helpers/Helpers.java b/libraries-data-2/src/main/java/com/baeldung/opencsv/helpers/Helpers.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/opencsv/helpers/Helpers.java
rename to libraries-data-2/src/main/java/com/baeldung/opencsv/helpers/Helpers.java
diff --git a/libraries/src/main/java/com/baeldung/opencsv/pojos/CsvTransfer.java b/libraries-data-2/src/main/java/com/baeldung/opencsv/pojos/CsvTransfer.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/opencsv/pojos/CsvTransfer.java
rename to libraries-data-2/src/main/java/com/baeldung/opencsv/pojos/CsvTransfer.java
diff --git a/libraries/src/main/java/com/baeldung/smooks/converter/OrderConverter.java b/libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderConverter.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/smooks/converter/OrderConverter.java
rename to libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderConverter.java
diff --git a/libraries/src/main/java/com/baeldung/smooks/converter/OrderValidator.java b/libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderValidator.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/smooks/converter/OrderValidator.java
rename to libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderValidator.java
diff --git a/libraries/src/main/java/com/baeldung/smooks/model/Item.java b/libraries-data-2/src/main/java/com/baeldung/smooks/model/Item.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/smooks/model/Item.java
rename to libraries-data-2/src/main/java/com/baeldung/smooks/model/Item.java
diff --git a/libraries/src/main/java/com/baeldung/smooks/model/Order.java b/libraries-data-2/src/main/java/com/baeldung/smooks/model/Order.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/smooks/model/Order.java
rename to libraries-data-2/src/main/java/com/baeldung/smooks/model/Order.java
diff --git a/libraries/src/main/java/com/baeldung/smooks/model/Status.java b/libraries-data-2/src/main/java/com/baeldung/smooks/model/Status.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/smooks/model/Status.java
rename to libraries-data-2/src/main/java/com/baeldung/smooks/model/Status.java
diff --git a/libraries/src/main/java/com/baeldung/smooks/model/Supplier.java b/libraries-data-2/src/main/java/com/baeldung/smooks/model/Supplier.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/smooks/model/Supplier.java
rename to libraries-data-2/src/main/java/com/baeldung/smooks/model/Supplier.java
diff --git a/libraries/src/main/resources/google-sheets-client-secret.json b/libraries-data-2/src/main/resources/google-sheets-client-secret.json
similarity index 100%
rename from libraries/src/main/resources/google-sheets-client-secret.json
rename to libraries-data-2/src/main/resources/google-sheets-client-secret.json
diff --git a/libraries-data-2/src/main/resources/image.jpg b/libraries-data-2/src/main/resources/image.jpg
new file mode 100644
index 0000000000..e2554a0d9c
Binary files /dev/null and b/libraries-data-2/src/main/resources/image.jpg differ
diff --git a/libraries/src/main/resources/smooks/email.ftl b/libraries-data-2/src/main/resources/smooks/email.ftl
similarity index 100%
rename from libraries/src/main/resources/smooks/email.ftl
rename to libraries-data-2/src/main/resources/smooks/email.ftl
diff --git a/libraries/src/main/resources/smooks/item-rules.csv b/libraries-data-2/src/main/resources/smooks/item-rules.csv
similarity index 100%
rename from libraries/src/main/resources/smooks/item-rules.csv
rename to libraries-data-2/src/main/resources/smooks/item-rules.csv
diff --git a/libraries/src/main/resources/smooks/order.ftl b/libraries-data-2/src/main/resources/smooks/order.ftl
similarity index 100%
rename from libraries/src/main/resources/smooks/order.ftl
rename to libraries-data-2/src/main/resources/smooks/order.ftl
diff --git a/libraries/src/main/resources/smooks/order.json b/libraries-data-2/src/main/resources/smooks/order.json
similarity index 100%
rename from libraries/src/main/resources/smooks/order.json
rename to libraries-data-2/src/main/resources/smooks/order.json
diff --git a/libraries/src/main/resources/smooks/order.xml b/libraries-data-2/src/main/resources/smooks/order.xml
similarity index 100%
rename from libraries/src/main/resources/smooks/order.xml
rename to libraries-data-2/src/main/resources/smooks/order.xml
diff --git a/libraries/src/main/resources/smooks/smooks-mapping.xml b/libraries-data-2/src/main/resources/smooks/smooks-mapping.xml
similarity index 100%
rename from libraries/src/main/resources/smooks/smooks-mapping.xml
rename to libraries-data-2/src/main/resources/smooks/smooks-mapping.xml
diff --git a/libraries/src/main/resources/smooks/smooks-transform-edi.xml b/libraries-data-2/src/main/resources/smooks/smooks-transform-edi.xml
similarity index 100%
rename from libraries/src/main/resources/smooks/smooks-transform-edi.xml
rename to libraries-data-2/src/main/resources/smooks/smooks-transform-edi.xml
diff --git a/libraries/src/main/resources/smooks/smooks-transform-email.xml b/libraries-data-2/src/main/resources/smooks/smooks-transform-email.xml
similarity index 100%
rename from libraries/src/main/resources/smooks/smooks-transform-email.xml
rename to libraries-data-2/src/main/resources/smooks/smooks-transform-email.xml
diff --git a/libraries/src/main/resources/smooks/smooks-validation.xml b/libraries-data-2/src/main/resources/smooks/smooks-validation.xml
similarity index 100%
rename from libraries/src/main/resources/smooks/smooks-validation.xml
rename to libraries-data-2/src/main/resources/smooks/smooks-validation.xml
diff --git a/libraries/src/main/resources/smooks/supplier.properties b/libraries-data-2/src/main/resources/smooks/supplier.properties
similarity index 100%
rename from libraries/src/main/resources/smooks/supplier.properties
rename to libraries-data-2/src/main/resources/smooks/supplier.properties
diff --git a/libraries/src/test/java/com/baeldung/crdt/CRDTUnitTest.java b/libraries-data-2/src/test/com/baeldung/crdt/CRDTUnitTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/crdt/CRDTUnitTest.java
rename to libraries-data-2/src/test/com/baeldung/crdt/CRDTUnitTest.java
diff --git a/libraries/src/test/java/com/baeldung/docx/Docx4jReadAndWriteIntegrationTest.java b/libraries-data-2/src/test/com/baeldung/docx/Docx4jReadAndWriteIntegrationTest.java
similarity index 97%
rename from libraries/src/test/java/com/baeldung/docx/Docx4jReadAndWriteIntegrationTest.java
rename to libraries-data-2/src/test/com/baeldung/docx/Docx4jReadAndWriteIntegrationTest.java
index b6e157beea..9a2691d3f0 100644
--- a/libraries/src/test/java/com/baeldung/docx/Docx4jReadAndWriteIntegrationTest.java
+++ b/libraries-data-2/src/test/com/baeldung/docx/Docx4jReadAndWriteIntegrationTest.java
@@ -1,19 +1,19 @@
-package com.baeldung.docx;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertTrue;
-
-public class Docx4jReadAndWriteIntegrationTest {
-
-    private static final String imagePath = "src/main/resources/image.jpg";
-    private static final String outputPath = "helloWorld.docx";
-
-    @Test
-    public void givenWordPackage_whenTextExist_thenReturnTrue() throws Exception {
-        Docx4jExample docx4j = new Docx4jExample();
-        docx4j.createDocumentPackage(outputPath, imagePath);
-        assertTrue(docx4j.isTextExist("Hello World!"));
-        assertTrue(!docx4j.isTextExist("InexistantText"));
-    }
-}
+package com.baeldung.docx;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class Docx4jReadAndWriteIntegrationTest {
+
+    private static final String imagePath = "src/main/resources/image.jpg";
+    private static final String outputPath = "helloWorld.docx";
+
+    @Test
+    public void givenWordPackage_whenTextExist_thenReturnTrue() throws Exception {
+        Docx4jExample docx4j = new Docx4jExample();
+        docx4j.createDocumentPackage(outputPath, imagePath);
+        assertTrue(docx4j.isTextExist("Hello World!"));
+        assertTrue(!docx4j.isTextExist("InexistantText"));
+    }
+}
diff --git a/libraries-data/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java b/libraries-data-2/src/test/com/baeldung/flink/BackupCreatorIntegrationTest.java
similarity index 100%
rename from libraries-data/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java
rename to libraries-data-2/src/test/com/baeldung/flink/BackupCreatorIntegrationTest.java
diff --git a/libraries-data/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java b/libraries-data-2/src/test/com/baeldung/flink/WordCapitalizerIntegrationTest.java
similarity index 100%
rename from libraries-data/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java
rename to libraries-data-2/src/test/com/baeldung/flink/WordCapitalizerIntegrationTest.java
diff --git a/libraries-data/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java b/libraries-data-2/src/test/com/baeldung/flink/WordCountIntegrationTest.java
similarity index 100%
rename from libraries-data/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java
rename to libraries-data-2/src/test/com/baeldung/flink/WordCountIntegrationTest.java
diff --git a/libraries/src/test/java/com/baeldung/google/sheets/GoogleSheetsLiveTest.java b/libraries-data-2/src/test/com/baeldung/google/sheets/GoogleSheetsLiveTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/google/sheets/GoogleSheetsLiveTest.java
rename to libraries-data-2/src/test/com/baeldung/google/sheets/GoogleSheetsLiveTest.java
diff --git a/libraries/src/test/java/com/baeldung/hll/HLLLongRunningManualTest.java b/libraries-data-2/src/test/com/baeldung/hll/HLLLongRunningManualTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/hll/HLLLongRunningManualTest.java
rename to libraries-data-2/src/test/com/baeldung/hll/HLLLongRunningManualTest.java
diff --git a/libraries/src/test/java/com/baeldung/infinispan/AbstractIntegrationTest.java b/libraries-data-2/src/test/com/baeldung/infinispan/AbstractIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/infinispan/AbstractIntegrationTest.java
rename to libraries-data-2/src/test/com/baeldung/infinispan/AbstractIntegrationTest.java
diff --git a/libraries/src/test/java/com/baeldung/infinispan/service/HelloWorldServiceTemporaryLiveTest.java b/libraries-data-2/src/test/com/baeldung/infinispan/service/HelloWorldServiceTemporaryLiveTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/infinispan/service/HelloWorldServiceTemporaryLiveTest.java
rename to libraries-data-2/src/test/com/baeldung/infinispan/service/HelloWorldServiceTemporaryLiveTest.java
diff --git a/libraries/src/test/java/com/baeldung/infinispan/service/TransactionalServiceIntegrationTest.java b/libraries-data-2/src/test/com/baeldung/infinispan/service/TransactionalServiceIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/infinispan/service/TransactionalServiceIntegrationTest.java
rename to libraries-data-2/src/test/com/baeldung/infinispan/service/TransactionalServiceIntegrationTest.java
diff --git a/libraries/src/test/java/com/baeldung/measurement/WaterTankUnitTest.java b/libraries-data-2/src/test/com/baeldung/measurement/WaterTankUnitTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/measurement/WaterTankUnitTest.java
rename to libraries-data-2/src/test/com/baeldung/measurement/WaterTankUnitTest.java
diff --git a/libraries/src/test/java/com/baeldung/opencsv/OpenCsvIntegrationTest.java b/libraries-data-2/src/test/com/baeldung/opencsv/OpenCsvIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/opencsv/OpenCsvIntegrationTest.java
rename to libraries-data-2/src/test/com/baeldung/opencsv/OpenCsvIntegrationTest.java
diff --git a/libraries/src/test/java/com/baeldung/smooks/converter/SmooksIntegrationTest.java b/libraries-data-2/src/test/com/baeldung/smooks/converter/SmooksIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/smooks/converter/SmooksIntegrationTest.java
rename to libraries-data-2/src/test/com/baeldung/smooks/converter/SmooksIntegrationTest.java
diff --git a/libraries-data/README.md b/libraries-data/README.md
index 077961f887..1ad7e94a1f 100644
--- a/libraries-data/README.md
+++ b/libraries-data/README.md
@@ -11,7 +11,6 @@
 - [Apache Ignite with Spring Data](http://www.baeldung.com/apache-ignite-spring-data)
 - [Guide to JMapper](https://www.baeldung.com/jmapper)
 - [A Guide to Apache Crunch](https://www.baeldung.com/apache-crunch)
-- [Building a Data Pipeline with Flink and Kafka](https://www.baeldung.com/kafka-flink-data-pipeline)
 - [Intro to Apache Storm](https://www.baeldung.com/apache-storm)
 - [Guide to Ebean ORM](https://www.baeldung.com/ebean-orm)
 - [Introduction to Kafka Connectors](https://www.baeldung.com/kafka-connectors-guide)
diff --git a/libraries-server/README.md b/libraries-server/README.md
index dc6bcd0716..b5392f5883 100644
--- a/libraries-server/README.md
+++ b/libraries-server/README.md
@@ -1,4 +1,4 @@
-### Relevant articles
+## Relevant Articles:
 
 - [Embedded Jetty Server in Java](http://www.baeldung.com/jetty-embedded)
 - [Introduction to Netty](http://www.baeldung.com/netty)
@@ -8,3 +8,4 @@
 - [Testing Netty with EmbeddedChannel](http://www.baeldung.com/testing-netty-embedded-channel)
 - [MQTT Client in Java](https://www.baeldung.com/java-mqtt-client)
 - [Guide to XMPP Smack Client](https://www.baeldung.com/xmpp-smack-chat-client)
+- [A Guide to NanoHTTPD](https://www.baeldung.com/nanohttpd)
diff --git a/libraries/README.md b/libraries/README.md
index c7b40e3c94..375863a5ab 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -15,7 +15,6 @@
 - [Serenity BDD with Spring and JBehave](http://www.baeldung.com/serenity-spring-jbehave)
 - [Locality-Sensitive Hashing in Java Using Java-LSH](http://www.baeldung.com/locality-sensitive-hashing)
 - [Introduction to Awaitlity](http://www.baeldung.com/awaitlity-testing)
-- [Guide to the HyperLogLog Algorithm](http://www.baeldung.com/java-hyperloglog)
 - [Introduction to Neuroph](http://www.baeldung.com/neuroph)
 - [Quick Guide to RSS with Rome](http://www.baeldung.com/rome-rss)
 - [Introduction to PCollections](http://www.baeldung.com/java-pcollections)
@@ -23,8 +22,6 @@
 - [Introduction to Eclipse Collections](http://www.baeldung.com/eclipse-collections)
 - [DistinctBy in the Java Stream API](http://www.baeldung.com/java-streams-distinct-by)
 - [Introduction to NoException](http://www.baeldung.com/no-exception)
-- [Introduction to Conflict-Free Replicated Data Types](http://www.baeldung.com/java-conflict-free-replicated-data-types)
-- [Introduction to javax.measure](http://www.baeldung.com/javax-measure)
 - [Spring Yarg Integration](http://www.baeldung.com/spring-yarg)
 - [Delete a Directory Recursively in Java](http://www.baeldung.com/java-delete-directory)
 - [Guide to JDeferred](http://www.baeldung.com/jdeferred)
@@ -33,15 +30,10 @@
 - [Introduction to Retrofit](http://www.baeldung.com/retrofit)
 - [Using Pairs in Java](http://www.baeldung.com/java-pairs)
 - [Introduction to Caffeine](http://www.baeldung.com/java-caching-caffeine)
-- [Introduction To Docx4J](http://www.baeldung.com/docx4j)
 - [Introduction to StreamEx](http://www.baeldung.com/streamex)
 - [Introduction to BouncyCastle with Java](http://www.baeldung.com/java-bouncy-castle)
-- [Interact with Google Sheets from Java](http://www.baeldung.com/google-sheets-java-client)
 - [A Docker Guide for Java](http://www.baeldung.com/docker-java-api)
-- [Introduction To OpenCSV](http://www.baeldung.com/opencsv)
 - [Introduction to Akka Actors in Java](http://www.baeldung.com/akka-actors-java)
-- [Introduction to Smooks](http://www.baeldung.com/smooks)
-- [A Guide to Infinispan in Java](http://www.baeldung.com/infinispan)
 - [A Guide to Unirest](http://www.baeldung.com/unirest)
 - [Introduction to Akka Actors in Java](http://www.baeldung.com/akka-actors-java)
 - [A Guide to Byte Buddy](http://www.baeldung.com/byte-buddy)
@@ -52,7 +44,6 @@
 - [Java Concurrency Utility with JCTools](http://www.baeldung.com/java-concurrency-jc-tools)
 - [Creating REST Microservices with Javalin](http://www.baeldung.com/javalin-rest-microservices)
 - [Introduction to JavaPoet](http://www.baeldung.com/java-poet)
-- [Introduction to Joda-Time](http://www.baeldung.com/joda-time)
 - [Convert String to Date in Java](http://www.baeldung.com/java-string-to-date)
 - [Guide to Resilience4j](http://www.baeldung.com/resilience4j)
 - [Parsing YAML with SnakeYAML](http://www.baeldung.com/java-snake-yaml)
diff --git a/libraries/pom.xml b/libraries/pom.xml
index e8ffde5f99..438fe6a519 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -36,12 +36,6 @@
             <artifactId>cglib</artifactId>
             <version>${cglib.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.opencsv/opencsv -->
-        <dependency>
-            <groupId>com.opencsv</groupId>
-            <artifactId>opencsv</artifactId>
-            <version>${opencsv.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -52,11 +46,6 @@
             <artifactId>commons-net</artifactId>
             <version>${commons-net.version}</version>
         </dependency>
-        <dependency>
-            <groupId>tec.units</groupId>
-            <artifactId>unit-ri</artifactId>
-            <version>${unit-ri.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jasypt</groupId>
             <artifactId>jasypt</artifactId>
@@ -347,11 +336,6 @@
             <version>${org.hamcrest.java-hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>net.agkn</groupId>
-            <artifactId>hll</artifactId>
-            <version>${hll.version}</version>
-        </dependency>
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
@@ -464,21 +448,6 @@
             <artifactId>jgrapht-core</artifactId>
             <version>${jgrapht.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.netopyr.wurmloch</groupId>
-            <artifactId>wurmloch-crdt</artifactId>
-            <version>${crdt.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.docx4j</groupId>
-            <artifactId>docx4j</artifactId>
-            <version>${docx4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>${jaxb-api.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
@@ -509,11 +478,6 @@
             <artifactId>google-http-client-gson</artifactId>
             <version>${googleclient.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.infinispan</groupId>
-            <artifactId>infinispan-core</artifactId>
-            <version>${infinispan.version}</version>
-        </dependency>
 
         <!--Java Docker API Client -->
         <dependency>
@@ -553,11 +517,6 @@
             <artifactId>google-oauth-client-jetty</artifactId>
             <version>${google-api.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.apis</groupId>
-            <artifactId>google-api-services-sheets</artifactId>
-            <version>${google-sheets.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-streams</artifactId>
@@ -581,12 +540,6 @@
             <classifier>test</classifier>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.milyn</groupId>
-            <artifactId>milyn-smooks-all</artifactId>
-            <version>${smooks.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.mashape.unirest</groupId>
             <artifactId>unirest-java</artifactId>
@@ -815,7 +768,6 @@
         <suanshu.version>4.0.0</suanshu.version>
         <snakeyaml.version>1.21</snakeyaml.version>
         <googleclient.version>1.23.0</googleclient.version>
-        <crdt.version>0.1.0</crdt.version>
         <multiverse.version>0.7.0</multiverse.version>
         <cglib.version>3.2.7</cglib.version>
         <jasypt.version>1.9.2</jasypt.version>
@@ -839,7 +791,6 @@
         <pact.version>3.5.0</pact.version>
         <awaitility.version>3.0.0</awaitility.version>
         <org.hamcrest.java-hamcrest.version>2.0.0.0</org.hamcrest.java-hamcrest.version>
-        <hll.version>1.6.0</hll.version>
         <bytebuddy.version>1.7.1</bytebuddy.version>
         <pcollections.version>2.1.2</pcollections.version>
         <rome.version>1.0</rome.version>
@@ -852,17 +803,13 @@
         <joda-time.version>2.10</joda-time.version>
         <hirondelle-date4j.version>1.5.1</hirondelle-date4j.version>
         <protonpack.version>1.15</protonpack.version>
-        <unit-ri.version>1.0.3</unit-ri.version>
         <cache.version>1.0.0</cache.version>
         <hazelcast.version>3.10.2</hazelcast.version>
         <caffeine.version>2.5.5</caffeine.version>
         <google-api.version>1.23.0</google-api.version>
         <google-sheets.version>v4-rev493-1.21.0</google-sheets.version>
         <kafka.version>2.0.0</kafka.version>
-        <smooks.version>1.7.0</smooks.version>
         <docker.version>3.0.14</docker.version>
-        <infinispan.version>9.1.5.Final</infinispan.version>
-        <opencsv.version>4.1</opencsv.version>
         <unirest.version>1.4.9</unirest.version>
         <jctools.version>2.1.2</jctools.version>
         <commons-codec-version>1.10.L001</commons-codec-version>
@@ -893,8 +840,6 @@
         <jdeferred.version>1.2.6</jdeferred.version>
         <functionaljava.version>4.8.1</functionaljava.version>
         <jgrapht.version>1.0.1</jgrapht.version>
-        <docx4j.version>3.3.5</docx4j.version>
-        <jaxb-api.version>2.1</jaxb-api.version>
         <bouncycastle.version>1.58</bouncycastle.version>
         <jersey.version>1.19.4</jersey.version>
         <javalin.version>1.6.0</javalin.version>
diff --git a/mapstruct/src/main/java/com/baeldung/dto/CarDTO.java b/mapstruct/src/main/java/com/baeldung/dto/CarDTO.java
index 51aa8ccac2..98aefcb971 100644
--- a/mapstruct/src/main/java/com/baeldung/dto/CarDTO.java
+++ b/mapstruct/src/main/java/com/baeldung/dto/CarDTO.java
@@ -8,4 +8,5 @@ import lombok.Setter;
 public class CarDTO {
     private int id;
     private String name;
+    private FuelType fuelType;
 }
diff --git a/mapstruct/src/main/java/com/baeldung/dto/FuelType.java b/mapstruct/src/main/java/com/baeldung/dto/FuelType.java
new file mode 100644
index 0000000000..88692884ad
--- /dev/null
+++ b/mapstruct/src/main/java/com/baeldung/dto/FuelType.java
@@ -0,0 +1,5 @@
+package com.baeldung.dto;
+
+public enum FuelType {
+    ELECTRIC, BIO_DIESEL
+}
diff --git a/mapstruct/src/main/java/com/baeldung/entity/BioDieselCar.java b/mapstruct/src/main/java/com/baeldung/entity/BioDieselCar.java
new file mode 100644
index 0000000000..3f868c10a7
--- /dev/null
+++ b/mapstruct/src/main/java/com/baeldung/entity/BioDieselCar.java
@@ -0,0 +1,4 @@
+package com.baeldung.entity;
+
+public class BioDieselCar extends Car {
+}
diff --git a/mapstruct/src/main/java/com/baeldung/entity/ElectricCar.java b/mapstruct/src/main/java/com/baeldung/entity/ElectricCar.java
new file mode 100644
index 0000000000..9b780a244e
--- /dev/null
+++ b/mapstruct/src/main/java/com/baeldung/entity/ElectricCar.java
@@ -0,0 +1,4 @@
+package com.baeldung.entity;
+
+public class ElectricCar extends Car {
+}
diff --git a/mapstruct/src/main/java/com/baeldung/mapper/CarsMapper.java b/mapstruct/src/main/java/com/baeldung/mapper/CarsMapper.java
new file mode 100644
index 0000000000..430aef1440
--- /dev/null
+++ b/mapstruct/src/main/java/com/baeldung/mapper/CarsMapper.java
@@ -0,0 +1,32 @@
+package com.baeldung.mapper;
+
+import org.mapstruct.AfterMapping;
+import org.mapstruct.BeforeMapping;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+
+import com.baeldung.dto.CarDTO;
+import com.baeldung.dto.FuelType;
+import com.baeldung.entity.BioDieselCar;
+import com.baeldung.entity.Car;
+import com.baeldung.entity.ElectricCar;
+
+@Mapper
+public abstract class CarsMapper {
+
+    @BeforeMapping
+    protected void enrichDTOWithFuelType(Car car, @MappingTarget CarDTO carDto) {
+        if (car instanceof ElectricCar)
+            carDto.setFuelType(FuelType.ELECTRIC);
+        if (car instanceof BioDieselCar)
+            carDto.setFuelType(FuelType.BIO_DIESEL);
+    }
+
+    @AfterMapping
+    protected void convertNameToUpperCase(@MappingTarget CarDTO carDto) {
+        carDto.setName(carDto.getName().toUpperCase());
+    }
+
+    public abstract CarDTO toCarDto(Car car);
+
+}
diff --git a/mapstruct/src/test/java/com/baeldung/mapper/CarsMapperUnitTest.java b/mapstruct/src/test/java/com/baeldung/mapper/CarsMapperUnitTest.java
new file mode 100644
index 0000000000..e729e1a2d0
--- /dev/null
+++ b/mapstruct/src/test/java/com/baeldung/mapper/CarsMapperUnitTest.java
@@ -0,0 +1,42 @@
+package com.baeldung.mapper;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.Test;
+import org.mapstruct.factory.Mappers;
+
+import com.baeldung.dto.CarDTO;
+import com.baeldung.dto.FuelType;
+import com.baeldung.entity.BioDieselCar;
+import com.baeldung.entity.Car;
+import com.baeldung.entity.ElectricCar;
+
+class CarsMapperUnitTest {
+
+    private CarsMapper sut = Mappers.getMapper(CarsMapper.class);
+
+    @Test
+    void testGivenSubTypeElectric_mapsModifiedFieldsToSuperTypeDto_whenBeforeAndAfterMappingMethodscarCalled() {
+        Car car = new ElectricCar();
+        car.setId(12);
+        car.setName("Tesla_Model_C");
+        
+        CarDTO carDto = sut.toCarDto(car);
+        
+        assertEquals("TESLA_MODEL_C", carDto.getName());
+        assertEquals(FuelType.ELECTRIC, carDto.getFuelType());
+    }
+    
+    @Test
+    void testGivenSubTypeBioDiesel_mapsModifiedFieldsToSuperTypeDto_whenBeforeAndAfterMappingMethodscarCalled() {
+        Car car = new BioDieselCar();
+        car.setId(11);
+        car.setName("Tesla_Model_X");
+        
+        CarDTO carDto = sut.toCarDto(car);
+        
+        assertEquals("TESLA_MODEL_X", carDto.getName());
+        assertEquals(FuelType.BIO_DIESEL, carDto.getFuelType());
+    }
+
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/web/AuthorizationEndpoint.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/web/AuthorizationEndpoint.java
deleted file mode 100644
index 84b9a89c54..0000000000
--- a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/web/AuthorizationEndpoint.java
+++ /dev/null
@@ -1,209 +0,0 @@
-//package com.baeldung.security.oauth2.server.web;
-//
-//import AuthorizationCode;
-//import Client;
-//import User;
-//import com.baeldung.security.oauth2.server.service.AuthCodeService;
-//
-//import javax.ejb.EJB;
-//import javax.enterprise.context.RequestScoped;
-//import javax.inject.Inject;
-//import javax.persistence.EntityManager;
-//import javax.persistence.PersistenceContext;
-//import javax.security.enterprise.SecurityContext;
-//import javax.security.enterprise.authentication.mechanism.http.FormAuthenticationMechanismDefinition;
-//import javax.security.enterprise.authentication.mechanism.http.LoginToContinue;
-//import javax.servlet.ServletException;
-//import javax.servlet.annotation.HttpConstraint;
-//import javax.servlet.annotation.ServletSecurity;
-//import javax.servlet.annotation.WebServlet;
-//import javax.servlet.http.HttpServlet;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.IOException;
-//import java.security.Principal;
-//import java.util.*;
-//
-///**
-// * 1. GET http://localhost:8080/app/ (302)
-// * 2. GET http://localhost:8080/uaa/authorize?client_id=app&redirect_uri=http://localhost:8080/app/&response_type=code&state=A123 (302)
-// * 3. GET http://localhost:8080/uaa/login (200) with initial request as hidden input
-// * 4. POST http://localhost:8080/uaa/login (username, password, initial client request) (302)
-// * 5. GET http://localhost:8080/uaa/authorize?client_id=app&redirect_uri=http://localhost:8080/app/&response_type=code&state=A123 (200)
-// * 7. POST http://localhost:8080/uaa/authorize?client_id=app&redirect_uri=http://localhost:8080/app/&response_type=code&state=A123 (302)
-// * 8. GET http://localhost:8080/app/?code=rkWijq06mL&state=A123 (200)
-// */
-///*
-//
-//Query Params:
-//        client_id: app
-//        redirect_uri: http://localhost:8080/app/
-//        response_type: code
-//        state: A123
-//
-//        ==> GET user login WITH client request as hidden input:
-//                    <input name="form_redirect_uri"
-//                   type="hidden"
-//                   value="http://localhost:8080/uaa/oauth/authorize?client_id=app&amp;redirect_uri=http://localhost:8080/app/&amp;response_type=code&amp;state=A123"/>
-//
-//        ==> After user login ==> Initial client request
-//        ==> gen code
-//        == redirect to redirect uri + params code & state : 302, location : http://localhost:8080/app/?code=w6A0YQFzzg&state=A123
-//*/
-//
-////authorize?client_id=app&redirect_uri=http://localhost:8080/app/&response_type=code&state=A123
-////http://localhost:9080/authorize?response_type=code&client_id=client_id_1&redirect_uri=http://localhost:9080/app&state=A123
-//
-////@RequestScoped
-//@FormAuthenticationMechanismDefinition(
-//        loginToContinue = @LoginToContinue(
-//                loginPage = "/login-servlet",
-//                errorPage = "/login-error-servlet"
-//        )
-//)
-//@WebServlet({"/authorize"})
-//@ServletSecurity(@HttpConstraint(rolesAllowed = "user"))
-////@Stateless
-//@RequestScoped
-//public class AuthorizationEndpoint extends HttpServlet {
-//
-//    private static final List<String> authorizedResponseTypes = Arrays.asList("code", "token");
-//
-//    @Inject
-//    private SecurityContext securityContext;
-//
-//    @PersistenceContext(name = "jpa-oauth2-pu")
-//    private EntityManager entityManager;
-//
-//    @EJB
-//    private AuthCodeService authCodeService;
-//
-//    //HTTP GET IS A MUST, POST IS OPTIONAL
-//    @Override
-//    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-//
-//        String error = "";
-//
-//        //1. User Authentication
-//        Principal principal = securityContext.getCallerPrincipal();
-//
-//        //2. Check for a valid client_id
-//        String clientId = request.getParameter("client_id");
-//        if (clientId == null) {
-//            request.setAttribute("error", "The client " + clientId + " doesn't exist.");
-//        }
-//        request.setAttribute("clientId", clientId);
-//        Client client = entityManager.find(Client.class, clientId);
-//        if (client == null) {
-//            request.setAttribute("error", "The client " + clientId + " doesn't exist.");
-//        }
-//
-//        //3. check for a valid response_type
-//        String responseType = request.getParameter("response_type");
-//        if (!authorizedResponseTypes.contains(responseType)) {
-//            error = "invalid_grant :" + responseType + ", response_type params should be one of :" + authorizedResponseTypes;
-//            request.setAttribute("error", error);
-//            request.getRequestDispatcher("/error.jsp")
-//                    .forward(request, response);
-//        }
-//
-//        //4. Optional redirect_uri, if provided should match
-//        String redirectUri = request.getParameter("redirect_uri");
-//        checkRedirectUri(client, redirectUri);
-//
-//        //save params
-//        String currentUri = request.getRequestURI();
-//        request.setAttribute("post_redirect_uri", currentUri);
-//
-//        String state = request.getParameter("state");
-//        Map<String, String> requestMap = new HashMap<>();
-//        requestMap.put("response_type", responseType);
-//        requestMap.put("client_id", clientId);
-//        requestMap.put("redirect_uri", redirectUri);
-//        requestMap.put("state", state);
-//        request.setAttribute("requestMap", requestMap);
-//
-//        //5.scope: Optional
-//        String requestedScope = request.getParameter("scope");
-//        if (requestedScope.isEmpty()) {
-//            requestedScope = client.getScope();
-//        }
-//        //requestedScope should be a subset of the client scope: clientScopes.containsAll(requestedScopes)
-//        //checkRequestedScope(requestedScope, client.getScope());
-//
-//        //sub set of user scope
-//        //allowed scope by the user
-//
-//        User user = entityManager.find(User.class, principal.getName());
-//        request.setAttribute("scopes", requestedScope);
-//
-//
-//        forward("/authorize.jsp", request, response);
-//    }
-//
-//    @Override
-//    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-//        String clientId = request.getParameter("client_id");
-//
-//        String responseType = request.getParameter("response_type");
-//        if (!authorizedResponseTypes.contains(responseType)) {
-//            String error = "invalid_grant :" + responseType + ", response_type params should be one of :" + authorizedResponseTypes;
-//            request.setAttribute("error", error);
-//            forward("/error.jsp", request, response);
-//        }
-//
-//        Client client = entityManager.find(Client.class, clientId);
-//        Objects.requireNonNull(client);
-//
-//        String userId = securityContext.getCallerPrincipal().getName();
-//        AuthorizationCode authorizationCode = new AuthorizationCode();
-//        authorizationCode.setClientId(clientId);
-//        authorizationCode.setUserId(userId);
-//        String redirectUri = request.getParameter("redirect_uri");
-//        authorizationCode.setRedirectUri(redirectUri);
-//
-//        redirectUri = checkRedirectUri(client, redirectUri);
-//
-//        String[] scope = request.getParameterValues("scope");
-//        if (scope == null) {
-//            request.setAttribute("error", "User doesn't approved any scope");
-//            forward("/error.jsp", request, response);
-//        }
-//
-//        String approvedScopes = String.join(" ", scope);
-//        authorizationCode.setApprovedScopes(approvedScopes);
-//
-//        //entityManager.persist(authorizationCode);
-//        authCodeService.save(authorizationCode);
-//        String code = authorizationCode.getCode();
-//
-//        StringBuilder sb = new StringBuilder(redirectUri);
-//        sb.append("?code=").append(code);
-//
-//        //If the client send a state, Send it back
-//        String state = request.getParameter("state");
-//        if (state != null) {
-//            sb.append("&state=").append(state);
-//        }
-//        response.sendRedirect(sb.toString());
-//    }
-//
-//    private String checkRedirectUri(Client client, String redirectUri) {
-//        //redirect uri
-//        if (redirectUri == null) {
-//            //erreur: param redirect_uri && client redirect_uri don't match.
-//            redirectUri = client.getRedirectUri();
-//            if (redirectUri == null) {
-//                throw new IllegalStateException("redirectUri shloud be not null, unless a registred client have a redirect_uri.");
-//            }
-//        } else if (!redirectUri.equals(client.getRedirectUri())) {
-//            throw new IllegalStateException("request redirectUri and client registred redirect_uri should match.");
-//        }
-//        return redirectUri;
-//    }
-//
-//    private void forward(String path, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-//        request.getRequestDispatcher(path)
-//                .forward(request, response);
-//    }
-//}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/web/TokenEndpoint.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/web/TokenEndpoint.java
deleted file mode 100644
index 73085a68d1..0000000000
--- a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/web/TokenEndpoint.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.baeldung.security.oauth2.server.web;
-//
-//import AuthorizationGrantTypeHandler;
-//import TokenResponse;
-//import com.baeldung.security.oauth2.server.security.Authenticated;
-//import com.nimbusds.jose.JOSEException;
-//
-//import javax.enterprise.inject.Instance;
-//import javax.enterprise.inject.literal.NamedLiteral;
-//import javax.inject.Inject;
-//import javax.security.enterprise.SecurityContext;
-//import javax.ws.rs.Consumes;
-//import javax.ws.rs.POST;
-//import javax.ws.rs.Path;
-//import javax.ws.rs.Produces;
-//import javax.ws.rs.core.MediaType;
-//import javax.ws.rs.core.MultivaluedMap;
-//import javax.ws.rs.core.Response;
-//import java.security.Principal;
-//import java.util.Arrays;
-//import java.util.List;
-//import java.util.Objects;
-//
-///**
-// * {
-// * "access_token" : "acb6803a48114d9fb4761e403c17f812",
-// * "token_type" : "bearer",
-// * "id_token" : "eyJhbGciOiJIUzI1NiIsImprdSI6Imh0dHBzOi8vbG9jYWxob3N0OjgwODAvdWFhL3Rva2VuX2tleXMiLCJraWQiOiJsZWdhY3ktdG9rZW4ta2V5IiwidHlwIjoiSldUIn0.eyJzdWIiOiIwNzYzZTM2MS02ODUwLTQ3N2ItYjk1Ny1iMmExZjU3MjczMTQiLCJhdWQiOlsibG9naW4iXSwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo4MDgwL3VhYS9vYXV0aC90b2tlbiIsImV4cCI6MTU1NzgzMDM4NSwiaWF0IjoxNTU3Nzg3MTg1LCJhenAiOiJsb2dpbiIsInNjb3BlIjpbIm9wZW5pZCJdLCJlbWFpbCI6IndyaHBONUB0ZXN0Lm9yZyIsInppZCI6InVhYSIsIm9yaWdpbiI6InVhYSIsImp0aSI6ImFjYjY4MDNhNDgxMTRkOWZiNDc2MWU0MDNjMTdmODEyIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImNsaWVudF9pZCI6ImxvZ2luIiwiY2lkIjoibG9naW4iLCJncmFudF90eXBlIjoiYXV0aG9yaXphdGlvbl9jb2RlIiwidXNlcl9uYW1lIjoid3JocE41QHRlc3Qub3JnIiwicmV2X3NpZyI6ImI3MjE5ZGYxIiwidXNlcl9pZCI6IjA3NjNlMzYxLTY4NTAtNDc3Yi1iOTU3LWIyYTFmNTcyNzMxNCIsImF1dGhfdGltZSI6MTU1Nzc4NzE4NX0.Fo8wZ_Zq9mwFks3LfXQ1PfJ4ugppjWvioZM6jSqAAQQ",
-// * "refresh_token" : "f59dcb5dcbca45f981f16ce519d61486-r",
-// * "expires_in" : 43199,
-// * "scope" : "openid oauth.approvals",
-// * "jti" : "acb6803a48114d9fb4761e403c17f812"
-// * }
-// */
-//@Path("token")
-//public class TokenEndpoint {
-//
-//    List<String> supportedGrantTypes = Arrays.asList("authorization_code", "password", "refresh_token", "client_credentials");
-//
-//    @Inject
-//    private SecurityContext securityContext;
-//
-//    @Inject
-//    Instance<AuthorizationGrantTypeHandler> authorizationGrantTypeHandlers;
-//
-//    @POST
-//    @Produces(MediaType.APPLICATION_JSON)
-//    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
-//    @Authenticated
-//    public Response token(MultivaluedMap<String, String> params) throws JOSEException {
-//        //Authenticate client with [basic] http authentication mechanism
-//        Principal principal = securityContext.getCallerPrincipal();
-//        Objects.requireNonNull(principal, "Client not authenticated!");
-//
-//        //Check grant_type params
-//        String grantType = params.getFirst("grant_type");
-//        Objects.requireNonNull(grantType, "grant_type params is required");
-//        //authorization_code, password, refresh, client_credentials
-//        if (!supportedGrantTypes.contains(grantType)) {
-//            throw new RuntimeException("grant_type parameter should be one of the following :" + supportedGrantTypes);
-//        }
-//        AuthorizationGrantTypeHandler authorizationGrantTypeHandler = authorizationGrantTypeHandlers.select(NamedLiteral.of(grantType)).get();
-//        TokenResponse tokenResponse = authorizationGrantTypeHandler.createAccessToken(principal.getName(), params);
-//        Response response = Response.ok(tokenResponse)
-//                .header("Cache-Control", "no-store")
-//                .header("Pragma", "no-cache")
-//                .build();
-//        return response;
-//    }
-//}
diff --git a/parent-boot-1/pom.xml b/parent-boot-1/pom.xml
index 1054038623..8f1af24466 100644
--- a/parent-boot-1/pom.xml
+++ b/parent-boot-1/pom.xml
@@ -55,7 +55,7 @@
 
 	<properties>
 		<rest-assured.version>3.1.0</rest-assured.version>
-		<spring-boot.version>1.5.19.RELEASE</spring-boot.version>
+		<spring-boot.version>1.5.22.RELEASE</spring-boot.version>
 	</properties>
 	
 </project>
diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml
index f0e921bf37..edc115d186 100644
--- a/parent-boot-2/pom.xml
+++ b/parent-boot-2/pom.xml
@@ -78,6 +78,6 @@
         <rest-assured.version>3.3.0</rest-assured.version>
         <!-- plugins -->
         <thin.version>1.0.22.RELEASE</thin.version>
-        <spring-boot.version>2.1.6.RELEASE</spring-boot.version>
+        <spring-boot.version>2.1.7.RELEASE</spring-boot.version>
     </properties>
 </project>
diff --git a/parent-java/pom.xml b/parent-java/pom.xml
index cb3e205871..09e2596d0a 100644
--- a/parent-java/pom.xml
+++ b/parent-java/pom.xml
@@ -21,10 +21,16 @@
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
+        <dependency> 
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons.io.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
         <guava.version>23.0</guava.version>
+        <commons.io.version>2.6</commons.io.version>
     </properties>
 
 </project>
diff --git a/parent-spring-4/pom.xml b/parent-spring-4/pom.xml
index ab66cf19bf..390934ca7b 100644
--- a/parent-spring-4/pom.xml
+++ b/parent-spring-4/pom.xml
@@ -51,7 +51,7 @@
     </build>
 
     <properties>
-        <spring.version>4.3.22.RELEASE</spring.version>
+        <spring.version>4.3.25.RELEASE</spring.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
     </properties>
 
diff --git a/patterns/backoff-jitter/README.md b/patterns/backoff-jitter/README.md
index 6459e4c8e0..a3940cc418 100644
--- a/patterns/backoff-jitter/README.md
+++ b/patterns/backoff-jitter/README.md
@@ -1,2 +1,2 @@
 ### Relevant Articles:
-- [Better Retries with Exponential Backoff and Jitter](https://baeldung.com/retries-with-exponential-backoff-and-jitter)
+- [Better Retries with Exponential Backoff and Jitter](https://www.baeldung.com/resilience4j-backoff-jitter)
diff --git a/patterns/design-patterns-2/pom.xml b/patterns/design-patterns-2/pom.xml
index 392035ab84..17afff87ae 100644
--- a/patterns/design-patterns-2/pom.xml
+++ b/patterns/design-patterns-2/pom.xml
@@ -30,6 +30,17 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
+        </dependency>
+   		<dependency>
+            <groupId>org.inferred</groupId>
+            <artifactId>freebuilder</artifactId>
+            <version>${freebuilder.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>${javax.annotations.version}</version>
         </dependency>
     </dependencies>
     
@@ -38,5 +49,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <intellij.annotations.version>16.0.2</intellij.annotations.version>
+        <freebuilder.version>2.4.1</freebuilder.version>
+        <javax.annotations.version>3.0.2</javax.annotations.version>
     </properties>
 </project>
diff --git a/patterns/design-patterns-2/src/main/java/com/baeldung/freebuilder/Address.java b/patterns/design-patterns-2/src/main/java/com/baeldung/freebuilder/Address.java
new file mode 100644
index 0000000000..6d727f6d9f
--- /dev/null
+++ b/patterns/design-patterns-2/src/main/java/com/baeldung/freebuilder/Address.java
@@ -0,0 +1,25 @@
+package com.baeldung.freebuilder;
+
+import org.inferred.freebuilder.FreeBuilder;
+
+import java.util.Optional;
+
+@FreeBuilder
+public interface Address {
+
+    Optional<String> getAddressLine1();
+
+    Optional<String> getAddressLine2();
+
+    Optional<String> getAddressLine3();
+
+    String getCity();
+
+    Optional<String> getState();
+
+    Optional<Long> getPinCode();
+
+    class Builder extends Address_Builder {
+
+    }
+}
\ No newline at end of file
diff --git a/patterns/design-patterns-2/src/main/java/com/baeldung/freebuilder/Employee.java b/patterns/design-patterns-2/src/main/java/com/baeldung/freebuilder/Employee.java
new file mode 100644
index 0000000000..06558dde0b
--- /dev/null
+++ b/patterns/design-patterns-2/src/main/java/com/baeldung/freebuilder/Employee.java
@@ -0,0 +1,65 @@
+package com.baeldung.freebuilder;
+
+import org.inferred.freebuilder.FreeBuilder;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+@FreeBuilder
+public interface Employee {
+
+    String getName();
+
+    int getAge();
+
+    String getDepartment();
+
+    String getRole();
+
+    String getSupervisorName();
+
+    String getDesignation();
+
+    String getEmail();
+
+    long getPhoneNumber();
+
+    Optional<Boolean> getPermanent();
+
+    Optional<String> getDateOfJoining();
+
+    @Nullable
+    String getCurrentProject();
+
+    Address getAddress();
+
+    List<Long> getAccessTokens();
+
+    Map<String, Long> getAssetsSerialIdMapping();
+
+    Optional<Double> getSalaryInUSD();
+
+
+    class Builder extends Employee_Builder {
+
+        public Builder() {
+            // setting default value for department
+            setDepartment("Builder Pattern");
+        }
+
+        @Override
+        public Builder setEmail(String email) {
+            if (checkValidEmail(email))
+                return super.setEmail(email);
+            else
+                throw new IllegalArgumentException("Invalid email");
+
+        }
+
+        private boolean checkValidEmail(String email) {
+            return email.contains("@");
+        }
+    }
+}
diff --git a/patterns/design-patterns-2/src/main/java/com/baeldung/freebuilder/builder/Employee.java b/patterns/design-patterns-2/src/main/java/com/baeldung/freebuilder/builder/Employee.java
new file mode 100644
index 0000000000..141d734c43
--- /dev/null
+++ b/patterns/design-patterns-2/src/main/java/com/baeldung/freebuilder/builder/Employee.java
@@ -0,0 +1,53 @@
+package com.baeldung.freebuilder.builder;
+
+public class Employee {
+
+    private final String name;
+    private final int age;
+    private final String department;
+
+    private Employee(String name, int age, String department) {
+        this.name = name;
+        this.age = age;
+        this.department = department;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public static class Builder {
+
+        private String name;
+        private int age;
+        private String department;
+
+        public Builder setName(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public Builder setAge(int age) {
+            this.age = age;
+            return this;
+        }
+
+        public Builder setDepartment(String department) {
+            this.department = department;
+            return this;
+        }
+
+        public Employee build() {
+            return new Employee(name, age, department);
+        }
+    }
+
+}
diff --git a/patterns/design-patterns-2/src/test/java/com/baeldung/freebuilder/EmployeeBuilderUnitTest.java b/patterns/design-patterns-2/src/test/java/com/baeldung/freebuilder/EmployeeBuilderUnitTest.java
new file mode 100644
index 0000000000..d28edfcf3d
--- /dev/null
+++ b/patterns/design-patterns-2/src/test/java/com/baeldung/freebuilder/EmployeeBuilderUnitTest.java
@@ -0,0 +1,226 @@
+package com.baeldung.freebuilder;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class EmployeeBuilderUnitTest {
+
+    private static final int PIN_CODE = 223344;
+    public static final String CITY_NAME = "New York";
+    public static final int INPUT_SALARY_EUROS = 10000;
+    public static final double EUROS_TO_USD_RATIO = 0.6;
+
+    @Test
+    public void whenBuildEmployeeWithAddress_thenReturnEmployeeWithValidAddress() {
+
+        // when
+        Address.Builder addressBuilder = new Address.Builder();
+        Address address = addressBuilder.setCity(CITY_NAME).build();
+
+        Employee.Builder builder = new Employee.Builder();
+
+        Employee employee = builder.setName("baeldung")
+          .setAge(10)
+          .setDesignation("author")
+          .setEmail("abc@xyz.com")
+          .setSupervisorName("Admin")
+          .setPhoneNumber(4445566)
+          .setPermanent(true)
+          .setRole("developer")
+          .setAddress(address)
+          .build();
+
+        // then
+        assertTrue(employee.getAddress().getCity().equalsIgnoreCase(CITY_NAME));
+
+    }
+
+    @Test
+    public void whenMapSalary_thenReturnEmployeeWithSalaryInUSD() {
+
+        // when
+        Address.Builder addressBuilder = new Address.Builder();
+        Address address = addressBuilder.setCity(CITY_NAME).setPinCode(PIN_CODE).build();
+
+        long salaryInEuros = INPUT_SALARY_EUROS;
+        Employee.Builder builder = new Employee.Builder();
+
+        Employee employee = builder
+          .setName("baeldung")
+          .setAge(10)
+          .setDesignation("author")
+          .setEmail("abc@xyz.com")
+          .setSupervisorName("Admin")
+          .setPhoneNumber(4445566)
+          .setPermanent(true)
+          .setRole("developer")
+          .setAddress(address)
+          .mapSalaryInUSD(sal -> salaryInEuros * EUROS_TO_USD_RATIO)
+          .build();
+
+        // then
+        assertTrue(employee.getAddress().getPinCode().get() == PIN_CODE);
+
+    }
+
+    @Test
+    public void whenOptionalFields_thenReturnEmployeeWithEmptyValues() {
+
+        // when
+        Address.Builder addressBuilder = new Address.Builder();
+        Address address = addressBuilder.setCity(CITY_NAME).build();
+
+        Employee.Builder builder = new Employee.Builder();
+
+        Employee employee = builder.setName("baeldung")
+          .setAge(10)
+          .setDesignation("author")
+          .setEmail("abc@xyz.com")
+          .setSupervisorName("Admin")
+          .setPhoneNumber(4445566)
+          .setPermanent(true)
+          .setRole("developer")
+          .setAddress(address)
+          .build();
+
+        // then
+        assertTrue(employee.getPermanent().isPresent());
+        assertTrue(employee.getPermanent().get());
+        assertFalse(employee.getDateOfJoining().isPresent());
+
+    }
+
+    @Test
+    public void whenNullableFields_thenReturnEmployeeWithNullValueForField() {
+
+        // when
+        Address.Builder addressBuilder = new Address.Builder();
+        Address address = addressBuilder.setCity(CITY_NAME).build();
+
+        Employee.Builder builder = new Employee.Builder();
+
+        Employee employee = builder.setName("baeldung")
+          .setAge(10)
+          .setDesignation("author")
+          .setEmail("abc@xyz.com")
+          .setSupervisorName("Admin")
+          .setPhoneNumber(4445566)
+          .setNullablePermanent(null)
+          .setDateOfJoining(Optional.empty())
+          .setRole("developer")
+          .setAddress(address)
+          .build();
+
+        // then
+        assertNull(employee.getCurrentProject());
+
+    }
+
+    @Test
+    public void whenCollectionFields_thenReturnEmployeeWithValues() {
+
+        // when
+        Address.Builder addressBuilder = new Address.Builder();
+        Address address = addressBuilder.setCity(CITY_NAME).build();
+
+        Employee.Builder builder = new Employee.Builder();
+
+        Employee employee = builder.setName("baeldung")
+          .setAge(10)
+          .setDesignation("author")
+          .setEmail("abc@xyz.com")
+          .setSupervisorName("Admin")
+          .setPhoneNumber(4445566)
+          .setNullablePermanent(null)
+          .setDateOfJoining(Optional.empty())
+          .setRole("developer")
+          .addAccessTokens(1221819L)
+          .addAccessTokens(1223441L, 134567L)
+          .setAddress(address)
+          .build();
+
+        // then
+        assertTrue(employee.getAccessTokens().size() == 3);
+
+    }
+
+    @Test
+    public void whenMapFields_thenReturnEmployeeWithValues() {
+
+        // when
+        Address.Builder addressBuilder = new Address.Builder();
+        Address address = addressBuilder.setCity(CITY_NAME).build();
+
+        Employee.Builder builder = new Employee.Builder();
+
+        Employee employee = builder.setName("baeldung")
+          .setAge(10)
+          .setDesignation("author")
+          .setEmail("abc@xyz.com")
+          .setSupervisorName("Admin")
+          .setPhoneNumber(4445566)
+          .setNullablePermanent(null)
+          .setDateOfJoining(Optional.empty())
+          .setRole("developer")
+          .addAccessTokens(1221819L)
+          .addAccessTokens(1223441L, 134567L)
+          .putAssetsSerialIdMapping("Laptop", 12345L)
+          .setAddress(address)
+          .build();
+
+        // then
+        assertTrue(employee.getAssetsSerialIdMapping().size() == 1);
+
+    }
+
+    @Test
+    public void whenNestedBuilderTypes_thenReturnEmployeeWithValues() {
+
+        // when
+        Address.Builder addressBuilder = new Address.Builder();
+        Address address = addressBuilder.setCity(CITY_NAME).build();
+
+        Employee.Builder builder = new Employee.Builder();
+
+        Employee employee = builder.setName("baeldung")
+          .setAge(10)
+          .setDesignation("author")
+          .setEmail("abc@xyz.com")
+          .setSupervisorName("Admin")
+          .setPhoneNumber(4445566)
+          .setNullablePermanent(null)
+          .setDateOfJoining(Optional.empty())
+          .setRole("developer")
+          .addAccessTokens(1221819L)
+          .addAccessTokens(1223441L, 134567L)
+          .putAssetsSerialIdMapping("Laptop", 12345L)
+          .setAddress(address)
+          .mutateAddress(a -> a.setPinCode(112200))
+          .build();
+
+        // then
+        assertTrue(employee.getAssetsSerialIdMapping().size() == 1);
+
+    }
+
+    @Test()
+    public void whenPartialEmployeeWithValidEmail_thenReturnEmployeeWithEmail() {
+
+        // when
+        Employee.Builder builder = new Employee.Builder();
+
+        Employee employee = builder.setName("baeldung")
+          .setAge(10)
+          .setEmail("abc@xyz.com")
+          .buildPartial();
+
+        assertNotNull(employee.getEmail());
+    }
+
+}
diff --git a/patterns/design-patterns-2/src/test/java/com/baeldung/freebuilder/builder/EmployeeBuilderUnitTest.java b/patterns/design-patterns-2/src/test/java/com/baeldung/freebuilder/builder/EmployeeBuilderUnitTest.java
new file mode 100644
index 0000000000..1394f851b6
--- /dev/null
+++ b/patterns/design-patterns-2/src/test/java/com/baeldung/freebuilder/builder/EmployeeBuilderUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.freebuilder.builder;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+
+class EmployeeBuilderUnitTest {
+
+    public static final String NAME = "baeldung";
+
+    @Test
+    public void whenBuildEmployee_thenReturnValidEmployee() {
+
+        // when
+        Employee.Builder emplBuilder = new Employee.Builder();
+
+        Employee employee = emplBuilder
+          .setName(NAME)
+          .setAge(12)
+          .setDepartment("Builder Pattern")
+          .build();
+
+        //then
+        Assertions.assertTrue(employee.getName().equalsIgnoreCase(NAME));
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/java-cassandra/pom.xml b/persistence-modules/java-cassandra/pom.xml
index 708d2b3c76..e7c93bc4e5 100644
--- a/persistence-modules/java-cassandra/pom.xml
+++ b/persistence-modules/java-cassandra/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.baeldung</groupId>
     <artifactId>java-cassandra</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-	<name>java-cassandra</name>
+    <name>java-cassandra</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -29,6 +29,19 @@
             <version>${cassandra-unit.version}</version>
         </dependency>
 
+        <!-- DataStax Cassandra -->
+        <dependency>
+            <groupId>com.datastax.oss</groupId>
+            <artifactId>java-driver-core</artifactId>
+            <version>${datastax-cassandra.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>${io-netty.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -39,6 +52,8 @@
         <!-- Cassandra -->
         <cassandra-driver-core.version>3.1.2</cassandra-driver-core.version>
         <cassandra-unit.version>3.1.1.0</cassandra-unit.version>
+        <datastax-cassandra.version>4.1.0</datastax-cassandra.version>
+        <io-netty.version>4.1.34.Final</io-netty.version>
         <guava.version>18.0</guava.version>
     </properties>
 
diff --git a/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/Application.java b/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/Application.java
new file mode 100644
index 0000000000..23140e0455
--- /dev/null
+++ b/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/Application.java
@@ -0,0 +1,46 @@
+package com.baeldung.datastax.cassandra;
+
+import com.baeldung.datastax.cassandra.domain.Video;
+import com.baeldung.datastax.cassandra.repository.KeyspaceRepository;
+import com.baeldung.datastax.cassandra.repository.VideoRepository;
+import com.datastax.oss.driver.api.core.CqlSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+
+public class Application {
+
+    private static final Logger LOG = LoggerFactory.getLogger(Application.class);
+
+    public static void main(String[] args) {
+        new Application().run();
+    }
+
+    public void run() {
+        CassandraConnector connector = new CassandraConnector();
+        connector.connect("127.0.0.1", 9042, "datacenter1");
+        CqlSession session = connector.getSession();
+
+        KeyspaceRepository keyspaceRepository = new KeyspaceRepository(session);
+
+        keyspaceRepository.createKeyspace("testKeyspace", "SimpleStrategy", 1);
+        keyspaceRepository.useKeyspace("testKeyspace");
+
+        VideoRepository videoRepository = new VideoRepository(session);
+
+        videoRepository.createTable();
+
+        videoRepository.insertVideo(new Video("Video Title 1", Instant.now()));
+        videoRepository.insertVideo(new Video("Video Title 2",
+            Instant.now().minus(1, ChronoUnit.DAYS)));
+
+        List<Video> videos = videoRepository.selectAll();
+
+        videos.forEach(x -> LOG.info(x.toString()));
+
+        connector.close();
+    }
+}
diff --git a/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/CassandraConnector.java b/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/CassandraConnector.java
new file mode 100644
index 0000000000..d0938d060a
--- /dev/null
+++ b/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/CassandraConnector.java
@@ -0,0 +1,28 @@
+package com.baeldung.datastax.cassandra;
+
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.CqlSessionBuilder;
+
+import java.net.InetSocketAddress;
+
+public class CassandraConnector {
+
+    private CqlSession session;
+
+    public void connect(final String node, final Integer port, final String dataCenter) {
+        CqlSessionBuilder builder = CqlSession.builder();
+        builder.addContactPoint(new InetSocketAddress(node, port));
+        builder.withLocalDatacenter(dataCenter);
+
+        session = builder.build();
+    }
+
+    public CqlSession getSession() {
+        return this.session;
+    }
+
+    public void close() {
+        session.close();
+    }
+
+}
diff --git a/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/domain/Video.java b/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/domain/Video.java
new file mode 100644
index 0000000000..f62a600f16
--- /dev/null
+++ b/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/domain/Video.java
@@ -0,0 +1,51 @@
+package com.baeldung.datastax.cassandra.domain;
+
+import java.time.Instant;
+import java.util.UUID;
+
+public class Video {
+
+    private UUID id;
+    private String title;
+    private Instant creationDate;
+
+    public Video(UUID id, String title, Instant creationDate) {
+        this.id = id;
+        this.title = title;
+        this.creationDate = creationDate;
+    }
+
+    public Video(String title, Instant creationDate) {
+        this.title = title;
+        this.creationDate = creationDate;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Instant getCreationDate() {
+        return creationDate;
+    }
+
+    public void setCreationDate(Instant creationDate) {
+        this.creationDate = creationDate;
+    }
+
+    @Override
+    public String toString() {
+        return "[id:" + id.toString() + ", title:" + title + ", creationDate: " + creationDate.toString() + "]";
+    }
+}
diff --git a/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/repository/KeyspaceRepository.java b/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/repository/KeyspaceRepository.java
new file mode 100644
index 0000000000..fd4581d055
--- /dev/null
+++ b/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/repository/KeyspaceRepository.java
@@ -0,0 +1,27 @@
+package com.baeldung.datastax.cassandra.repository;
+
+import com.datastax.oss.driver.api.core.CqlSession;
+
+public class KeyspaceRepository {
+    private final CqlSession session;
+
+    public KeyspaceRepository(CqlSession session) {
+        this.session = session;
+    }
+
+    public void createKeyspace(String keyspaceName, String replicationStrategy, int numberOfReplicas) {
+        StringBuilder sb = new StringBuilder("CREATE KEYSPACE IF NOT EXISTS ").append(keyspaceName)
+            .append(" WITH replication = {")
+            .append("'class':'").append(replicationStrategy)
+            .append("','replication_factor':").append(numberOfReplicas)
+            .append("};");
+
+        final String query = sb.toString();
+
+        session.execute(query);
+    }
+
+    public void useKeyspace(String keyspace) {
+        session.execute("USE " + keyspace);
+    }
+}
diff --git a/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/repository/VideoRepository.java b/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/repository/VideoRepository.java
new file mode 100644
index 0000000000..9a09d77072
--- /dev/null
+++ b/persistence-modules/java-cassandra/src/main/java/com/baeldung/datastax/cassandra/repository/VideoRepository.java
@@ -0,0 +1,94 @@
+package com.baeldung.datastax.cassandra.repository;
+
+import com.baeldung.datastax.cassandra.domain.Video;
+import com.datastax.oss.driver.api.core.CqlIdentifier;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.cql.BoundStatement;
+import com.datastax.oss.driver.api.core.cql.PreparedStatement;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.SimpleStatement;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class VideoRepository {
+
+    private static final String TABLE_NAME = "videos";
+
+    private final CqlSession session;
+
+    public VideoRepository(CqlSession session) {
+        this.session = session;
+    }
+
+    public void createTable() {
+        createTable(null);
+    }
+
+    public void createTable(String keyspace) {
+        StringBuilder sb = new StringBuilder("CREATE TABLE IF NOT EXISTS ").append(TABLE_NAME).append(" (")
+            .append("video_id UUID,")
+            .append("title TEXT,")
+            .append("creation_date TIMESTAMP,")
+            .append("PRIMARY KEY(video_id));");
+
+        String query = sb.toString();
+
+        executeStatement(SimpleStatement.newInstance(query), keyspace);
+    }
+
+    public UUID insertVideo(Video video) {
+        return insertVideo(video, null);
+    }
+
+    public UUID insertVideo(Video video, String keyspace) {
+        UUID videoId = UUID.randomUUID();
+
+        video.setId(videoId);
+
+        String absoluteTableName = keyspace != null ? keyspace + "." + TABLE_NAME: TABLE_NAME;
+
+        StringBuilder sb = new StringBuilder("INSERT INTO ").append(absoluteTableName)
+            .append("(video_id, title, creation_date) values (:video_id, :title, :creation_date)");
+
+        PreparedStatement preparedStatement = session.prepare(sb.toString());
+
+        BoundStatement statement = preparedStatement.bind()
+            .setUuid("video_id", video.getId())
+            .setString("title", video.getTitle())
+            .setInstant("creation_date", video.getCreationDate());
+
+        session.execute(statement);
+
+        return videoId;
+    }
+
+    public List<Video> selectAll() {
+        return selectAll(null);
+    }
+
+    public List<Video> selectAll(String keyspace) {
+        StringBuilder sb = new StringBuilder("SELECT * FROM ").append(TABLE_NAME);
+
+        String query = sb.toString();
+
+        ResultSet resultSet = executeStatement(SimpleStatement.newInstance(query), keyspace);
+
+        List<Video> result = new ArrayList<>();
+
+        resultSet.forEach(x -> result.add(
+            new Video(x.getUuid("video_id"), x.getString("title"), x.getInstant("creation_date"))
+        ));
+
+        return result;
+    }
+
+    private ResultSet executeStatement(SimpleStatement statement, String keyspace) {
+        if (keyspace != null) {
+            statement.setKeyspace(CqlIdentifier.fromCql(keyspace));
+        }
+
+        return session.execute(statement);
+    }
+}
diff --git a/persistence-modules/java-jpa-2/README.md b/persistence-modules/java-jpa-2/README.md
new file mode 100644
index 0000000000..7a7429008b
--- /dev/null
+++ b/persistence-modules/java-jpa-2/README.md
@@ -0,0 +1,6 @@
+# Relevant Articles
+<<<<<<< HEAD
+
+- [JPA Query Parameters Usage](http://www.baeldung.com/jpa-query-parameters-usage)
+=======
+>>>>>>> refs/heads/master
diff --git a/persistence-modules/java-jpa-2/pom.xml b/persistence-modules/java-jpa-2/pom.xml
new file mode 100644
index 0000000000..fdd482f833
--- /dev/null
+++ b/persistence-modules/java-jpa-2/pom.xml
@@ -0,0 +1,111 @@
+<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>java-jpa-2</artifactId>
+    <name>java-jpa-2</name>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-jpamodelgen</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+
+        <!--Compile time JPA API -->
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>${javax.persistence-api.version}</version>
+        </dependency>
+
+        <!--Runtime JPA implementation -->
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>eclipselink</artifactId>
+            <version>${eclipselink.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgres.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <compilerArgument>-proc:none</compilerArgument>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.bsc.maven</groupId>
+                <artifactId>maven-processor-plugin</artifactId>
+                <version>3.3.3</version>
+                <executions>
+                    <execution>
+                        <id>process</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <outputDirectory>target/metamodel</outputDirectory>
+                            <processors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </processors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/metamodel</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <properties>
+        <hibernate.version>5.4.0.Final</hibernate.version>
+        <eclipselink.version>2.7.4-RC1</eclipselink.version>
+        <postgres.version>42.2.5</postgres.version>
+        <javax.persistence-api.version>2.2</javax.persistence-api.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/entity/Article.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/entity/Article.java
new file mode 100644
index 0000000000..02082c3d92
--- /dev/null
+++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/entity/Article.java
@@ -0,0 +1,12 @@
+package com.baeldung.jpa.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity(name = "MyArticle")
+@Table(name = Article.TABLE_NAME)
+public class Article {
+
+    public static final String TABLE_NAME = "ARTICLES";
+
+}
diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/queryparams/Employee.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/queryparams/Employee.java
similarity index 100%
rename from persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/queryparams/Employee.java
rename to persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/queryparams/Employee.java
diff --git a/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 0000000000..560a75070c
--- /dev/null
+++ b/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
+             http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd"
+    version="2.2">
+
+    <persistence-unit name="jpa-h2-queryparams"
+        transaction-type="RESOURCE_LOCAL">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.queryparams.Employee</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver"
+                value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url"
+                value="jdbc:h2:mem:test" />
+            <property name="javax.persistence.jdbc.user"
+                value="sa" />
+            <property name="javax.persistence.jdbc.password"
+                value="" />
+            <property name="hibernate.dialect"
+                value="org.hibernate.dialect.H2Dialect" />
+            <property name="hibernate.hbm2ddl.auto"
+                value="create-drop" />
+            <property name="show_sql" value="true" />
+            <property
+                name="hibernate.temp.use_jdbc_metadata_defaults"
+                value="false" />
+            <property
+                name="javax.persistence.sql-load-script-source"
+                value="queryparams.sql" />
+        </properties>
+    </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/spring-cloud-data-flow/time-source/src/main/resources/logback.xml b/persistence-modules/java-jpa-2/src/main/resources/logback.xml
similarity index 68%
rename from spring-cloud-data-flow/time-source/src/main/resources/logback.xml
rename to persistence-modules/java-jpa-2/src/main/resources/logback.xml
index 7d900d8ea8..2527fea245 100644
--- a/spring-cloud-data-flow/time-source/src/main/resources/logback.xml
+++ b/persistence-modules/java-jpa-2/src/main/resources/logback.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <appender name="STDOUT"
+        class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} -
+                %msg%n
             </pattern>
         </encoder>
     </appender>
diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java
similarity index 94%
rename from persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java
rename to persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java
index 4f320935cf..55ee0e6e59 100644
--- a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java
+++ b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java
@@ -36,7 +36,7 @@ public class JPAQueryParamsUnitTest {
         TypedQuery<Employee> query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.empNumber = ?1", Employee.class);
         String empNumber = "A123";
         Employee employee = query.setParameter(1, empNumber)
-            .getSingleResult();
+          .getSingleResult();
         Assert.assertNotNull("Employee not found", employee);
     }
 
@@ -45,7 +45,7 @@ public class JPAQueryParamsUnitTest {
         TypedQuery<Employee> query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.empNumber IN (?1)", Employee.class);
         List<String> empNumbers = Arrays.asList("A123", "A124");
         List<Employee> employees = query.setParameter(1, empNumbers)
-            .getResultList();
+          .getResultList();
         Assert.assertNotNull("Employees not found", employees);
         Assert.assertFalse("Employees not found", employees.isEmpty());
     }
@@ -55,7 +55,7 @@ public class JPAQueryParamsUnitTest {
         TypedQuery<Employee> query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.empNumber = :number", Employee.class);
         String empNumber = "A123";
         Employee employee = query.setParameter("number", empNumber)
-            .getSingleResult();
+          .getSingleResult();
         Assert.assertNotNull("Employee not found", employee);
     }
 
@@ -64,7 +64,7 @@ public class JPAQueryParamsUnitTest {
         TypedQuery<Employee> query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.empNumber IN (:numbers)", Employee.class);
         List<String> empNumbers = Arrays.asList("A123", "A124");
         List<Employee> employees = query.setParameter("numbers", empNumbers)
-            .getResultList();
+          .getResultList();
         Assert.assertNotNull("Employees not found", employees);
         Assert.assertFalse("Employees not found", employees.isEmpty());
     }
@@ -75,8 +75,8 @@ public class JPAQueryParamsUnitTest {
         String empName = "John Doe";
         int empAge = 55;
         List<Employee> employees = query.setParameter("name", empName)
-            .setParameter("empAge", empAge)
-            .getResultList();
+          .setParameter("empAge", empAge)
+          .getResultList();
         Assert.assertNotNull("Employees not found!", employees);
         Assert.assertTrue("Employees not found!", !employees.isEmpty());
     }
@@ -89,7 +89,7 @@ public class JPAQueryParamsUnitTest {
         Root<Employee> c = cQuery.from(Employee.class);
         ParameterExpression<String> paramEmpNumber = cb.parameter(String.class);
         cQuery.select(c)
-            .where(cb.equal(c.get(Employee_.empNumber), paramEmpNumber));
+          .where(cb.equal(c.get(Employee_.empNumber), paramEmpNumber));
 
         TypedQuery<Employee> query = entityManager.createQuery(cQuery);
         String empNumber = "A123";
diff --git a/persistence-modules/java-jpa/src/test/resources/employees2.sql b/persistence-modules/java-jpa-2/src/test/resources/queryparams.sql
similarity index 100%
rename from persistence-modules/java-jpa/src/test/resources/employees2.sql
rename to persistence-modules/java-jpa-2/src/test/resources/queryparams.sql
diff --git a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
index 6a236f0840..1f16bee3ba 100644
--- a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
@@ -224,26 +224,4 @@
 				value="products_jpa.sql" />
 		</properties>
 	</persistence-unit>
-	
-	<persistence-unit name="jpa-h2-queryparams" transaction-type="RESOURCE_LOCAL">
-		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-		<class>com.baeldung.jpa.queryparams.Employee</class>
-		<exclude-unlisted-classes>true</exclude-unlisted-classes>
-		<properties>
-			<property name="javax.persistence.jdbc.driver"
-				value="org.h2.Driver" />
-			<property name="javax.persistence.jdbc.url"
-				value="jdbc:h2:mem:test" />
-			<property name="javax.persistence.jdbc.user" value="sa" />
-			<property name="javax.persistence.jdbc.password" value="" />
-			<property name="hibernate.dialect"
-				value="org.hibernate.dialect.H2Dialect" />
-			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
-			<property name="show_sql" value="true" />
-			<property name="hibernate.temp.use_jdbc_metadata_defaults"
-				value="false" />
-			<property name="javax.persistence.sql-load-script-source"
-				value="employees2.sql" />
-		</properties>
-	</persistence-unit>
 </persistence>
\ No newline at end of file
diff --git a/persistence-modules/java-sql2o/README.md b/persistence-modules/java-sql2o/README.md
index a86e45f1c8..d3586dc9ed 100644
--- a/persistence-modules/java-sql2o/README.md
+++ b/persistence-modules/java-sql2o/README.md
@@ -1,3 +1,3 @@
 ### Relevant Articles:
 
-- [A Guide to Sql2o](http://www.baeldung.com/sql2o)
+- [A Guide to Sql2o](https://www.baeldung.com/java-sql2o)
diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index 3d413109a7..4f52a2ff68 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -18,7 +18,6 @@
         <module>apache-cayenne</module>
         <module>core-java-persistence</module>
         <module>deltaspike</module>
-        <module>elasticsearch</module>
         <module>flyway</module>
         <module>hbase</module>
         <module>hibernate5</module>
@@ -29,6 +28,7 @@
         <module>java-cockroachdb</module>
         <module>java-jdbi</module>
         <module>java-jpa</module>
+        <module>java-jpa-2</module>
         <module>java-mongodb</module>
         <module>java-sql2o</module>
         <module>jnosql</module>
diff --git a/persistence-modules/spring-boot-mysql/README.md b/persistence-modules/spring-boot-mysql/README.md
new file mode 100644
index 0000000000..a5043f965d
--- /dev/null
+++ b/persistence-modules/spring-boot-mysql/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles:
+
+- [Setting the MySQL JDBC Timezone Using Spring Boot Configuration](https://www.baeldung.com/mysql-jdbc-timezone-spring-boot)
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/daos/PhotoRepository.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/daos/PhotoRepository.java
similarity index 62%
rename from persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/daos/PhotoRepository.java
rename to persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/daos/PhotoRepository.java
index d38e11c055..dc18df7b0a 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/daos/PhotoRepository.java
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/daos/PhotoRepository.java
@@ -1,8 +1,8 @@
-package com.baeldung.mongodb.daos;
+package com.baeldung.mongodb.file.daos;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.baeldung.mongodb.models.Photo;
+import com.baeldung.mongodb.file.models.Photo;
 
 public interface PhotoRepository extends MongoRepository<Photo, String> {
 
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/models/Photo.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/models/Photo.java
similarity index 95%
rename from persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/models/Photo.java
rename to persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/models/Photo.java
index 13f1a3cd19..afb79b4dbb 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/models/Photo.java
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/models/Photo.java
@@ -1,4 +1,4 @@
-package com.baeldung.mongodb.models;
+package com.baeldung.mongodb.file.models;
 
 import org.bson.types.Binary;
 import org.springframework.data.annotation.Id;
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/models/Video.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/models/Video.java
similarity index 93%
rename from persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/models/Video.java
rename to persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/models/Video.java
index 617f0cdbfd..9e60fd1746 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/models/Video.java
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/models/Video.java
@@ -1,4 +1,4 @@
-package com.baeldung.mongodb.models;
+package com.baeldung.mongodb.file.models;
 
 import java.io.InputStream;
 
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/services/PhotoService.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/services/PhotoService.java
similarity index 83%
rename from persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/services/PhotoService.java
rename to persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/services/PhotoService.java
index d8d7541c76..8d0313b280 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/services/PhotoService.java
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/services/PhotoService.java
@@ -1,4 +1,4 @@
-package com.baeldung.mongodb.services;
+package com.baeldung.mongodb.file.services;
 
 import java.io.IOException;
 
@@ -8,8 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.baeldung.mongodb.daos.PhotoRepository;
-import com.baeldung.mongodb.models.Photo;
+import com.baeldung.mongodb.file.daos.PhotoRepository;
+import com.baeldung.mongodb.file.models.Photo;
 
 @Service
 public class PhotoService {
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/services/VideoService.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/services/VideoService.java
similarity index 94%
rename from persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/services/VideoService.java
rename to persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/services/VideoService.java
index ade1f7c73a..e4d3237bb1 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/services/VideoService.java
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/services/VideoService.java
@@ -1,4 +1,4 @@
-package com.baeldung.mongodb.services;
+package com.baeldung.mongodb.file.services;
 
 import java.io.IOException;
 
@@ -11,7 +11,7 @@ import org.springframework.data.mongodb.gridfs.GridFsTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.baeldung.mongodb.models.Video;
+import com.baeldung.mongodb.file.models.Video;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 import com.mongodb.client.gridfs.model.GridFSFile;
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/web/PhotoController.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/web/PhotoController.java
similarity index 90%
rename from persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/web/PhotoController.java
rename to persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/web/PhotoController.java
index 4d5746f0d8..55de8ffd1d 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/web/PhotoController.java
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/web/PhotoController.java
@@ -1,4 +1,4 @@
-package com.baeldung.mongodb.web;
+package com.baeldung.mongodb.file.web;
 
 import java.io.IOException;
 import java.util.Base64;
@@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.baeldung.mongodb.models.Photo;
-import com.baeldung.mongodb.services.PhotoService;
+import com.baeldung.mongodb.file.models.Photo;
+import com.baeldung.mongodb.file.services.PhotoService;
 
 @Controller
 public class PhotoController {
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/web/VideoController.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/web/VideoController.java
similarity index 92%
rename from persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/web/VideoController.java
rename to persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/web/VideoController.java
index 313ce9e650..cbe8c5d7da 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/web/VideoController.java
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/web/VideoController.java
@@ -1,4 +1,4 @@
-package com.baeldung.mongodb.web;
+package com.baeldung.mongodb.file.web;
 
 import java.io.IOException;
 
@@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.baeldung.mongodb.models.Video;
-import com.baeldung.mongodb.services.VideoService;
+import com.baeldung.mongodb.file.models.Video;
+import com.baeldung.mongodb.file.services.VideoService;
 
 @Controller
 public class VideoController {
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/AccountRepository.java b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/AccountRepository.java
new file mode 100644
index 0000000000..2fb26c2db6
--- /dev/null
+++ b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/AccountRepository.java
@@ -0,0 +1,11 @@
+package com.baeldung.hibernate.dynamicupdate;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.hibernate.dynamicupdate.model.Account;
+
+@Repository
+public interface AccountRepository extends JpaRepository<Account, Integer> {
+
+}
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateConfig.java b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateConfig.java
new file mode 100644
index 0000000000..4871a3d1e2
--- /dev/null
+++ b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateConfig.java
@@ -0,0 +1,80 @@
+package com.baeldung.hibernate.dynamicupdate;
+
+import java.util.Properties;
+
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+
+import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.JpaVendorAdapter;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import com.google.common.base.Preconditions;
+
+@EnableTransactionManagement
+@Configuration
+@PropertySource({ "classpath:persistence-h2.properties" })
+@EnableJpaRepositories(basePackages = { "com.baeldung.hibernate.dynamicupdate" })
+@ComponentScan({ "com.baeldung.hibernate.dynamicupdate" })
+public class DynamicUpdateConfig {
+
+    @Autowired
+    private Environment env;
+
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+        LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(dataSource());
+        em.setPackagesToScan(new String[] { "com.baeldung.hibernate.dynamicupdate.model" });
+
+        JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+        em.setJpaVendorAdapter(vendorAdapter);
+        em.setJpaProperties(additionalProperties());
+
+        return em;
+    }
+
+    @Bean
+    public DataSource dataSource() {
+        final BasicDataSource dataSource = new BasicDataSource();
+        dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
+        dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
+        dataSource.setUsername(env.getProperty("jdbc.user"));
+        dataSource.setPassword(env.getProperty("jdbc.pass"));
+
+        return dataSource;
+    }
+
+    @Bean
+    public PlatformTransactionManager transactionManager(EntityManagerFactory emf) {
+        JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(emf);
+
+        return transactionManager;
+    }
+
+    @Bean
+    public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
+        return new PersistenceExceptionTranslationPostProcessor();
+    }
+
+    Properties additionalProperties() {
+        Properties properties = new Properties();
+        properties.setProperty("hibernate.hbm2ddl.auto", Preconditions.checkNotNull(env.getProperty("hibernate.hbm2ddl.auto")));
+        properties.setProperty("hibernate.dialect", Preconditions.checkNotNull(env.getProperty("hibernate.dialect")));
+        properties.setProperty("hibernate.show_sql", "true");
+        return properties;
+    }
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/model/Account.java b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/model/Account.java
new file mode 100644
index 0000000000..b3753112fe
--- /dev/null
+++ b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/model/Account.java
@@ -0,0 +1,97 @@
+package com.baeldung.hibernate.dynamicupdate.model;
+
+import java.text.MessageFormat;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.DynamicUpdate;
+
+@Entity
+@DynamicUpdate
+public class Account {
+
+    @Id
+    private int id;
+
+    @Column
+    private String name;
+
+    @Column
+    private String type;
+
+    @Column
+    private boolean active;
+
+    public Account() {
+    }
+
+    public Account(int id, String name, String type, boolean active) {
+        super();
+        this.id = id;
+        this.name = name;
+        this.type = type;
+        this.active = active;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + id;
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Account other = (Account) obj;
+        if (id != other.id)
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return MessageFormat.format("id:{0}, name:{1}, active:{2}, type:{3}", id, name, active, type);
+    }
+
+}
diff --git a/persistence-modules/spring-hibernate-5/src/main/resources/logback.xml b/persistence-modules/spring-hibernate-5/src/main/resources/logback.xml
index ec0dc2469a..035520aa15 100644
--- a/persistence-modules/spring-hibernate-5/src/main/resources/logback.xml
+++ b/persistence-modules/spring-hibernate-5/src/main/resources/logback.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>web - %date [%thread] %-5level %logger{36} - %message%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.springframework" level="WARN" />
-    <logger name="org.springframework.transaction" level="WARN" />
-
-    <!-- in order to debug some marshalling issues, this needs to be TRACE -->
-    <logger name="org.springframework.web.servlet.mvc" level="WARN" />
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>web - %date [%thread] %-5level %logger{36} - %message%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.springframework" level="WARN" />
+    <logger name="org.springframework.transaction" level="WARN" />
+
+    <!-- in order to debug some marshalling issues, this needs to be TRACE -->
+    <logger name="org.springframework.web.servlet.mvc" level="WARN" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
 </configuration>
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateIntegrationTest.java b/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateIntegrationTest.java
new file mode 100644
index 0000000000..fc183d1f19
--- /dev/null
+++ b/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateIntegrationTest.java
@@ -0,0 +1,44 @@
+package com.baeldung.hibernate.dynamicupdate;
+
+import javax.transaction.Transactional;
+
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.Commit;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.hibernate.dynamicupdate.model.Account;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = DynamicUpdateConfig.class, loader = AnnotationConfigContextLoader.class)
+@Transactional
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class DynamicUpdateIntegrationTest {
+
+    private static final Integer ACCOUNT_ID = 1;
+
+    @Autowired
+    private AccountRepository accountRepository;
+
+    @Test
+    @Commit
+    public void testA_whenTestAccountIsSaved_thenSuccess() {
+        Account account = new Account(ACCOUNT_ID, "account1", "regional", true);
+        accountRepository.save(account);
+    }
+
+    @Test
+    @Commit
+    // Enable Hibernate's debug logging in logback.xml to see the generated SQL statement.
+    public void testB_whenAccountNameUpdated_thenSuccess() {
+        Account account = accountRepository.findOne(ACCOUNT_ID);
+        account.setName("Test Account");
+        accountRepository.save(account);
+    }
+
+}
diff --git a/persistence-modules/spring-mybatis/pom.xml b/persistence-modules/spring-mybatis/pom.xml
new file mode 100644
index 0000000000..ecdcd1d923
--- /dev/null
+++ b/persistence-modules/spring-mybatis/pom.xml
@@ -0,0 +1,113 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-mybatis</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-mybatis</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+
+        <!-- Spring -->
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+
+        <!-- SpringBoot -->
+
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- Persistence -->
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>${mybatis.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-spring</artifactId>
+            <version>${spring-mybatis.version}</version>
+        </dependency>
+
+        <!-- test scoped -->
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${org.springframework.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>spring-mybatis</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+        <!-- Spring -->
+        <org.springframework.version>5.1.8.RELEASE</org.springframework.version>
+
+        <!-- persistence -->
+        <spring-mybatis.version>2.0.2</spring-mybatis.version>
+        <mybatis.version>3.5.2</mybatis.version>
+        <mybatis-spring-boot-starter.version>2.1.0</mybatis-spring-boot-starter.version>
+        <h2.version>1.4.197</h2.version>
+
+        <!-- testing -->
+        <assertj-core.version>3.8.0</assertj-core.version>
+
+    </properties>
+
+</project>
diff --git a/persistence-modules/spring-mybatis/src/main/java/com/baeldung/mybatis/spring/Article.java b/persistence-modules/spring-mybatis/src/main/java/com/baeldung/mybatis/spring/Article.java
new file mode 100644
index 0000000000..90e4ce6170
--- /dev/null
+++ b/persistence-modules/spring-mybatis/src/main/java/com/baeldung/mybatis/spring/Article.java
@@ -0,0 +1,19 @@
+package com.baeldung.mybatis.spring;
+
+public class Article {
+    private Long id;
+    private String title;
+    private String author;
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+}
diff --git a/persistence-modules/spring-mybatis/src/main/java/com/baeldung/mybatis/spring/ArticleMapper.java b/persistence-modules/spring-mybatis/src/main/java/com/baeldung/mybatis/spring/ArticleMapper.java
new file mode 100644
index 0000000000..db5b3675f4
--- /dev/null
+++ b/persistence-modules/spring-mybatis/src/main/java/com/baeldung/mybatis/spring/ArticleMapper.java
@@ -0,0 +1,11 @@
+package com.baeldung.mybatis.spring;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface ArticleMapper {
+    @Select("SELECT * FROM ARTICLES WHERE id = #{id}")
+    Article getArticle(@Param("id") Long id);
+}
diff --git a/persistence-modules/spring-mybatis/src/main/java/com/baeldung/mybatis/spring/PersistenceAutoConfig.java b/persistence-modules/spring-mybatis/src/main/java/com/baeldung/mybatis/spring/PersistenceAutoConfig.java
new file mode 100644
index 0000000000..72f754c01d
--- /dev/null
+++ b/persistence-modules/spring-mybatis/src/main/java/com/baeldung/mybatis/spring/PersistenceAutoConfig.java
@@ -0,0 +1,14 @@
+package com.baeldung.mybatis.spring;
+
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
+
+@SpringBootConfiguration
+@EnableAutoConfiguration
+@ComponentScan(basePackages = { "com.baeldung.mybatis" }, excludeFilters = {
+  @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = { PersistenceConfig.class })
+})
+public class PersistenceAutoConfig {
+}
diff --git a/persistence-modules/spring-mybatis/src/main/java/com/baeldung/mybatis/spring/PersistenceConfig.java b/persistence-modules/spring-mybatis/src/main/java/com/baeldung/mybatis/spring/PersistenceConfig.java
new file mode 100644
index 0000000000..f02e04e5a1
--- /dev/null
+++ b/persistence-modules/spring-mybatis/src/main/java/com/baeldung/mybatis/spring/PersistenceConfig.java
@@ -0,0 +1,37 @@
+package com.baeldung.mybatis.spring;
+
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.annotation.MapperScan;
+import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+
+import javax.sql.DataSource;
+
+@Configuration
+@MapperScan("com.baeldung.mybatis")
+@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class, MybatisAutoConfiguration.class })
+public class PersistenceConfig {
+
+    @Bean
+    public DataSource dataSource() {
+        return new EmbeddedDatabaseBuilder()
+          .setType(EmbeddedDatabaseType.H2)
+          .addScript("schema.sql")
+          .addScript("data.sql")
+          .build();
+    }
+
+    @Bean
+    public SqlSessionFactory sqlSessionFactory() throws Exception {
+        SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean();
+        factoryBean.setDataSource(dataSource());
+        return factoryBean.getObject();
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-mybatis/src/main/resources/beans.xml b/persistence-modules/spring-mybatis/src/main/resources/beans.xml
new file mode 100644
index 0000000000..6ed82b7934
--- /dev/null
+++ b/persistence-modules/spring-mybatis/src/main/resources/beans.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns="http://www.springframework.org/schema/beans"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
+
+
+    <jdbc:embedded-database id="dataSource" type="H2">
+        <jdbc:script location="schema.sql"/>
+        <jdbc:script location="data.sql"/>
+    </jdbc:embedded-database>
+
+    <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
+        <property name="dataSource" ref="dataSource"/>
+    </bean>
+
+    <bean id="articleMapper" class="org.mybatis.spring.mapper.MapperFactoryBean">
+        <property name="mapperInterface" value="com.baeldung.mybatis.spring.ArticleMapper"/>
+        <property name="sqlSessionFactory" ref="sqlSessionFactory"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/persistence-modules/spring-mybatis/src/main/resources/data.sql b/persistence-modules/spring-mybatis/src/main/resources/data.sql
new file mode 100644
index 0000000000..86203bf561
--- /dev/null
+++ b/persistence-modules/spring-mybatis/src/main/resources/data.sql
@@ -0,0 +1,3 @@
+TRUNCATE TABLE ARTICLES;
+INSERT INTO ARTICLES
+VALUES (1, 'Working with MyBatis in Spring', 'Baeldung');
\ No newline at end of file
diff --git a/persistence-modules/spring-mybatis/src/main/resources/schema.sql b/persistence-modules/spring-mybatis/src/main/resources/schema.sql
new file mode 100644
index 0000000000..807e1ec624
--- /dev/null
+++ b/persistence-modules/spring-mybatis/src/main/resources/schema.sql
@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS `ARTICLES`
+(
+    `id`     INTEGER PRIMARY KEY,
+    `title`  VARCHAR(100) NOT NULL,
+    `author` VARCHAR(100) NOT NULL
+);
diff --git a/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperBootIntegrationTest.java b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperBootIntegrationTest.java
new file mode 100644
index 0000000000..531356ffa2
--- /dev/null
+++ b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperBootIntegrationTest.java
@@ -0,0 +1,13 @@
+package com.baeldung.mybatis.spring;
+
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ContextConfiguration(classes = PersistenceAutoConfig.class)
+public class ArticleMapperBootIntegrationTest extends ArticleMapperCommonTest {
+
+}
diff --git a/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperCommonTest.java b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperCommonTest.java
new file mode 100644
index 0000000000..33071dc0c1
--- /dev/null
+++ b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperCommonTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.mybatis.spring;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ArticleMapperCommonTest {
+
+    @Autowired
+    ArticleMapper articleMapper;
+
+    @Test
+    public void whenRecordsInDatabase_shouldReturnArticleWithGivenId() {
+        Article article = articleMapper.getArticle(1L);
+
+        assertThat(article).isNotNull();
+        assertThat(article.getId()).isEqualTo(1L);
+        assertThat(article.getAuthor()).isEqualTo("Baeldung");
+        assertThat(article.getTitle()).isEqualTo("Working with MyBatis in Spring");
+    }
+}
diff --git a/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperIntegrationTest.java b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperIntegrationTest.java
new file mode 100644
index 0000000000..9298714cb2
--- /dev/null
+++ b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperIntegrationTest.java
@@ -0,0 +1,11 @@
+package com.baeldung.mybatis.spring;
+
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = PersistenceConfig.class)
+public class ArticleMapperIntegrationTest extends ArticleMapperCommonTest {
+
+}
diff --git a/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperXMLIntegrationTest.java b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperXMLIntegrationTest.java
new file mode 100644
index 0000000000..de8974d4ad
--- /dev/null
+++ b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperXMLIntegrationTest.java
@@ -0,0 +1,11 @@
+package com.baeldung.mybatis.spring;
+
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath:/beans.xml")
+public class ArticleMapperXMLIntegrationTest extends ArticleMapperCommonTest {
+
+}
diff --git a/pom.xml b/pom.xml
index 5b5058763d..afe165cf4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,10 +10,6 @@
 	<name>parent-modules</name>
 	<packaging>pom</packaging>
 
-	<modules>
-		<module>quarkus</module>
-	</modules>
-
 	<dependencies>
 		<!-- logging -->
 		<dependency>
@@ -473,6 +469,8 @@
                 <!-- <module>java-streams-2</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
                 <module>java-strings</module>
                 <module>java-strings-2</module>
+                <module>java-strings-3</module>
+                <module>java-strings-ops</module>
                 <module>java-vavr-stream</module>
                 <module>java-websocket</module>
                 <module>javafx</module>
@@ -506,6 +504,7 @@
 				<module>libraries</module>
 				<module>libraries-2</module>
 				<module>libraries-data</module>
+				<module>libraries-data-2</module>
 				<module>libraries-apache-commons</module>
 				<module>libraries-primitive</module>
 				<module>libraries-security</module>
@@ -627,7 +626,6 @@
 				<module>spring-akka</module>
 				<module>spring-all</module>
 				<module>spring-amqp</module>
-				<module>spring-amqp-simple</module>
 				<module>spring-aop</module>
 				<module>spring-apache-camel</module>
 				<module>spring-batch</module>
@@ -666,22 +664,23 @@
 				<module>spring-boot-libraries</module>
 
 				
-                                <!-- <module>spring-cloud</module> --> <!-- BAEL-14304 -->
-				<!-- <module>spring-cloud-bus</module> --> <!-- BAEL-14304 -->
+				<module>spring-cloud</module>
+				<module>spring-cloud-bus</module>
 				<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-                                <!-- <module>spring-cloud-data-flow</module> --> <!-- BAEL-14304 -->
+				<module>spring-cloud-data-flow</module>
 
 				<module>spring-core</module>
 				<module>spring-core-2</module>
 				<module>spring-cucumber</module>
 
 				<module>spring-data-rest</module>
-				<!-- <module>spring-data-rest-querydsl</module> --> <!-- BAEL-14304 -->
+				<module>spring-data-rest-querydsl</module>
 				<module>spring-dispatcher-servlet</module>
 				<module>spring-drools</module>
+				<module>spring-di</module>
 
 				<module>spring-ehcache</module>
-				<!-- <module>spring-ejb</module> BAEL-14304 -->
+				<module>spring-ejb</module>
 				<module>spring-exceptions</module>
 
 				<module>spring-freemarker</module>
@@ -734,8 +733,6 @@
 				<module>spring-security-angular/server</module>
 				<module>spring-security-cache-control</module>
 
-				<module>spring-security-client</module>
-
 				<module>spring-security-core</module>
 				<module>spring-security-mvc-boot</module>
 				<module>spring-security-mvc-custom</module>
@@ -755,7 +752,7 @@
 				<module>spring-security-stormpath</module>
 				<module>spring-security-thymeleaf</module>
 				<module>spring-security-x509</module>
-				<!-- <module>spring-session</module> BAEL-14304 -->
+				<module>spring-session</module>
 				<module>spring-sleuth</module>
 				<module>spring-soap</module>
 				<module>spring-social-login</module>
@@ -766,10 +763,10 @@
 
 				<module>spring-thymeleaf</module>
 
-				<!-- <module>spring-vault</module> BAEL-14304 -->
+				<module>spring-vault</module>
 				<module>spring-vertx</module>
 
-				<!-- <module>spring-webflux-amqp</module> BAEL-14304 --> <!-- long --> 
+				<module>spring-webflux-amqp</module> <!-- long --> 
 
 				<module>spring-zuul</module>
 
@@ -878,10 +875,12 @@
 				<module>spring-data-rest</module>
 				<module>spring-dispatcher-servlet</module>
 				<module>spring-drools</module>
+				<module>spring-di</module>
 				<module>spring-ehcache</module>
 				<module>spring-freemarker</module>
 				<module>persistence-modules/spring-hibernate-3</module>
 				<module>persistence-modules/spring-hibernate4</module>
+				<module>persistence-modules/spring-mybatis</module>
 				<module>spring-integration</module>
 				<module>spring-jenkins-pipeline</module>
 				<module>spring-jersey</module>
@@ -913,7 +912,6 @@
 				<module>spring-security-acl</module>
 				<module>spring-security-angular</module>
 				<module>spring-security-cache-control</module>
-				<module>spring-security-client</module>
 				<module>spring-security-core</module>
 				<module>spring-security-mvc-boot</module>
 				<module>spring-security-mvc-custom</module>
@@ -1001,6 +999,7 @@
 				<module>persistence-modules/hibernate5</module>
 				<module>persistence-modules/hibernate-mapping</module>
 				<module>persistence-modules/java-jpa</module>
+				<module>persistence-modules/java-jpa-2</module>
 				<module>persistence-modules/java-mongodb</module>
 				<module>persistence-modules/jnosql</module>
 
@@ -1166,6 +1165,8 @@
 				<!-- <module>java-streams-2</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
 				<module>java-strings</module>
 				<module>java-strings-2</module>
+				<module>java-strings-3</module>
+				<module>java-strings-ops</module>
 				<module>java-vavr-stream</module>
 				<module>java-websocket</module>
 				<module>javafx</module>
@@ -1197,6 +1198,7 @@
 				<!-- <module>lagom</module> --> <!-- Not a maven project -->
 				<module>libraries</module>
 				<module>libraries-data</module>
+				<module>libraries-data-2</module>
 				<module>libraries-apache-commons</module>
 				<module>libraries-security</module>
 				<module>libraries-server</module>
@@ -1302,7 +1304,6 @@
 				<module>spring-akka</module>
 				<module>spring-all</module>
 				<module>spring-amqp</module>
-				<module>spring-amqp-simple</module>
 				<module>spring-aop</module>
 				<module>spring-apache-camel</module>
 				<module>spring-batch</module>
@@ -1349,6 +1350,7 @@
 				<module>spring-data-rest-querydsl</module>
 				<module>spring-dispatcher-servlet</module>
 				<module>spring-drools</module>
+				<module>spring-di</module>
 
 				<module>spring-ehcache</module>
 				<module>spring-ejb</module>
@@ -1404,9 +1406,6 @@
 				<module>spring-security-acl</module>
 				<module>spring-security-angular/server</module>
 				<module>spring-security-cache-control</module>
-
-				<module>spring-security-client</module>
-
 				<module>spring-security-core</module>
 				<module>spring-security-mvc-boot</module>
 				<module>spring-security-mvc-custom</module>
@@ -1511,6 +1510,7 @@
 
 				<module>persistence-modules/hibernate5</module>
 				<module>persistence-modules/java-jpa</module>
+				<module>persistence-modules/java-jpa-2</module>
 				<module>persistence-modules/java-mongodb</module>
 				<module>persistence-modules/jnosql</module>
 
@@ -1589,4 +1589,6 @@
 		<lombok.version>1.16.12</lombok.version>
 		<h2.version>1.4.197</h2.version>
 	</properties>
+
 </project>
+
diff --git a/quarkus/pom.xml b/quarkus/pom.xml
index d8f274df6d..ceb2e2c0d4 100644
--- a/quarkus/pom.xml
+++ b/quarkus/pom.xml
@@ -7,7 +7,7 @@
   <version>1.0-SNAPSHOT</version>
   <properties>
     <surefire-plugin.version>2.22.0</surefire-plugin.version>
-    <quarkus.version>0.13.1</quarkus.version>
+    <quarkus.version>0.15.0</quarkus.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java b/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java
index 4b19de1b63..4c505fbabe 100644
--- a/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java
+++ b/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java
@@ -8,7 +8,7 @@ import javax.enterprise.context.ApplicationScoped;
 public class HelloService {
 
     @ConfigProperty(name = "greeting")
-    private String greeting;
+    String greeting;
 
     public String politeHello(String name){
         return greeting + " " + name;
diff --git a/spring-5-mvc/pom.xml b/spring-5-mvc/pom.xml
index 1d96df3d03..9569d52abf 100644
--- a/spring-5-mvc/pom.xml
+++ b/spring-5-mvc/pom.xml
@@ -3,9 +3,7 @@
     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>
-    <groupId>com.baeldung</groupId>
     <artifactId>spring-5-mvc</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>spring-5-mvc</name>
     <description>spring 5 MVC sample project about new features</description>
     <packaging>jar</packaging>
@@ -83,6 +81,11 @@
             <version>${jayway-rest-assured.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.javafaker</groupId>
+            <artifactId>javafaker</artifactId>
+            <version>0.18</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/Application.java b/spring-5-mvc/src/main/java/com/baeldung/idc/Application.java
similarity index 60%
rename from spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/Application.java
rename to spring-5-mvc/src/main/java/com/baeldung/idc/Application.java
index 329b104143..7288aded73 100644
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/Application.java
+++ b/spring-5-mvc/src/main/java/com/baeldung/idc/Application.java
@@ -1,11 +1,10 @@
-package org.baeldung.config;
+package com.baeldung.idc;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class Application extends SpringBootServletInitializer {
+public class Application {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
diff --git a/spring-5-mvc/src/main/java/com/baeldung/idc/Book.java b/spring-5-mvc/src/main/java/com/baeldung/idc/Book.java
new file mode 100644
index 0000000000..387f7049e1
--- /dev/null
+++ b/spring-5-mvc/src/main/java/com/baeldung/idc/Book.java
@@ -0,0 +1,55 @@
+package com.baeldung.idc;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class Book {
+
+    private final int id;
+
+    private final String title;
+
+    private final String author;
+
+    private final String genre;
+    
+    public Book() {
+        this(-1, "", "", "");
+    }
+
+    public Book(int id, String title, String author, String genre) {
+        this.id = id;
+        this.title = title;
+        this.author = author;
+        this.genre = genre;
+    }
+
+    /**
+     * @return the id
+     */
+    public int getId() {
+        return id;
+    }
+
+    /**
+     * @return the title
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * @return the author
+     */
+    public String getAuthor() {
+        return author;
+    }
+
+    /**
+     * @return the genre
+     */
+    public String getGenre() {
+        return genre;
+    }
+
+}
diff --git a/spring-5-mvc/src/main/java/com/baeldung/idc/BookController.java b/spring-5-mvc/src/main/java/com/baeldung/idc/BookController.java
new file mode 100644
index 0000000000..5b2349715d
--- /dev/null
+++ b/spring-5-mvc/src/main/java/com/baeldung/idc/BookController.java
@@ -0,0 +1,34 @@
+package com.baeldung.idc;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/book")
+public class BookController implements BookOperations {
+
+    private BookRepository repo;
+    
+    public BookController(BookRepository repo) {
+        this.repo = repo;
+    }
+
+    @Override
+    public List<Book> getAll() {
+        return repo.getItems();
+    }
+
+    @Override
+    public Optional<Book> getById(int id) {
+        return repo.getById(id);
+    }
+
+    @Override
+    public void save(Book book, int id) {
+        repo.save(id, book);
+    }
+
+}
diff --git a/spring-5-mvc/src/main/java/com/baeldung/idc/BookOperations.java b/spring-5-mvc/src/main/java/com/baeldung/idc/BookOperations.java
new file mode 100644
index 0000000000..70b44561af
--- /dev/null
+++ b/spring-5-mvc/src/main/java/com/baeldung/idc/BookOperations.java
@@ -0,0 +1,23 @@
+package com.baeldung.idc;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/default")
+public interface BookOperations {
+
+    @GetMapping("/")
+    List<Book> getAll();
+
+    @GetMapping("/{id}")
+    Optional<Book> getById(@PathVariable int id);
+
+    @PostMapping("/save/{id}")
+    public void save(@RequestBody Book book, @PathVariable int id);
+}
diff --git a/spring-5-mvc/src/main/java/com/baeldung/idc/BookRepository.java b/spring-5-mvc/src/main/java/com/baeldung/idc/BookRepository.java
new file mode 100644
index 0000000000..0550b3b79a
--- /dev/null
+++ b/spring-5-mvc/src/main/java/com/baeldung/idc/BookRepository.java
@@ -0,0 +1,61 @@
+package com.baeldung.idc;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import javax.annotation.PostConstruct;
+
+import org.springframework.stereotype.Component;
+
+import com.github.javafaker.Faker;
+
+/**
+ * Repository for storing the books.
+ * 
+ * It serves just for illustrative purposes and is completely in-memory. It uses Java Faker library in order to generate data.
+ * 
+ * @author A.Shcherbakov
+ *
+ */
+@Component
+public class BookRepository {
+
+    private List<Book> items;
+
+    @PostConstruct
+    public void init() {
+        Faker faker = new Faker(Locale.ENGLISH);
+        final com.github.javafaker.Book book = faker.book();
+        this.items = IntStream.range(1, faker.random()
+            .nextInt(10, 20))
+            .mapToObj(i -> new Book(i, book.title(), book.author(), book.genre()))
+            .collect(Collectors.toList());
+
+    }
+
+    public int getCount() {
+        return items.size();
+    }
+
+    public List<Book> getItems() {
+        return items;
+    }
+
+    public Optional<Book> getById(int id) {
+        return this.items.stream()
+            .filter(item -> id == item.getId())
+            .findFirst();
+    }
+
+    public void save(int id, Book book) {
+        IntStream.range(0, items.size())
+            .filter(i -> items.get(i)
+                .getId() == id)
+            .findFirst()
+            .ifPresent(i -> this.items.set(i, book));
+    }
+
+}
diff --git a/spring-5-reactive-2/pom.xml b/spring-5-reactive-2/pom.xml
index 668e0e5cf9..f1407ee1ad 100644
--- a/spring-5-reactive-2/pom.xml
+++ b/spring-5-reactive-2/pom.xml
@@ -32,6 +32,13 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
+        
+         <dependency>
+        	<groupId>com.github.tomakehurst</groupId>
+        	<artifactId>wiremock-jre8</artifactId>
+        	<version>${wiremock.version}</version>
+        	<scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -46,5 +53,9 @@
             </plugin>
         </plugins>
     </build>
+    
+    <properties>
+    	<wiremock.version>2.24.0</wiremock.version>
+    </properties>
 
 </project>
diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java b/spring-5-reactive-2/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java
new file mode 100644
index 0000000000..c98caf67b4
--- /dev/null
+++ b/spring-5-reactive-2/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java
@@ -0,0 +1,57 @@
+package com.baeldung.webclient.filter;
+
+import java.io.PrintStream;
+import java.net.URI;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpMethod;
+import org.springframework.web.reactive.function.client.ClientRequest;
+import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
+
+public class WebClientFilters {
+
+    private static final Logger LOG = LoggerFactory.getLogger(WebClientFilters.class);
+
+    public static ExchangeFilterFunction demoFilter() {
+        ExchangeFilterFunction filterFunction = (clientRequest, nextFilter) -> {
+            LOG.info("WebClient fitler executed");
+            return nextFilter.exchange(clientRequest);
+        };
+        return filterFunction;
+    }
+
+    public static ExchangeFilterFunction countingFilter(AtomicInteger getCounter) {
+        ExchangeFilterFunction countingFilter = (clientRequest, nextFilter) -> {
+            HttpMethod httpMethod = clientRequest.method();
+            if (httpMethod == HttpMethod.GET) {
+                getCounter.incrementAndGet();
+            }
+            return nextFilter.exchange(clientRequest);
+        };
+        return countingFilter;
+    }
+
+    public static ExchangeFilterFunction urlModifyingFilter(String version) {
+        ExchangeFilterFunction urlModifyingFilter = (clientRequest, nextFilter) -> {
+            String oldUrl = clientRequest.url()
+                .toString();
+            URI newUrl = URI.create(oldUrl + "/" + version);
+            ClientRequest filteredRequest = ClientRequest.from(clientRequest)
+                .url(newUrl)
+                .build();
+            return nextFilter.exchange(filteredRequest);
+        };
+        return urlModifyingFilter;
+    }
+
+    public static ExchangeFilterFunction loggingFilter(PrintStream printStream) {
+        ExchangeFilterFunction loggingFilter = (clientRequest, nextFilter) -> {
+            printStream.print("Sending request " + clientRequest.method() + " " + clientRequest.url());
+            return nextFilter.exchange(clientRequest);
+        };
+        return loggingFilter;
+    }
+
+}
diff --git a/spring-5-reactive-2/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java b/spring-5-reactive-2/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java
new file mode 100644
index 0000000000..675cd03d10
--- /dev/null
+++ b/spring-5-reactive-2/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java
@@ -0,0 +1,145 @@
+package com.baeldung.webclient.filter;
+
+import static com.baeldung.webclient.filter.WebClientFilters.countingFilter;
+import static com.baeldung.webclient.filter.WebClientFilters.loggingFilter;
+import static com.baeldung.webclient.filter.WebClientFilters.urlModifyingFilter;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.verify;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.URI;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.springframework.web.reactive.function.client.ExchangeFilterFunctions;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+public class FilteredWebClientUnitTest {
+
+    private static final String PATH = "/filter/test";
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicPort()
+        .dynamicHttpsPort());
+
+    @Test
+    public void whenNoUrlModifyingFilter_thenPathUnchanged() {
+        stubFor(get(urlPathEqualTo(PATH)).willReturn(aResponse().withStatus(200)
+            .withBody("done")));
+
+        WebClient webClient = WebClient.create();
+        String actual = sendGetRequest(webClient);
+
+        assertThat(actual).isEqualTo("done");
+        verify(getRequestedFor(urlPathEqualTo(PATH)));
+    }
+
+    @Test
+    public void whenUrlModifyingFilter_thenPathModified() {
+        stubFor(get(urlPathEqualTo(PATH + "/1.0")).willReturn(aResponse().withStatus(200)
+            .withBody("done")));
+
+        WebClient webClient = WebClient.builder()
+            .filter(urlModifyingFilter("1.0"))
+            .build();
+        String actual = sendGetRequest(webClient);
+
+        assertThat(actual).isEqualTo("done");
+        verify(getRequestedFor(urlPathEqualTo(PATH + "/1.0")));
+    }
+
+    @Test
+    public void givenCountingFilter_whenGet_thenIncreaseCounter() {
+        stubFor(get(urlPathEqualTo(PATH)).willReturn(aResponse().withStatus(200)
+            .withBody("done")));
+        AtomicInteger counter = new AtomicInteger(10);
+
+        WebClient webClient = WebClient.builder()
+            .filter(countingFilter(counter))
+            .build();
+        String actual = sendGetRequest(webClient);
+
+        assertThat(actual).isEqualTo("done");
+        assertThat(counter.get()).isEqualTo(11);
+    }
+
+    @Test
+    public void givenCountingFilter_whenPost_thenDoNotIncreaseCounter() {
+        stubFor(post(urlPathEqualTo(PATH)).willReturn(aResponse().withStatus(200)
+            .withBody("done")));
+        AtomicInteger counter = new AtomicInteger(10);
+
+        WebClient webClient = WebClient.builder()
+            .filter(countingFilter(counter))
+            .build();
+        String actual = sendPostRequest(webClient);
+
+        assertThat(actual).isEqualTo("done");
+        assertThat(counter.get()).isEqualTo(10);
+    }
+
+    @Test
+    public void testLoggingFilter() throws IOException {
+        stubFor(get(urlPathEqualTo(PATH)).willReturn(aResponse().withStatus(200)
+            .withBody("done")));
+
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(baos);) {
+            WebClient webClient = WebClient.builder()
+                .filter(loggingFilter(ps))
+                .build();
+            String actual = sendGetRequest(webClient);
+
+            assertThat(actual).isEqualTo("done");
+            assertThat(baos.toString()).isEqualTo("Sending request GET " + getUrl());
+        }
+    }
+
+    @Test
+    public void testBasicAuthFilter() {
+        stubFor(get(urlPathEqualTo(PATH)).willReturn(aResponse().withStatus(200)
+            .withBody("authorized")));
+
+        WebClient webClient = WebClient.builder()
+            .filter(ExchangeFilterFunctions.basicAuthentication("user", "password"))
+            .build();
+        String actual = sendGetRequest(webClient);
+
+        assertThat(actual).isEqualTo("authorized");
+        verify(getRequestedFor(urlPathEqualTo(PATH)).withHeader("Authorization", containing("Basic")));
+    }
+
+    private String sendGetRequest(WebClient webClient) {
+        return webClient.get()
+            .uri(getUrl())
+            .retrieve()
+            .bodyToMono(String.class)
+            .block();
+    }
+
+    private String sendPostRequest(WebClient webClient) {
+        return webClient.post()
+            .uri(URI.create(getUrl()))
+            .retrieve()
+            .bodyToMono(String.class)
+            .block();
+    }
+
+    private String getUrl() {
+        return "http://localhost:" + wireMockRule.port() + PATH;
+
+    }
+
+}
diff --git a/spring-all/README.md b/spring-all/README.md
index b5e91d8d60..22c51525f3 100644
--- a/spring-all/README.md
+++ b/spring-all/README.md
@@ -11,7 +11,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 ### Relevant articles:
 
 - [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire)
-- [Properties with Spring and Spring Boot](http://www.baeldung.com/properties-with-spring) - checkout the `org.baeldung.properties` package for all scenarios of properties injection and usage
 - [Spring Profiles](http://www.baeldung.com/spring-profiles)
 - [A Spring Custom Annotation for a Better DAO](http://www.baeldung.com/spring-annotation-bean-pre-processor)
 - [What’s New in Spring 4.3?](http://www.baeldung.com/whats-new-in-spring-4-3)
@@ -34,3 +33,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Spring Events](https://www.baeldung.com/spring-events)
 - [Spring Null-Safety Annotations](https://www.baeldung.com/spring-null-safety-annotations)
 - [Using @Autowired in Abstract Classes](https://www.baeldung.com/spring-autowired-abstract-class)
+- [The Spring @Qualifier Annotation](https://www.baeldung.com/spring-qualifier-annotation)
diff --git a/spring-all/src/main/java/com/baeldung/scheduling/ScheduledFixedRateExample.java b/spring-all/src/main/java/com/baeldung/scheduling/ScheduledFixedRateExample.java
new file mode 100644
index 0000000000..8ccd2c773b
--- /dev/null
+++ b/spring-all/src/main/java/com/baeldung/scheduling/ScheduledFixedRateExample.java
@@ -0,0 +1,18 @@
+package com.baeldung.scheduling;
+
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+@EnableAsync
+public class ScheduledFixedRateExample {
+    @Async
+    @Scheduled(fixedRate = 1000)
+    public void scheduleFixedRateTaskAsync() throws InterruptedException {
+        System.out.println("Fixed rate task async - " + System.currentTimeMillis() / 1000);
+        Thread.sleep(2000);
+    }
+
+}
diff --git a/spring-all/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java b/spring-all/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java
new file mode 100644
index 0000000000..6000f75ec2
--- /dev/null
+++ b/spring-all/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java
@@ -0,0 +1,12 @@
+package com.baeldung.scheduling;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@Configuration
+@EnableScheduling
+@ComponentScan("com.baeldung.scheduling")
+public class SpringSchedulingFixedRateConfig {
+
+}
\ No newline at end of file
diff --git a/spring-all/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java b/spring-all/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
new file mode 100644
index 0000000000..ef7c7c68fd
--- /dev/null
+++ b/spring-all/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
@@ -0,0 +1,17 @@
+package com.baeldung.scheduling;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { SpringSchedulingFixedRateConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class ScheduledFixedRateExampleIntegrationTest {
+
+    @Test
+    public void testScheduledFixedRateAnnotation() throws InterruptedException {
+        Thread.sleep(5000);
+    }
+}
diff --git a/spring-amqp-simple/README.md b/spring-amqp-simple/README.md
deleted file mode 100644
index a176247d4c..0000000000
--- a/spring-amqp-simple/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-### Relevant Articles: 
-- [RabbitMQ Message Dispatching with Spring AMQP](http://www.baeldung.com/rabbitmq-spring-amqp)
diff --git a/spring-amqp-simple/pom.xml b/spring-amqp-simple/pom.xml
deleted file mode 100644
index 45cdc066a0..0000000000
--- a/spring-amqp-simple/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>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-amqp-simple</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-	<name>spring-amqp-simple</name>
-
-    <parent>
-        <artifactId>parent-boot-2</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageConsumer.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageConsumer.java
deleted file mode 100644
index 6eb13c18f6..0000000000
--- a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageConsumer.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.baeldung.springamqpsimple;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Component;
-
-@Component
-public class MessageConsumer {
-
-    private static final Logger logger = LoggerFactory.getLogger(MessageConsumer.class);
-
-    @RabbitListener(queues = {SpringAmqpConfig.queueName})
-    public void receiveMessage(String message) {
-        logger.info("Received Message: " + message);
-    }
-}
\ No newline at end of file
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageController.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageController.java
deleted file mode 100644
index deef22c4d6..0000000000
--- a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageController.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.baeldung.springamqpsimple;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@Controller
-public class MessageController {
-
-    private final MessageProducer messageProducer;
-
-    @Autowired
-    public MessageController(MessageProducer messageProducer) {
-        this.messageProducer = messageProducer;
-    }
-
-    @RequestMapping(value="/messages", method= RequestMethod.POST)
-    @ResponseStatus(value= HttpStatus.CREATED)
-    public void sendMessage(@RequestBody String message) {
-        messageProducer.sendMessage(message);
-    }
-}
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageProducer.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageProducer.java
deleted file mode 100644
index 225f37bdd0..0000000000
--- a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageProducer.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.baeldung.springamqpsimple;
-
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class MessageProducer {
-
-    private final RabbitTemplate rabbitTemplate;
-
-    @Autowired
-    public MessageProducer(RabbitTemplate rabbitTemplate) {
-        this.rabbitTemplate = rabbitTemplate;
-    }
-
-    public void sendMessage(String message) {
-        rabbitTemplate.convertAndSend(SpringAmqpConfig.queueName, message);
-    }
-}
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/SpringAmqpApplication.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/SpringAmqpApplication.java
deleted file mode 100644
index b84a49a230..0000000000
--- a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/SpringAmqpApplication.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.baeldung.springamqpsimple;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class SpringAmqpApplication {
-
-    public static void main(String[] args) throws InterruptedException {
-        SpringApplication.run(SpringAmqpApplication.class, args);
-    }
-}
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/SpringAmqpConfig.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/SpringAmqpConfig.java
deleted file mode 100644
index 92fa28ed6f..0000000000
--- a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/SpringAmqpConfig.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.baeldung.springamqpsimple;
-
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.BindingBuilder;
-import org.springframework.amqp.core.DirectExchange;
-import org.springframework.amqp.core.Exchange;
-import org.springframework.amqp.core.Queue;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
-import org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-
-@Configuration
-@Profile("!test")
-public class SpringAmqpConfig {
-
-    public final static String queueName = "com.baeldung.spring-amqp-simple.queue";
-    public final static String exchangeName = "com.baeldung.spring-amqp-simple.exchange";
-
-    @Bean
-    Queue queue() {
-        return new Queue(queueName, false);
-    }
-
-    @Bean
-    Exchange exchange() {
-        return new DirectExchange(exchangeName);
-    }
-
-    @Bean
-    Binding binding(Queue queue, DirectExchange exchange) {
-        return BindingBuilder.bind(queue).to(exchange).with(queueName);
-    }
-
-    @Bean
-    SimpleMessageListenerContainer springAmqpContainer(ConnectionFactory connectionFactory,
-            MessageListenerAdapter listenerAdapter) {
-        SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
-        container.setConnectionFactory(connectionFactory);
-        container.setQueueNames(queueName);
-        container.setMessageListener(listenerAdapter);
-        return container;
-    }
-
-    @Bean
-    MessageListenerAdapter listenerAdapter(MessageConsumer messageReceiver) {
-        return new MessageListenerAdapter(messageReceiver, "receiveMessage");
-    }
-}
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastConfig.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastConfig.java
deleted file mode 100644
index 868cfff0ac..0000000000
--- a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastConfig.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.baeldung.springamqpsimple.broadcast;
-
-import org.springframework.amqp.core.BindingBuilder;
-import org.springframework.amqp.core.Declarable;
-import org.springframework.amqp.core.DirectExchange;
-import org.springframework.amqp.core.FanoutExchange;
-import org.springframework.amqp.core.Queue;
-import org.springframework.amqp.core.TopicExchange;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-
-import java.util.Arrays;
-import java.util.List;
-
-@Configuration
-@Profile("!test")
-public class BroadcastConfig {
-
-    public final static String fanoutQueue1Name = "com.baeldung.spring-amqp-simple.fanout.queue1";
-    public final static String fanoutQueue2Name = "com.baeldung.spring-amqp-simple.fanout.queue2";
-    public final static String fanoutExchangeName = "com.baeldung.spring-amqp-simple.fanout.exchange";
-
-    public final static String topicQueue1Name = "com.baeldung.spring-amqp-simple.topic.queue1";
-    public final static String topicQueue2Name = "com.baeldung.spring-amqp-simple.topic.queue2";
-    public final static String topicExchangeName = "com.baeldung.spring-amql-simple.topic.exchange";
-
-    @Bean
-    public List<Declarable> topicBindings() {
-        Queue topicQueue1 = new Queue(topicQueue1Name, false);
-        Queue topicQueue2 = new Queue(topicQueue2Name, false);
-
-        TopicExchange topicExchange = new TopicExchange(topicExchangeName);
-
-        return Arrays.asList(
-                topicQueue1,
-                topicQueue2,
-                topicExchange,
-                BindingBuilder.bind(topicQueue1).to(topicExchange).with("*.important.*"),
-                BindingBuilder.bind(topicQueue2).to(topicExchange).with("user.#")
-        );
-    }
-
-    @Bean
-    public List<Declarable> fanoutBindings() {
-        Queue fanoutQueue1 = new Queue(fanoutQueue1Name, false);
-        Queue fanoutQueue2 = new Queue(fanoutQueue2Name, false);
-
-        FanoutExchange fanoutExchange = new FanoutExchange(fanoutExchangeName);
-
-        return Arrays.asList(
-                fanoutQueue1,
-                fanoutQueue2,
-                fanoutExchange,
-                BindingBuilder.bind(fanoutQueue1).to(fanoutExchange),
-                BindingBuilder.bind(fanoutQueue2).to(fanoutExchange)
-        );
-    }
-
-    @Bean
-    public SimpleRabbitListenerContainerFactory broadcastContainer(ConnectionFactory connectionFactory, SimpleRabbitListenerContainerFactoryConfigurer configurer) {
-        SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
-        configurer.configure(factory, connectionFactory);
-        return factory;
-    }
-
-}
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageConsumers.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageConsumers.java
deleted file mode 100644
index 0ae04ea092..0000000000
--- a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageConsumers.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.baeldung.springamqpsimple.broadcast;
-
-import com.baeldung.springamqpsimple.MessageConsumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BroadcastMessageConsumers {
-    private static final Logger logger = LoggerFactory.getLogger(MessageConsumer.class);
-
-    @RabbitListener(queues = {BroadcastConfig.fanoutQueue1Name})
-    public void receiveMessageFromFanout1(String message) {
-        logger.info("Received fanout 1 message: " + message);
-    }
-
-    @RabbitListener(queues = {BroadcastConfig.fanoutQueue2Name})
-    public void receiveMessageFromFanout2(String message) {
-        logger.info("Received fanout 2 message: " + message);
-    }
-
-    @RabbitListener(queues = {BroadcastConfig.topicQueue1Name})
-    public void receiveMessageFromTopic1(String message) {
-        logger.info("Received topic 1 message: " + message);
-    }
-
-    @RabbitListener(queues = {BroadcastConfig.topicQueue2Name})
-    public void receiveMessageFromTopic2(String message) {
-        logger.info("Received topic 2 message: " + message);
-    }
-}
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageController.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageController.java
deleted file mode 100644
index 75d4d20e55..0000000000
--- a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageController.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.baeldung.springamqpsimple.broadcast;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@Controller
-public class BroadcastMessageController {
-
-    private final BroadcastMessageProducer messageProducer;
-
-    @Autowired
-    public BroadcastMessageController(BroadcastMessageProducer messageProducer) {
-        this.messageProducer = messageProducer;
-    }
-
-    @RequestMapping(value="/broadcast", method= RequestMethod.POST)
-    @ResponseStatus(value= HttpStatus.CREATED)
-    public void sendMessage(@RequestBody String message) {
-        messageProducer.sendMessages(message);
-    }
-}
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageProducer.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageProducer.java
deleted file mode 100644
index 590da24962..0000000000
--- a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageProducer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.baeldung.springamqpsimple.broadcast;
-
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BroadcastMessageProducer {
-
-    private final RabbitTemplate rabbitTemplate;
-
-    @Autowired
-    public BroadcastMessageProducer(RabbitTemplate rabbitTemplate) {
-        this.rabbitTemplate = rabbitTemplate;
-    }
-
-    public void sendMessages(String message) {
-        rabbitTemplate.convertAndSend(BroadcastConfig.fanoutExchangeName, "", message);
-        rabbitTemplate.convertAndSend(BroadcastConfig.topicExchangeName, "user.not-important.info", message);
-        rabbitTemplate.convertAndSend(BroadcastConfig.topicExchangeName, "user.important.error", message);
-    }
-}
diff --git a/spring-amqp-simple/src/main/resources/application.yaml b/spring-amqp-simple/src/main/resources/application.yaml
deleted file mode 100644
index 47e7a3b9e0..0000000000
--- a/spring-amqp-simple/src/main/resources/application.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-spring:
-  rabbitmq:
-    username: guest
-    password: guest
-    host: 10.10.10.105
\ No newline at end of file
diff --git a/spring-amqp-simple/src/test/java/org/baeldung/SpringContextManualTest.java b/spring-amqp-simple/src/test/java/org/baeldung/SpringContextManualTest.java
deleted file mode 100644
index 03cb34eeb5..0000000000
--- a/spring-amqp-simple/src/test/java/org/baeldung/SpringContextManualTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.baeldung;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import com.baeldung.springamqpsimple.SpringAmqpApplication;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = SpringAmqpApplication.class)
-public class SpringContextManualTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-amqp-simple/src/test/resources/application.yaml b/spring-amqp-simple/src/test/resources/application.yaml
deleted file mode 100644
index aa7a91bac5..0000000000
--- a/spring-amqp-simple/src/test/resources/application.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-spring:
-  rabbitmq:
-    username: guest
-    password: guest
-    host: localhost
\ No newline at end of file
diff --git a/spring-amqp/README.md b/spring-amqp/README.md
index b0d16c9305..5e29011995 100644
--- a/spring-amqp/README.md
+++ b/spring-amqp/README.md
@@ -1,3 +1,4 @@
 ## Relevant articles:
 
-- [Messaging With Spring AMQP](http://www.baeldung.com/spring-amqp)
+- [Messaging With Spring AMQP](https://www.baeldung.com/spring-amqp)
+- [RabbitMQ Message Dispatching with Spring AMQP](https://www.baeldung.com/rabbitmq-spring-amqp)
\ No newline at end of file
diff --git a/spring-amqp/pom.xml b/spring-amqp/pom.xml
index c021bd49ff..3e6789dcb6 100755
--- a/spring-amqp/pom.xml
+++ b/spring-amqp/pom.xml
@@ -3,37 +3,26 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
     <artifactId>spring-amqp</artifactId>
-    <version>0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <name>spring-amqp</name>
-    <packaging>jar</packaging>
     <description>Introduction to Spring-AMQP</description>
 
     <parent>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.amqp</groupId>
-            <artifactId>spring-rabbit</artifactId>
-            <version>${spring-rabbit}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
     </dependencies>
 
-    <build>
-        <finalName>spring-amqp</finalName>
-    </build>
-
     <properties>
-        <spring-rabbit>1.6.6.RELEASE</spring-rabbit>
+        <start-class>com.baeldung.springamqp.simple.HelloWorldMessageApp</start-class>
     </properties>
 
 </project>
diff --git a/spring-amqp/src/main/java/com/baeldung/springamqp/broadcast/BroadcastConfig.java b/spring-amqp/src/main/java/com/baeldung/springamqp/broadcast/BroadcastConfig.java
new file mode 100644
index 0000000000..12c5987cc4
--- /dev/null
+++ b/spring-amqp/src/main/java/com/baeldung/springamqp/broadcast/BroadcastConfig.java
@@ -0,0 +1,52 @@
+package com.baeldung.springamqp.broadcast;
+
+import org.springframework.amqp.core.*;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class BroadcastConfig {
+
+    private static final boolean NON_DURABLE = false;
+
+    public final static String FANOUT_QUEUE_1_NAME = "com.baeldung.spring-amqp-simple.fanout.queue1";
+    public final static String FANOUT_QUEUE_2_NAME = "com.baeldung.spring-amqp-simple.fanout.queue2";
+    public final static String FANOUT_EXCHANGE_NAME = "com.baeldung.spring-amqp-simple.fanout.exchange";
+
+    public final static String TOPIC_QUEUE_1_NAME = "com.baeldung.spring-amqp-simple.topic.queue1";
+    public final static String TOPIC_QUEUE_2_NAME = "com.baeldung.spring-amqp-simple.topic.queue2";
+    public final static String TOPIC_EXCHANGE_NAME = "com.baeldung.spring-amqp-simple.topic.exchange";
+    public static final String BINDING_PATTERN_IMPORTANT = "*.important.*";
+    public static final String BINDING_PATTERN_ERROR = "#.error";
+
+    @Bean
+    public Declarables topicBindings() {
+        Queue topicQueue1 = new Queue(TOPIC_QUEUE_1_NAME, NON_DURABLE);
+        Queue topicQueue2 = new Queue(TOPIC_QUEUE_2_NAME, NON_DURABLE);
+
+        TopicExchange topicExchange = new TopicExchange(TOPIC_EXCHANGE_NAME, NON_DURABLE, false);
+
+        return new Declarables(topicQueue1, topicQueue2, topicExchange, BindingBuilder
+          .bind(topicQueue1)
+          .to(topicExchange)
+          .with(BINDING_PATTERN_IMPORTANT), BindingBuilder
+          .bind(topicQueue2)
+          .to(topicExchange)
+          .with(BINDING_PATTERN_ERROR));
+    }
+
+    @Bean
+    public Declarables fanoutBindings() {
+        Queue fanoutQueue1 = new Queue(FANOUT_QUEUE_1_NAME, NON_DURABLE);
+        Queue fanoutQueue2 = new Queue(FANOUT_QUEUE_2_NAME, NON_DURABLE);
+
+        FanoutExchange fanoutExchange = new FanoutExchange(FANOUT_EXCHANGE_NAME, NON_DURABLE, false);
+
+        return new Declarables(fanoutQueue1, fanoutQueue2, fanoutExchange, BindingBuilder
+          .bind(fanoutQueue1)
+          .to(fanoutExchange), BindingBuilder
+          .bind(fanoutQueue2)
+          .to(fanoutExchange));
+    }
+
+}
diff --git a/spring-amqp/src/main/java/com/baeldung/springamqp/broadcast/BroadcastMessageApp.java b/spring-amqp/src/main/java/com/baeldung/springamqp/broadcast/BroadcastMessageApp.java
new file mode 100644
index 0000000000..64bf3ffb93
--- /dev/null
+++ b/spring-amqp/src/main/java/com/baeldung/springamqp/broadcast/BroadcastMessageApp.java
@@ -0,0 +1,59 @@
+package com.baeldung.springamqp.broadcast;
+
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+
+import static com.baeldung.springamqp.broadcast.BroadcastConfig.*;
+
+/**
+ * Simple test application to send messages to rabbitMQ.
+ *
+ *<p>To run this particular application with mvn you use the following command:</p>
+ * {@code
+ * mvn spring-boot:run -Dstart-class=com.baeldung.springamqp.broadcast.BroadcastMessageApp
+ * }
+ */
+@SpringBootApplication
+public class BroadcastMessageApp {
+
+    private static String ROUTING_KEY_USER_IMPORTANT_WARN = "user.important.warn";
+    private static String ROUTING_KEY_USER_IMPORTANT_ERROR = "user.important.error";
+
+    public static void main(String[] args) {
+        SpringApplication.run(BroadcastMessageApp.class, args);
+    }
+
+    @Bean
+    public ApplicationRunner runner(RabbitTemplate rabbitTemplate) {
+        String message = " payload is broadcast";
+        return args -> {
+            rabbitTemplate.convertAndSend(BroadcastConfig.FANOUT_EXCHANGE_NAME, "", "fanout" + message);
+            rabbitTemplate.convertAndSend(BroadcastConfig.TOPIC_EXCHANGE_NAME, ROUTING_KEY_USER_IMPORTANT_WARN, "topic important warn" + message);
+            rabbitTemplate.convertAndSend(BroadcastConfig.TOPIC_EXCHANGE_NAME, ROUTING_KEY_USER_IMPORTANT_ERROR, "topic important error" + message);
+        };
+    }
+
+    @RabbitListener(queues = { FANOUT_QUEUE_1_NAME })
+    public void receiveMessageFromFanout1(String message) {
+        System.out.println("Received fanout 1 message: " + message);
+    }
+
+    @RabbitListener(queues = { FANOUT_QUEUE_2_NAME })
+    public void receiveMessageFromFanout2(String message) {
+        System.out.println("Received fanout 2 message: " + message);
+    }
+
+    @RabbitListener(queues = { TOPIC_QUEUE_1_NAME })
+    public void receiveMessageFromTopic1(String message) {
+        System.out.println("Received topic 1 (" + BINDING_PATTERN_IMPORTANT + ") message: " + message);
+    }
+
+    @RabbitListener(queues = { TOPIC_QUEUE_2_NAME })
+    public void receiveMessageFromTopic2(String message) {
+        System.out.println("Received topic 2 (" + BINDING_PATTERN_ERROR + ") message: " + message);
+    }
+}
diff --git a/spring-amqp/src/main/java/com/baeldung/springamqp/consumer/Consumer.java b/spring-amqp/src/main/java/com/baeldung/springamqp/consumer/Consumer.java
deleted file mode 100644
index 42d7e88cbd..0000000000
--- a/spring-amqp/src/main/java/com/baeldung/springamqp/consumer/Consumer.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.baeldung.springamqp.consumer;
-
-public class Consumer {
-    public void listen(String foo) {
-        System.out.println(foo);
-    }
-}
\ No newline at end of file
diff --git a/spring-amqp/src/main/java/com/baeldung/springamqp/producer/Producer.java b/spring-amqp/src/main/java/com/baeldung/springamqp/producer/Producer.java
deleted file mode 100644
index b4067ed795..0000000000
--- a/spring-amqp/src/main/java/com/baeldung/springamqp/producer/Producer.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.baeldung.springamqp.producer;
-
-import org.springframework.amqp.core.AmqpTemplate;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class Producer {
-
-    public static void main(String[] args) throws InterruptedException {
-        AbstractApplicationContext ctx = new ClassPathXmlApplicationContext("beans.xml");
-        AmqpTemplate template = ctx.getBean(RabbitTemplate.class);
-        template.convertAndSend("Hello, world!");
-        Thread.sleep(1000);
-        ctx.destroy();
-    }
-}
\ No newline at end of file
diff --git a/spring-amqp/src/main/java/com/baeldung/springamqp/simple/HelloWorldMessageApp.java b/spring-amqp/src/main/java/com/baeldung/springamqp/simple/HelloWorldMessageApp.java
new file mode 100644
index 0000000000..25dcdf29c1
--- /dev/null
+++ b/spring-amqp/src/main/java/com/baeldung/springamqp/simple/HelloWorldMessageApp.java
@@ -0,0 +1,38 @@
+package com.baeldung.springamqp.simple;
+
+import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+
+@SpringBootApplication
+public class HelloWorldMessageApp {
+
+    private static final boolean NON_DURABLE = false;
+    private static final String MY_QUEUE_NAME = "myQueue";
+
+    public static void main(String[] args) {
+        SpringApplication.run(HelloWorldMessageApp.class, args);
+    }
+
+    @Bean
+    public ApplicationRunner runner(RabbitTemplate template) {
+        return args -> {
+            template.convertAndSend("myQueue", "Hello, world!");
+        };
+    }
+
+    @Bean
+    public Queue myQueue() {
+        return new Queue(MY_QUEUE_NAME, NON_DURABLE);
+    }
+
+    @RabbitListener(queues = MY_QUEUE_NAME)
+    public void listen(String in) {
+        System.out.println("Message read from myQueue : " + in);
+    }
+
+}
diff --git a/spring-amqp/src/main/resources/beans.xml b/spring-amqp/src/main/resources/beans.xml
deleted file mode 100644
index f6a966b0f6..0000000000
--- a/spring-amqp/src/main/resources/beans.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:rabbit="http://www.springframework.org/schema/rabbit"
-	xmlns:c="http://www.springframework.org/schema/c" xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
-    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-    http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit-1.4.xsd">
-
-	<rabbit:connection-factory id="connectionFactory" host="localhost" username="guest" password="guest" />
-
-	<rabbit:template id="amqpTemplate" connection-factory="connectionFactory"
-		exchange="myExchange" routing-key="foo.bar" />
-
-	<rabbit:admin connection-factory="connectionFactory" />
-
-	<rabbit:queue name="myQueue" />
-
-	<rabbit:topic-exchange name="myExchange">
-		<rabbit:bindings>
-			<rabbit:binding queue="myQueue" pattern="foo.*" />
-		</rabbit:bindings>
-	</rabbit:topic-exchange>
-
-
-	<rabbit:listener-container
-		connection-factory="connectionFactory">
-		<rabbit:listener ref="consumer" method="listen"
-			queue-names="myQueue" />
-	</rabbit:listener-container>
-
-	<bean id="consumer" class="com.baeldung.springamqp.consumer.Consumer" />
-
-</beans>
\ No newline at end of file
diff --git a/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/Application.java b/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/Application.java
new file mode 100644
index 0000000000..d4c8010d2b
--- /dev/null
+++ b/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/Application.java
@@ -0,0 +1,20 @@
+package com.baeldung.springbootconfiguration;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+
+@ComponentScan(basePackages = {"com.baeldung.springbootconfiguration.*"})
+@SpringBootConfiguration
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+    @Bean
+    public PersonService personService() {
+        return new PersonServiceImpl();
+    }
+}
diff --git a/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/PersonService.java b/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/PersonService.java
new file mode 100644
index 0000000000..4909d957e5
--- /dev/null
+++ b/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/PersonService.java
@@ -0,0 +1,4 @@
+package com.baeldung.springbootconfiguration;
+
+public interface PersonService {
+}
diff --git a/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/PersonServiceImpl.java b/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/PersonServiceImpl.java
new file mode 100644
index 0000000000..9f2af33e8e
--- /dev/null
+++ b/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/PersonServiceImpl.java
@@ -0,0 +1,4 @@
+package com.baeldung.springbootconfiguration;
+
+public class PersonServiceImpl implements PersonService {
+}
diff --git a/spring-boot-data/README.md b/spring-boot-data/README.md
index 3fd1d17994..6f0b8c8123 100644
--- a/spring-boot-data/README.md
+++ b/spring-boot-data/README.md
@@ -1,3 +1,5 @@
-### Relevant Articles:
+## Relevant Articles:
+
 - [Formatting JSON Dates in Spring Boot](https://www.baeldung.com/spring-boot-formatting-json-dates)
 - [Rendering Exceptions in JSON with Spring](https://www.baeldung.com/spring-exceptions-json)
+- [Disable Spring Data Auto Configuration](https://www.baeldung.com/spring-data-disable-auto-config)
diff --git a/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataJPAIntegrationTest.java b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataJPAIntegrationTest.java
index a465979b3c..ef07df7824 100644
--- a/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataJPAIntegrationTest.java
+++ b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataJPAIntegrationTest.java
@@ -19,7 +19,7 @@ public class SpringDataJPAIntegrationTest {
     private ApplicationContext context;
 
     @Test(expected = NoSuchBeanDefinitionException.class)
-    public void givenAutoconfigurationIsDisable_whenApplicationStarts_thenContextWillNotHaveTheAutoconfiguredClasses() {
+    public void givenAutoConfigDisabled_whenStarting_thenNoAutoconfiguredBeansInContext() {
         context.getBean(DataSource.class);
     }
 
diff --git a/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataMongoDBIntegrationTest.java b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataMongoDBIntegrationTest.java
index bdfadf76ce..cc66f71aa2 100644
--- a/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataMongoDBIntegrationTest.java
+++ b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataMongoDBIntegrationTest.java
@@ -18,7 +18,7 @@ public class SpringDataMongoDBIntegrationTest {
     private ApplicationContext context;
 
     @Test(expected = NoSuchBeanDefinitionException.class)
-    public void givenAutoconfigurationIsDisable_whenApplicationStarts_thenContextWillNotHaveTheAutoconfiguredClasses() {
+    public void givenAutoConfigDisabled_whenStarting_thenNoAutoconfiguredBeansInContext() {
         context.getBean(MongoTemplate.class);
     }
 
diff --git a/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataRedisIntegrationTest.java b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataRedisIntegrationTest.java
index 10133cace3..657e624db3 100644
--- a/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataRedisIntegrationTest.java
+++ b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataRedisIntegrationTest.java
@@ -18,7 +18,7 @@ public class SpringDataRedisIntegrationTest {
     private ApplicationContext context;
 
     @Test(expected = NoSuchBeanDefinitionException.class)
-    public void givenAutoconfigurationIsDisable_whenApplicationStarts_thenContextWillNotHaveTheAutoconfiguredClasses() {
+    public void givenAutoConfigDisabled_whenStarting_thenNoAutoconfiguredBeansInContext() {
         context.getBean(RedisTemplate.class);
     }
 
diff --git a/spring-boot-mvc-2/README.md b/spring-boot-mvc-2/README.md
index a405298cbe..f8e26f218b 100644
--- a/spring-boot-mvc-2/README.md
+++ b/spring-boot-mvc-2/README.md
@@ -1,3 +1,3 @@
 ### Relevant Articles:
 
-- [Functional Controllers in Spring MVC]()
\ No newline at end of file
+- [Functional Controllers in Spring MVC](https://www.baeldung.com/spring-mvc-functional-controllers)
diff --git a/spring-boot-properties/README.md b/spring-boot-properties/README.md
index c43cf4865c..e467e129dd 100644
--- a/spring-boot-properties/README.md
+++ b/spring-boot-properties/README.md
@@ -1,2 +1,10 @@
 ### Relevant Articles:
-- [Reloading Properties in Spring](https://www.baeldung.com/reloading-properties-files-in-spring/)
\ No newline at end of file
+- [Reloading Properties in Spring](https://www.baeldung.com/reloading-properties-files-in-spring/)
+- [Guide to @ConfigurationProperties in Spring Boot](http://www.baeldung.com/configuration-properties-in-spring-boot)
+- [Load Spring Boot Properties From a JSON File](https://www.baeldung.com/spring-boot-json-properties)
+- [Guide to @EnableConfigurationProperties](https://www.baeldung.com/spring-enable-config-properties)
+- [Properties with Spring and Spring Boot](http://www.baeldung.com/properties-with-spring) - checkout the `org.baeldung.properties` package for all scenarios of properties injection and usage
+- [A Quick Guide to Spring @Value](http://www.baeldung.com/spring-value-annotation)
+- [Spring YAML Configuration](http://www.baeldung.com/spring-yaml)
+- [Using Spring @Value with Defaults](http://www.baeldung.com/spring-value-defaults)
+- [How to Inject a Property Value Into a Class Not Managed by Spring?](http://www.baeldung.com/inject-properties-value-non-spring-class)
\ No newline at end of file
diff --git a/spring-boot-properties/extra.properties b/spring-boot-properties/extra.properties
index 8e28a6f889..51874a0415 100644
--- a/spring-boot-properties/extra.properties
+++ b/spring-boot-properties/extra.properties
@@ -1 +1 @@
-application.theme.color=blue
\ No newline at end of file
+application.theme.color=red
\ No newline at end of file
diff --git a/spring-boot-properties/pom.xml b/spring-boot-properties/pom.xml
index 27ac48252b..ccb9204d96 100644
--- a/spring-boot-properties/pom.xml
+++ b/spring-boot-properties/pom.xml
@@ -37,6 +37,16 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>${httpcore.version}</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -99,6 +109,8 @@
         <java.version>1.8</java.version>
         <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
         <commons-configuration.version>1.10</commons-configuration.version>
+        <guava.version>20.0</guava.version>
+        <httpcore.version>4.4.11</httpcore.version>
     </properties>
 
 </project>
diff --git a/spring-boot/src/main/java/org/baeldung/properties/AdditionalConfiguration.java b/spring-boot-properties/src/main/java/com/baeldung/properties/AdditionalConfiguration.java
similarity index 92%
rename from spring-boot/src/main/java/org/baeldung/properties/AdditionalConfiguration.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/AdditionalConfiguration.java
index 499666c143..c5ccd20392 100644
--- a/spring-boot/src/main/java/org/baeldung/properties/AdditionalConfiguration.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/AdditionalConfiguration.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties;
+package com.baeldung.properties;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
diff --git a/spring-boot/src/main/java/org/baeldung/properties/AdditionalProperties.java b/spring-boot-properties/src/main/java/com/baeldung/properties/AdditionalProperties.java
similarity index 80%
rename from spring-boot/src/main/java/org/baeldung/properties/AdditionalProperties.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/AdditionalProperties.java
index 64e39b1475..6f6842e5e9 100644
--- a/spring-boot/src/main/java/org/baeldung/properties/AdditionalProperties.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/AdditionalProperties.java
@@ -1,7 +1,9 @@
-package org.baeldung.properties;
+package com.baeldung.properties;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
 
+@Configuration
 @ConfigurationProperties(prefix = "additional")
 public class AdditionalProperties {
 
diff --git a/spring-boot/src/main/java/com/baeldung/properties/ConfigProperties.java b/spring-boot-properties/src/main/java/com/baeldung/properties/ConfigProperties.java
similarity index 88%
rename from spring-boot/src/main/java/com/baeldung/properties/ConfigProperties.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/ConfigProperties.java
index 35b0239287..b690c8e305 100644
--- a/spring-boot/src/main/java/com/baeldung/properties/ConfigProperties.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/ConfigProperties.java
@@ -10,6 +10,7 @@ import javax.validation.constraints.Pattern;
 
 import org.hibernate.validator.constraints.Length;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.validation.annotation.Validated;
@@ -54,7 +55,7 @@ public class ConfigProperties {
     }
 
     @NotBlank
-    private String host;
+    private String hostName;
 
     @Min(1025)
     @Max(65536)
@@ -67,12 +68,12 @@ public class ConfigProperties {
     private List<String> defaultRecipients;
     private Map<String, String> additionalHeaders;
 
-    public String getHost() {
-        return host;
+    public String getHostName() {
+        return hostName;
     }
 
-    public void setHost(String host) {
-        this.host = host;
+    public void setHostName(String hostName) {
+        this.hostName = hostName;
     }
 
     public int getPort() {
@@ -114,4 +115,10 @@ public class ConfigProperties {
     public void setAdditionalHeaders(Map<String, String> additionalHeaders) {
         this.additionalHeaders = additionalHeaders;
     }
+    
+    @Bean
+    @ConfigurationProperties(prefix = "item")
+    public Item item(){
+        return new Item();
+    }
 }
diff --git a/spring-boot/src/main/java/com/baeldung/properties/ConfigPropertiesDemoApplication.java b/spring-boot-properties/src/main/java/com/baeldung/properties/ConfigPropertiesDemoApplication.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/properties/ConfigPropertiesDemoApplication.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/ConfigPropertiesDemoApplication.java
diff --git a/spring-boot/src/main/java/com/baeldung/properties/CustomJsonProperties.java b/spring-boot-properties/src/main/java/com/baeldung/properties/CustomJsonProperties.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/properties/CustomJsonProperties.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/CustomJsonProperties.java
diff --git a/spring-boot/src/main/java/org/baeldung/properties/Item.java b/spring-boot-properties/src/main/java/com/baeldung/properties/Item.java
similarity index 93%
rename from spring-boot/src/main/java/org/baeldung/properties/Item.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/Item.java
index 0314654ada..741bbba144 100644
--- a/spring-boot/src/main/java/org/baeldung/properties/Item.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/Item.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties;
+package com.baeldung.properties;
 
 public class Item {
 
diff --git a/spring-boot/src/main/java/com/baeldung/properties/JsonProperties.java b/spring-boot-properties/src/main/java/com/baeldung/properties/JsonProperties.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/properties/JsonProperties.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/JsonProperties.java
diff --git a/spring-boot/src/main/java/com/baeldung/properties/JsonPropertyContextInitializer.java b/spring-boot-properties/src/main/java/com/baeldung/properties/JsonPropertyContextInitializer.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/properties/JsonPropertyContextInitializer.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/JsonPropertyContextInitializer.java
diff --git a/spring-boot/src/main/java/com/baeldung/properties/JsonPropertySourceFactory.java b/spring-boot-properties/src/main/java/com/baeldung/properties/JsonPropertySourceFactory.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/properties/JsonPropertySourceFactory.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/JsonPropertySourceFactory.java
diff --git a/spring-boot/src/main/java/com/baeldung/properties/conversion/Employee.java b/spring-boot-properties/src/main/java/com/baeldung/properties/conversion/Employee.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/properties/conversion/Employee.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/conversion/Employee.java
diff --git a/spring-boot/src/main/java/com/baeldung/properties/conversion/EmployeeConverter.java b/spring-boot-properties/src/main/java/com/baeldung/properties/conversion/EmployeeConverter.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/properties/conversion/EmployeeConverter.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/conversion/EmployeeConverter.java
diff --git a/spring-boot/src/main/java/com/baeldung/properties/conversion/PropertiesConversionApplication.java b/spring-boot-properties/src/main/java/com/baeldung/properties/conversion/PropertiesConversionApplication.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/properties/conversion/PropertiesConversionApplication.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/conversion/PropertiesConversionApplication.java
diff --git a/spring-boot/src/main/java/com/baeldung/properties/conversion/PropertyConversion.java b/spring-boot-properties/src/main/java/com/baeldung/properties/conversion/PropertyConversion.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/properties/conversion/PropertyConversion.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/conversion/PropertyConversion.java
diff --git a/spring-all/src/main/java/org/baeldung/properties/core/ComponentInXmlUsingProperties.java b/spring-boot-properties/src/main/java/com/baeldung/properties/core/ComponentInXmlUsingProperties.java
similarity index 95%
rename from spring-all/src/main/java/org/baeldung/properties/core/ComponentInXmlUsingProperties.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/core/ComponentInXmlUsingProperties.java
index dbdcebcb36..675c72e642 100644
--- a/spring-all/src/main/java/org/baeldung/properties/core/ComponentInXmlUsingProperties.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/core/ComponentInXmlUsingProperties.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.core;
+package com.baeldung.properties.core;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-all/src/main/java/org/baeldung/properties/core/ComponentUsingProperties.java b/spring-boot-properties/src/main/java/com/baeldung/properties/core/ComponentUsingProperties.java
similarity index 95%
rename from spring-all/src/main/java/org/baeldung/properties/core/ComponentUsingProperties.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/core/ComponentUsingProperties.java
index 7e082702fe..ff6e11d453 100644
--- a/spring-all/src/main/java/org/baeldung/properties/core/ComponentUsingProperties.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/core/ComponentUsingProperties.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.core;
+package com.baeldung.properties.core;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithJavaConfig.java b/spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithJavaConfig.java
similarity index 94%
rename from spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithJavaConfig.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithJavaConfig.java
index 216f905437..d43f18f6a7 100644
--- a/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithJavaConfig.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithJavaConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
diff --git a/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfig.java b/spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithXmlConfig.java
similarity index 90%
rename from spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfig.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithXmlConfig.java
index ea5bbf1c4d..6d105428d9 100644
--- a/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfig.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithXmlConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfigOne.java b/spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithXmlConfigOne.java
similarity index 90%
rename from spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfigOne.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithXmlConfigOne.java
index 2698937e1e..6f1e4c8490 100644
--- a/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfigOne.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithXmlConfigOne.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfigTwo.java b/spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithXmlConfigTwo.java
similarity index 88%
rename from spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfigTwo.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithXmlConfigTwo.java
index efbb995b73..38ecdd2aae 100644
--- a/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfigTwo.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithXmlConfigTwo.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/BasicPropertiesWithJavaConfig.java b/spring-boot-properties/src/main/java/com/baeldung/properties/spring/BasicPropertiesWithJavaConfig.java
similarity index 87%
rename from spring-all/src/main/java/org/baeldung/properties/spring/BasicPropertiesWithJavaConfig.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/spring/BasicPropertiesWithJavaConfig.java
index 25bfaa20a9..1c7886b34b 100644
--- a/spring-all/src/main/java/org/baeldung/properties/spring/BasicPropertiesWithJavaConfig.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/spring/BasicPropertiesWithJavaConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.spring;
+package com.baeldung.properties.spring;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java b/spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfig.java
similarity index 94%
rename from spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfig.java
index 6589143a94..4a29e5e3ea 100644
--- a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.spring;
+package com.baeldung.properties.spring;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfigOther.java b/spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfigOther.java
similarity index 88%
rename from spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfigOther.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfigOther.java
index 594ba0a09d..54d7814045 100644
--- a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfigOther.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfigOther.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.spring;
+package com.baeldung.properties.spring;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithPlaceHolderConfigurer.java b/spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertiesWithPlaceHolderConfigurer.java
similarity index 93%
rename from spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithPlaceHolderConfigurer.java
rename to spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertiesWithPlaceHolderConfigurer.java
index 97d7fe0ffa..512ecda266 100644
--- a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithPlaceHolderConfigurer.java
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertiesWithPlaceHolderConfigurer.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.spring;
+package com.baeldung.properties.spring;
 
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.context.annotation.Bean;
diff --git a/spring-core/src/main/java/com/baeldung/value/ClassNotManagedBySpring.java b/spring-boot-properties/src/main/java/com/baeldung/value/ClassNotManagedBySpring.java
similarity index 100%
rename from spring-core/src/main/java/com/baeldung/value/ClassNotManagedBySpring.java
rename to spring-boot-properties/src/main/java/com/baeldung/value/ClassNotManagedBySpring.java
diff --git a/spring-core/src/main/java/com/baeldung/value/InitializerBean.java b/spring-boot-properties/src/main/java/com/baeldung/value/InitializerBean.java
similarity index 100%
rename from spring-core/src/main/java/com/baeldung/value/InitializerBean.java
rename to spring-boot-properties/src/main/java/com/baeldung/value/InitializerBean.java
diff --git a/spring-core/src/main/java/com/baeldung/value/SomeBean.java b/spring-boot-properties/src/main/java/com/baeldung/value/SomeBean.java
similarity index 100%
rename from spring-core/src/main/java/com/baeldung/value/SomeBean.java
rename to spring-boot-properties/src/main/java/com/baeldung/value/SomeBean.java
diff --git a/spring-core/src/main/java/com/baeldung/value/ValuesApp.java b/spring-boot-properties/src/main/java/com/baeldung/value/ValuesApp.java
similarity index 100%
rename from spring-core/src/main/java/com/baeldung/value/ValuesApp.java
rename to spring-boot-properties/src/main/java/com/baeldung/value/ValuesApp.java
diff --git a/spring-core/src/main/java/com/baeldung/valuewithdefaults/ValuesWithDefaultsApp.java b/spring-boot-properties/src/main/java/com/baeldung/valuewithdefaults/ValuesWithDefaultsApp.java
similarity index 100%
rename from spring-core/src/main/java/com/baeldung/valuewithdefaults/ValuesWithDefaultsApp.java
rename to spring-boot-properties/src/main/java/com/baeldung/valuewithdefaults/ValuesWithDefaultsApp.java
diff --git a/spring-core/src/main/java/com/baeldung/yaml/MyApplication.java b/spring-boot-properties/src/main/java/com/baeldung/yaml/MyApplication.java
similarity index 100%
rename from spring-core/src/main/java/com/baeldung/yaml/MyApplication.java
rename to spring-boot-properties/src/main/java/com/baeldung/yaml/MyApplication.java
diff --git a/spring-core/src/main/java/com/baeldung/yaml/YAMLConfig.java b/spring-boot-properties/src/main/java/com/baeldung/yaml/YAMLConfig.java
similarity index 100%
rename from spring-core/src/main/java/com/baeldung/yaml/YAMLConfig.java
rename to spring-boot-properties/src/main/java/com/baeldung/yaml/YAMLConfig.java
diff --git a/spring-boot-properties/src/main/resources/application.properties b/spring-boot-properties/src/main/resources/application.properties
index f976004a04..2e06fad574 100644
--- a/spring-boot-properties/src/main/resources/application.properties
+++ b/spring-boot-properties/src/main/resources/application.properties
@@ -1,3 +1,4 @@
 management.endpoints.web.exposure.include=refresh
 spring.properties.refreshDelay=1000
 spring.config.location=file:extra.properties
+spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
diff --git a/spring-core/src/main/resources/application.yml b/spring-boot-properties/src/main/resources/application.yml
similarity index 100%
rename from spring-core/src/main/resources/application.yml
rename to spring-boot-properties/src/main/resources/application.yml
diff --git a/spring-all/src/main/resources/bar.properties b/spring-boot-properties/src/main/resources/bar.properties
similarity index 100%
rename from spring-all/src/main/resources/bar.properties
rename to spring-boot-properties/src/main/resources/bar.properties
diff --git a/spring-all/src/main/resources/basicConfigForProperties.xml b/spring-boot-properties/src/main/resources/basicConfigForProperties.xml
similarity index 100%
rename from spring-all/src/main/resources/basicConfigForProperties.xml
rename to spring-boot-properties/src/main/resources/basicConfigForProperties.xml
diff --git a/spring-all/src/main/resources/basicConfigForPropertiesOne.xml b/spring-boot-properties/src/main/resources/basicConfigForPropertiesOne.xml
similarity index 100%
rename from spring-all/src/main/resources/basicConfigForPropertiesOne.xml
rename to spring-boot-properties/src/main/resources/basicConfigForPropertiesOne.xml
diff --git a/spring-all/src/main/resources/basicConfigForPropertiesTwo.xml b/spring-boot-properties/src/main/resources/basicConfigForPropertiesTwo.xml
similarity index 100%
rename from spring-all/src/main/resources/basicConfigForPropertiesTwo.xml
rename to spring-boot-properties/src/main/resources/basicConfigForPropertiesTwo.xml
diff --git a/spring-all/src/main/resources/child.properties b/spring-boot-properties/src/main/resources/child.properties
similarity index 100%
rename from spring-all/src/main/resources/child.properties
rename to spring-boot-properties/src/main/resources/child.properties
diff --git a/spring-all/src/main/resources/configForProperties.xml b/spring-boot-properties/src/main/resources/configForProperties.xml
similarity index 92%
rename from spring-all/src/main/resources/configForProperties.xml
rename to spring-boot-properties/src/main/resources/configForProperties.xml
index 459aea3ec6..d796f791cb 100644
--- a/spring-all/src/main/resources/configForProperties.xml
+++ b/spring-boot-properties/src/main/resources/configForProperties.xml
@@ -9,7 +9,7 @@
 
     <context:property-placeholder location="classpath:foo.properties,classpath:bar.properties"/>
 
-    <bean id="componentInXmlUsingProperties" class="org.baeldung.properties.core.ComponentInXmlUsingProperties">
+    <bean id="componentInXmlUsingProperties" class="com.baeldung.properties.core.ComponentInXmlUsingProperties">
         <constructor-arg value="${key.something}"/>
     </bean>
 
diff --git a/spring-all/src/main/resources/configForPropertiesOne.xml b/spring-boot-properties/src/main/resources/configForPropertiesOne.xml
similarity index 92%
rename from spring-all/src/main/resources/configForPropertiesOne.xml
rename to spring-boot-properties/src/main/resources/configForPropertiesOne.xml
index 068c86a840..53072d89bb 100644
--- a/spring-all/src/main/resources/configForPropertiesOne.xml
+++ b/spring-boot-properties/src/main/resources/configForPropertiesOne.xml
@@ -9,7 +9,7 @@
 
     <context:property-placeholder location="classpath:foo.properties" ignore-unresolvable="true" order="1"/>
 
-    <bean id="componentInXmlUsingProperties" class="org.baeldung.properties.core.ComponentInXmlUsingProperties">
+    <bean id="componentInXmlUsingProperties" class="com.baeldung.properties.core.ComponentInXmlUsingProperties">
         <constructor-arg value="${key.something2}"/>
     </bean>
 
diff --git a/spring-boot/src/main/resources/configprops.json b/spring-boot-properties/src/main/resources/configprops.json
similarity index 100%
rename from spring-boot/src/main/resources/configprops.json
rename to spring-boot-properties/src/main/resources/configprops.json
diff --git a/spring-boot/src/main/resources/configprops.properties b/spring-boot-properties/src/main/resources/configprops.properties
similarity index 89%
rename from spring-boot/src/main/resources/configprops.properties
rename to spring-boot-properties/src/main/resources/configprops.properties
index 424b3632f9..71e81065ce 100644
--- a/spring-boot/src/main/resources/configprops.properties
+++ b/spring-boot-properties/src/main/resources/configprops.properties
@@ -22,3 +22,6 @@ item.name=Item name
 item.size=42
 
 
+#Additional properties
+additional.unit=km
+additional.max=100
\ No newline at end of file
diff --git a/spring-boot-properties/src/main/resources/conversion.properties b/spring-boot-properties/src/main/resources/conversion.properties
new file mode 100644
index 0000000000..94fadeb951
--- /dev/null
+++ b/spring-boot-properties/src/main/resources/conversion.properties
@@ -0,0 +1,2 @@
+conversion.timeInDefaultUnit=10
+conversion.timeInNano=9ns
\ No newline at end of file
diff --git a/spring-all/src/main/resources/foo.properties b/spring-boot-properties/src/main/resources/foo.properties
similarity index 100%
rename from spring-all/src/main/resources/foo.properties
rename to spring-boot-properties/src/main/resources/foo.properties
diff --git a/spring-all/src/main/resources/parent.properties b/spring-boot-properties/src/main/resources/parent.properties
similarity index 100%
rename from spring-all/src/main/resources/parent.properties
rename to spring-boot-properties/src/main/resources/parent.properties
diff --git a/spring-core/src/main/resources/values.properties b/spring-boot-properties/src/main/resources/values.properties
similarity index 100%
rename from spring-core/src/main/resources/values.properties
rename to spring-boot-properties/src/main/resources/values.properties
diff --git a/spring-core/src/main/resources/valueswithdefaults.properties b/spring-boot-properties/src/main/resources/valueswithdefaults.properties
similarity index 100%
rename from spring-core/src/main/resources/valueswithdefaults.properties
rename to spring-boot-properties/src/main/resources/valueswithdefaults.properties
diff --git a/spring-boot/src/test/java/com/baeldung/properties/ConfigPropertiesIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/ConfigPropertiesIntegrationTest.java
similarity index 93%
rename from spring-boot/src/test/java/com/baeldung/properties/ConfigPropertiesIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/ConfigPropertiesIntegrationTest.java
index 8f07b2da35..4777551132 100644
--- a/spring-boot/src/test/java/com/baeldung/properties/ConfigPropertiesIntegrationTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/ConfigPropertiesIntegrationTest.java
@@ -1,8 +1,5 @@
 package com.baeldung.properties;
 
-import org.baeldung.properties.AdditionalProperties;
-import org.baeldung.properties.ConfigProperties;
-import org.baeldung.properties.ConfigPropertiesDemoApplication;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-boot/src/test/java/org/baeldung/properties/JsonPropertiesIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/JsonPropertiesIntegrationTest.java
similarity index 98%
rename from spring-boot/src/test/java/org/baeldung/properties/JsonPropertiesIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/JsonPropertiesIntegrationTest.java
index e3d4c62953..2f0e5ae408 100644
--- a/spring-boot/src/test/java/org/baeldung/properties/JsonPropertiesIntegrationTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/JsonPropertiesIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties;
+package com.baeldung.properties;
 
 import java.util.Arrays;
 
diff --git a/spring-all/src/test/java/org/baeldung/properties/basic/BasicPropertiesWithJavaIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/basic/BasicPropertiesWithJavaIntegrationTest.java
similarity index 90%
rename from spring-all/src/test/java/org/baeldung/properties/basic/BasicPropertiesWithJavaIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/basic/BasicPropertiesWithJavaIntegrationTest.java
index 049b0d546a..f12808a16b 100644
--- a/spring-all/src/test/java/org/baeldung/properties/basic/BasicPropertiesWithJavaIntegrationTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/basic/BasicPropertiesWithJavaIntegrationTest.java
@@ -1,6 +1,5 @@
-package org.baeldung.properties.basic;
+package com.baeldung.properties.basic;
 
-import org.baeldung.properties.spring.BasicPropertiesWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +9,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.properties.spring.BasicPropertiesWithJavaConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { BasicPropertiesWithJavaConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class BasicPropertiesWithJavaIntegrationTest {
diff --git a/spring-all/src/test/java/org/baeldung/properties/basic/ExtendedPropertiesWithJavaIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/basic/ExtendedPropertiesWithJavaIntegrationTest.java
similarity index 86%
rename from spring-all/src/test/java/org/baeldung/properties/basic/ExtendedPropertiesWithJavaIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/basic/ExtendedPropertiesWithJavaIntegrationTest.java
index 28ef76e249..a622029653 100644
--- a/spring-all/src/test/java/org/baeldung/properties/basic/ExtendedPropertiesWithJavaIntegrationTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/basic/ExtendedPropertiesWithJavaIntegrationTest.java
@@ -1,7 +1,5 @@
-package org.baeldung.properties.basic;
+package com.baeldung.properties.basic;
 
-import org.baeldung.properties.spring.BasicPropertiesWithJavaConfig;
-import org.baeldung.properties.spring.PropertiesWithJavaConfigOther;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +9,9 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.properties.spring.BasicPropertiesWithJavaConfig;
+import com.baeldung.properties.spring.PropertiesWithJavaConfigOther;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { BasicPropertiesWithJavaConfig.class, PropertiesWithJavaConfigOther.class }, loader = AnnotationConfigContextLoader.class)
 public class ExtendedPropertiesWithJavaIntegrationTest {
diff --git a/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java
similarity index 90%
rename from spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java
index c55c1ee783..e43007ea2c 100644
--- a/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java
@@ -1,6 +1,5 @@
-package org.baeldung.properties.basic;
+package com.baeldung.properties.basic;
 
-import org.baeldung.properties.spring.PropertiesWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +9,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.properties.spring.PropertiesWithJavaConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { PropertiesWithJavaConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class PropertiesWithJavaIntegrationTest {
diff --git a/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithMultipleXmlsIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/basic/PropertiesWithMultipleXmlsIntegrationTest.java
similarity index 96%
rename from spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithMultipleXmlsIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/basic/PropertiesWithMultipleXmlsIntegrationTest.java
index 461f86f559..c3af2dc1d8 100644
--- a/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithMultipleXmlsIntegrationTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/basic/PropertiesWithMultipleXmlsIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.basic;
+package com.baeldung.properties.basic;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithXmlIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/basic/PropertiesWithXmlIntegrationTest.java
similarity index 95%
rename from spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithXmlIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/basic/PropertiesWithXmlIntegrationTest.java
index 5e7689a2d9..85c4ac34e2 100644
--- a/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithXmlIntegrationTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/basic/PropertiesWithXmlIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.basic;
+package com.baeldung.properties.basic;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-boot/src/test/java/com/baeldung/properties/conversion/PropertiesConversionIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/conversion/PropertiesConversionIntegrationTest.java
similarity index 100%
rename from spring-boot/src/test/java/com/baeldung/properties/conversion/PropertiesConversionIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/conversion/PropertiesConversionIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithJavaIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/external/ExternalPropertiesWithJavaIntegrationTest.java
similarity index 88%
rename from spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithJavaIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/external/ExternalPropertiesWithJavaIntegrationTest.java
index c38a4b5465..2d6b3a74c5 100644
--- a/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithJavaIntegrationTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/external/ExternalPropertiesWithJavaIntegrationTest.java
@@ -1,6 +1,5 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
-import org.baeldung.properties.spring.PropertiesWithJavaConfigOther;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -11,6 +10,9 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.properties.external.ExternalPropertiesWithJavaConfig;
+import com.baeldung.properties.spring.PropertiesWithJavaConfigOther;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { ExternalPropertiesWithJavaConfig.class, PropertiesWithJavaConfigOther.class }, loader = AnnotationConfigContextLoader.class)
 @Ignore("manual only")
diff --git a/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithMultipleXmlsIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/external/ExternalPropertiesWithMultipleXmlsIntegrationTest.java
similarity index 87%
rename from spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithMultipleXmlsIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/external/ExternalPropertiesWithMultipleXmlsIntegrationTest.java
index fe96ea8f7f..018c655ec2 100644
--- a/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithMultipleXmlsIntegrationTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/external/ExternalPropertiesWithMultipleXmlsIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
 import org.junit.Ignore;
 import org.junit.Test;
@@ -10,6 +10,9 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.properties.external.ExternalPropertiesWithXmlConfigOne;
+import com.baeldung.properties.external.ExternalPropertiesWithXmlConfigTwo;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { ExternalPropertiesWithXmlConfigOne.class, ExternalPropertiesWithXmlConfigTwo.class }, loader = AnnotationConfigContextLoader.class)
 @Ignore("manual only")
diff --git a/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithXmlManualTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/external/ExternalPropertiesWithXmlManualTest.java
similarity index 92%
rename from spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithXmlManualTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/external/ExternalPropertiesWithXmlManualTest.java
index a8a7bda91c..4f0abbc12c 100644
--- a/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithXmlManualTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/external/ExternalPropertiesWithXmlManualTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
 import org.junit.Ignore;
 import org.junit.Test;
@@ -10,6 +10,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.properties.external.ExternalPropertiesWithXmlConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { ExternalPropertiesWithXmlConfig.class }, loader = AnnotationConfigContextLoader.class)
 @Ignore("manual only")
diff --git a/spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesJavaConfigIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePropertiesJavaConfigIntegrationTest.java
similarity index 85%
rename from spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesJavaConfigIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePropertiesJavaConfigIntegrationTest.java
index 9cb41c20f7..c7b9d33803 100644
--- a/spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesJavaConfigIntegrationTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePropertiesJavaConfigIntegrationTest.java
@@ -1,10 +1,11 @@
-package org.baeldung.properties.multiple;
+package com.baeldung.properties.multiple;
 
-import org.baeldung.properties.spring.PropertiesWithJavaConfig;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
+import com.baeldung.properties.spring.PropertiesWithJavaConfig;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringJUnitConfig(PropertiesWithJavaConfig.class)
diff --git a/spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java
similarity index 93%
rename from spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java
index b4f81f3541..db71e816dd 100644
--- a/spring-all/src/test/java/org/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.multiple;
+package com.baeldung.properties.multiple;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/spring-all/src/test/java/org/baeldung/properties/parentchild/ChildValueHolder.java b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ChildValueHolder.java
similarity index 90%
rename from spring-all/src/test/java/org/baeldung/properties/parentchild/ChildValueHolder.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ChildValueHolder.java
index 0ed66d3c68..d97e7efb9e 100644
--- a/spring-all/src/test/java/org/baeldung/properties/parentchild/ChildValueHolder.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ChildValueHolder.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.parentchild;
+package com.baeldung.properties.parentchild;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
diff --git a/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentChildPropertyPlaceHolderPropertiesIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ParentChildPropertyPlaceHolderPropertiesIntegrationTest.java
similarity index 91%
rename from spring-all/src/test/java/org/baeldung/properties/parentchild/ParentChildPropertyPlaceHolderPropertiesIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ParentChildPropertyPlaceHolderPropertiesIntegrationTest.java
index e0eccc978a..374a502e5c 100644
--- a/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentChildPropertyPlaceHolderPropertiesIntegrationTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ParentChildPropertyPlaceHolderPropertiesIntegrationTest.java
@@ -1,10 +1,8 @@
-package org.baeldung.properties.parentchild;
+package com.baeldung.properties.parentchild;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import org.baeldung.properties.parentchild.config.ChildConfig2;
-import org.baeldung.properties.parentchild.config.ParentConfig2;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +13,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.web.context.WebApplicationContext;
 
+import com.baeldung.properties.parentchild.config.ChildConfig2;
+import com.baeldung.properties.parentchild.config.ParentConfig2;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextHierarchy({ @ContextConfiguration(classes = ParentConfig2.class), @ContextConfiguration(classes = ChildConfig2.class) })
diff --git a/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentChildPropertySourcePropertiesIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ParentChildPropertySourcePropertiesIntegrationTest.java
similarity index 91%
rename from spring-all/src/test/java/org/baeldung/properties/parentchild/ParentChildPropertySourcePropertiesIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ParentChildPropertySourcePropertiesIntegrationTest.java
index e9990523a7..c8d3413a04 100644
--- a/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentChildPropertySourcePropertiesIntegrationTest.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ParentChildPropertySourcePropertiesIntegrationTest.java
@@ -1,10 +1,8 @@
-package org.baeldung.properties.parentchild;
+package com.baeldung.properties.parentchild;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import org.baeldung.properties.parentchild.config.ChildConfig;
-import org.baeldung.properties.parentchild.config.ParentConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +13,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.web.context.WebApplicationContext;
 
+import com.baeldung.properties.parentchild.config.ChildConfig;
+import com.baeldung.properties.parentchild.config.ParentConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextHierarchy({ @ContextConfiguration(classes = ParentConfig.class), @ContextConfiguration(classes = ChildConfig.class) })
diff --git a/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentValueHolder.java b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ParentValueHolder.java
similarity index 90%
rename from spring-all/src/test/java/org/baeldung/properties/parentchild/ParentValueHolder.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ParentValueHolder.java
index abfafa8a7d..0330239f16 100644
--- a/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentValueHolder.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ParentValueHolder.java
@@ -1,4 +1,4 @@
-package org.baeldung.properties.parentchild;
+package com.baeldung.properties.parentchild;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
diff --git a/spring-all/src/test/java/org/baeldung/properties/parentchild/config/ChildConfig.java b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ChildConfig.java
similarity index 84%
rename from spring-all/src/test/java/org/baeldung/properties/parentchild/config/ChildConfig.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ChildConfig.java
index 23c8db7864..41bc4704c3 100644
--- a/spring-all/src/test/java/org/baeldung/properties/parentchild/config/ChildConfig.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ChildConfig.java
@@ -1,11 +1,12 @@
-package org.baeldung.properties.parentchild.config;
+package com.baeldung.properties.parentchild.config;
 
-import org.baeldung.properties.parentchild.ChildValueHolder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
+import com.baeldung.properties.parentchild.ChildValueHolder;
+
 @Configuration
 @PropertySource("classpath:child.properties")
 public class ChildConfig {
diff --git a/spring-all/src/test/java/org/baeldung/properties/parentchild/config/ChildConfig2.java b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ChildConfig2.java
similarity index 85%
rename from spring-all/src/test/java/org/baeldung/properties/parentchild/config/ChildConfig2.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ChildConfig2.java
index 2ed14d7701..c15fcbd352 100644
--- a/spring-all/src/test/java/org/baeldung/properties/parentchild/config/ChildConfig2.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ChildConfig2.java
@@ -1,11 +1,12 @@
-package org.baeldung.properties.parentchild.config;
+package com.baeldung.properties.parentchild.config;
 
-import org.baeldung.properties.parentchild.ChildValueHolder;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
 
+import com.baeldung.properties.parentchild.ChildValueHolder;
+
 @Configuration
 public class ChildConfig2 {
 
diff --git a/spring-all/src/test/java/org/baeldung/properties/parentchild/config/ParentConfig.java b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ParentConfig.java
similarity index 84%
rename from spring-all/src/test/java/org/baeldung/properties/parentchild/config/ParentConfig.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ParentConfig.java
index ed407e0b52..5cb8cc1639 100644
--- a/spring-all/src/test/java/org/baeldung/properties/parentchild/config/ParentConfig.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ParentConfig.java
@@ -1,11 +1,12 @@
-package org.baeldung.properties.parentchild.config;
+package com.baeldung.properties.parentchild.config;
 
-import org.baeldung.properties.parentchild.ParentValueHolder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
+import com.baeldung.properties.parentchild.ParentValueHolder;
+
 @Configuration
 @PropertySource("classpath:parent.properties")
 public class ParentConfig {
diff --git a/spring-all/src/test/java/org/baeldung/properties/parentchild/config/ParentConfig2.java b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ParentConfig2.java
similarity index 85%
rename from spring-all/src/test/java/org/baeldung/properties/parentchild/config/ParentConfig2.java
rename to spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ParentConfig2.java
index c38ba8e483..ddb59a5309 100644
--- a/spring-all/src/test/java/org/baeldung/properties/parentchild/config/ParentConfig2.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ParentConfig2.java
@@ -1,11 +1,12 @@
-package org.baeldung.properties.parentchild.config;
+package com.baeldung.properties.parentchild.config;
 
-import org.baeldung.properties.parentchild.ParentValueHolder;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
 
+import com.baeldung.properties.parentchild.ParentValueHolder;
+
 @Configuration
 public class ParentConfig2 {
 
diff --git a/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java b/spring-boot-properties/src/test/java/com/baeldung/test/IntegrationTestSuite.java
similarity index 59%
rename from spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java
rename to spring-boot-properties/src/test/java/com/baeldung/test/IntegrationTestSuite.java
index 470ae9e538..722c4fd1c4 100644
--- a/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java
+++ b/spring-boot-properties/src/test/java/com/baeldung/test/IntegrationTestSuite.java
@@ -1,15 +1,16 @@
-package org.baeldung.test;
+package com.baeldung.test;
 
-import org.baeldung.properties.basic.ExtendedPropertiesWithJavaIntegrationTest;
-import org.baeldung.properties.basic.PropertiesWithMultipleXmlsIntegrationTest;
-import org.baeldung.properties.basic.PropertiesWithXmlIntegrationTest;
-import org.baeldung.properties.external.ExternalPropertiesWithJavaIntegrationTest;
-import org.baeldung.properties.external.ExternalPropertiesWithMultipleXmlsIntegrationTest;
-import org.baeldung.properties.external.ExternalPropertiesWithXmlManualTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
+import com.baeldung.properties.basic.ExtendedPropertiesWithJavaIntegrationTest;
+import com.baeldung.properties.basic.PropertiesWithMultipleXmlsIntegrationTest;
+import com.baeldung.properties.basic.PropertiesWithXmlIntegrationTest;
+import com.baeldung.properties.external.ExternalPropertiesWithJavaIntegrationTest;
+import com.baeldung.properties.external.ExternalPropertiesWithMultipleXmlsIntegrationTest;
+import com.baeldung.properties.external.ExternalPropertiesWithXmlManualTest;
+
 @RunWith(Suite.class)
 @SuiteClasses({ //@formatter:off
     PropertiesWithXmlIntegrationTest.class,
diff --git a/spring-core/src/test/java/com/baeldung/value/ClassNotManagedBySpringIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/value/ClassNotManagedBySpringIntegrationTest.java
similarity index 100%
rename from spring-core/src/test/java/com/baeldung/value/ClassNotManagedBySpringIntegrationTest.java
rename to spring-boot-properties/src/test/java/com/baeldung/value/ClassNotManagedBySpringIntegrationTest.java
diff --git a/spring-boot-properties/src/test/resources/application.properties b/spring-boot-properties/src/test/resources/application.properties
index 6fc241a106..2e06fad574 100644
--- a/spring-boot-properties/src/test/resources/application.properties
+++ b/spring-boot-properties/src/test/resources/application.properties
@@ -1,3 +1,4 @@
 management.endpoints.web.exposure.include=refresh
 spring.properties.refreshDelay=1000
-spring.config.location=file:extra.properties
\ No newline at end of file
+spring.config.location=file:extra.properties
+spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
diff --git a/spring-boot/src/test/resources/configprops-test.properties b/spring-boot-properties/src/test/resources/configprops-test.properties
similarity index 100%
rename from spring-boot/src/test/resources/configprops-test.properties
rename to spring-boot-properties/src/test/resources/configprops-test.properties
diff --git a/spring-boot-properties/src/test/resources/conversion.properties b/spring-boot-properties/src/test/resources/conversion.properties
new file mode 100644
index 0000000000..640442ec33
--- /dev/null
+++ b/spring-boot-properties/src/test/resources/conversion.properties
@@ -0,0 +1,11 @@
+###### time unit
+conversion.timeInDefaultUnit=10
+conversion.timeInNano=9ns
+conversion.timeInDays=2
+
+###### data size
+conversion.sizeInDefaultUnit=300
+conversion.sizeInGB=2GB
+conversion.sizeInTB=4
+
+conversion.employee=john,2000
\ No newline at end of file
diff --git a/spring-boot/README.MD b/spring-boot/README.MD
index e159220cbc..04d76e438e 100644
--- a/spring-boot/README.MD
+++ b/spring-boot/README.MD
@@ -14,7 +14,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Custom Information in Spring Boot Info Endpoint](http://www.baeldung.com/spring-boot-info-actuator-custom)
 - [Using @JsonComponent in Spring Boot](http://www.baeldung.com/spring-boot-jsoncomponent)
 - [Testing in Spring Boot](http://www.baeldung.com/spring-boot-testing)
-- [Guide to @ConfigurationProperties in Spring Boot](http://www.baeldung.com/configuration-properties-in-spring-boot)
 - [How to Get All Spring-Managed Beans?](http://www.baeldung.com/spring-show-all-beans)
 - [Spring Boot and Togglz Aspect](http://www.baeldung.com/spring-togglz)
 - [Getting Started with GraphQL and Spring Boot](http://www.baeldung.com/spring-graphql)
@@ -29,9 +28,7 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Spring Shutdown Callbacks](http://www.baeldung.com/spring-shutdown-callbacks)
 - [Container Configuration in Spring Boot 2](http://www.baeldung.com/embeddedservletcontainercustomizer-configurableembeddedservletcontainer-spring-boot)
 - [Introduction to Chaos Monkey](https://www.baeldung.com/spring-boot-chaos-monkey)
-- [Load Spring Boot Properties From a JSON File](https://www.baeldung.com/spring-boot-json-properties)
 - [Display Auto-Configuration Report in Spring Boot](https://www.baeldung.com/spring-boot-auto-configuration-report)
 - [Injecting Git Information Into Spring](https://www.baeldung.com/spring-git-information)
 - [Validation in Spring Boot](https://www.baeldung.com/spring-boot-bean-validation)
 - [Guide to Creating and Running a Jar File in Java](https://www.baeldung.com/java-create-jar)
-- [Guide to @EnableConfigurationProperties](https://www.baeldung.com/spring-enable-config-properties)
diff --git a/spring-boot/src/main/java/org/baeldung/properties/ConfigProperties.java b/spring-boot/src/main/java/org/baeldung/properties/ConfigProperties.java
deleted file mode 100644
index 1a3c985fe4..0000000000
--- a/spring-boot/src/main/java/org/baeldung/properties/ConfigProperties.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.baeldung.properties;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.validation.annotation.Validated;
-
-@Configuration
-@PropertySource("classpath:configprops.properties")
-@ConfigurationProperties(prefix = "mail")
-@Validated
-public class ConfigProperties {
-
-    @NotBlank
-    private String hostName;
-
-    @Min(1025)
-    @Max(65536)
-    private int port;
-
-    @Pattern(regexp = "^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,6}$")
-    private String from;
-
-    private List<String> defaultRecipients;
-    private Map<String, String> additionalHeaders;
-    private Credentials credentials;
-
-    public String getHostName() {
-        return hostName;
-    }
-
-    public void setHostName(String hostName) {
-        this.hostName = hostName;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public String getFrom() {
-        return from;
-    }
-
-    public void setFrom(String from) {
-        this.from = from;
-    }
-
-    public List<String> getDefaultRecipients() {
-        return defaultRecipients;
-    }
-
-    public void setDefaultRecipients(List<String> defaultRecipients) {
-        this.defaultRecipients = defaultRecipients;
-    }
-
-    public Map<String, String> getAdditionalHeaders() {
-        return additionalHeaders;
-    }
-
-    public void setAdditionalHeaders(Map<String, String> additionalHeaders) {
-        this.additionalHeaders = additionalHeaders;
-    }
-
-    public Credentials getCredentials() {
-        return credentials;
-    }
-
-    public void setCredentials(Credentials credentials) {
-        this.credentials = credentials;
-    }
-
-    @Bean
-    @ConfigurationProperties(prefix = "item")
-    public Item item(){
-        return new Item();
-    }
-}
diff --git a/spring-boot/src/main/java/org/baeldung/properties/ConfigPropertiesDemoApplication.java b/spring-boot/src/main/java/org/baeldung/properties/ConfigPropertiesDemoApplication.java
deleted file mode 100644
index 7b8f2c3411..0000000000
--- a/spring-boot/src/main/java/org/baeldung/properties/ConfigPropertiesDemoApplication.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.baeldung.properties;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.context.annotation.ComponentScan;
-
-@SpringBootApplication
-@ComponentScan(basePackageClasses = {ConfigProperties.class,
-        JsonProperties.class,
-        CustomJsonProperties.class,
-        AdditionalConfiguration.class})
-public class ConfigPropertiesDemoApplication {
-    public static void main(String[] args) {
-        new SpringApplicationBuilder(ConfigPropertiesDemoApplication.class).initializers(new JsonPropertyContextInitializer())
-                .run();
-    }
-
-}
diff --git a/spring-boot/src/main/java/org/baeldung/properties/Credentials.java b/spring-boot/src/main/java/org/baeldung/properties/Credentials.java
deleted file mode 100644
index 2d8ac76e62..0000000000
--- a/spring-boot/src/main/java/org/baeldung/properties/Credentials.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.baeldung.properties;
-
-import org.hibernate.validator.constraints.Length;
-import org.springframework.validation.annotation.Validated;
-
-@Validated
-public class Credentials {
-
-    @Length(max = 4, min = 1)
-    private String authMethod;
-    private String username;
-    private String password;
-
-    public String getAuthMethod() {
-        return authMethod;
-    }
-
-    public void setAuthMethod(String authMethod) {
-        this.authMethod = authMethod;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-}
diff --git a/spring-boot/src/main/java/org/baeldung/properties/CustomJsonProperties.java b/spring-boot/src/main/java/org/baeldung/properties/CustomJsonProperties.java
deleted file mode 100644
index 3fae8a8e98..0000000000
--- a/spring-boot/src/main/java/org/baeldung/properties/CustomJsonProperties.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.baeldung.properties;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Component
-@ConfigurationProperties(prefix = "custom")
-public class CustomJsonProperties {
-
-    private String host;
-
-    private int port;
-
-    private boolean resend;
-
-    private Person sender;
-
-    public static class Person {
-
-        private String name;
-        private String address;
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getAddress() {
-            return address;
-        }
-
-        public void setAddress(String address) {
-            this.address = address;
-        }
-    }
-
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public boolean isResend() {
-        return resend;
-    }
-
-    public void setResend(boolean resend) {
-        this.resend = resend;
-    }
-
-    public Person getSender() {
-        return sender;
-    }
-
-    public void setSender(Person sender) {
-        this.sender = sender;
-    }
-}
diff --git a/spring-boot/src/main/java/org/baeldung/properties/JsonProperties.java b/spring-boot/src/main/java/org/baeldung/properties/JsonProperties.java
deleted file mode 100644
index 5c31cd1344..0000000000
--- a/spring-boot/src/main/java/org/baeldung/properties/JsonProperties.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.baeldung.properties;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
-
-@Component
-@PropertySource(value = "classpath:configprops.json", factory = JsonPropertySourceFactory.class)
-@ConfigurationProperties
-public class JsonProperties {
-
-    private String host;
-
-    private int port;
-
-    private boolean resend;
-
-    private List<String> topics;
-
-    private LinkedHashMap<String, ?> sender;
-
-    public LinkedHashMap<String, ?> getSender() {
-        return sender;
-    }
-
-    public void setSender(LinkedHashMap<String, ?> sender) {
-        this.sender = sender;
-    }
-
-    public List<String> getTopics() {
-        return topics;
-    }
-
-    public void setTopics(List<String> topics) {
-        this.topics = topics;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public boolean isResend() {
-        return resend;
-    }
-
-    public void setResend(boolean resend) {
-        this.resend = resend;
-    }
-
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-}
diff --git a/spring-boot/src/main/java/org/baeldung/properties/JsonPropertyContextInitializer.java b/spring-boot/src/main/java/org/baeldung/properties/JsonPropertyContextInitializer.java
deleted file mode 100644
index fd9b3f35a5..0000000000
--- a/spring-boot/src/main/java/org/baeldung/properties/JsonPropertyContextInitializer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.baeldung.properties;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.env.MapPropertySource;
-import org.springframework.core.env.PropertySource;
-import org.springframework.core.io.Resource;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class JsonPropertyContextInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-
-    private final static String CUSTOM_PREFIX = "custom.";
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
-        try {
-            Resource resource = configurableApplicationContext.getResource("classpath:configprops.json");
-            Map readValue = new ObjectMapper().readValue(resource.getInputStream(), Map.class);
-            Set<Map.Entry> set = readValue.entrySet();
-            List<MapPropertySource> propertySources = convertEntrySet(set, Optional.empty());
-            for (PropertySource propertySource : propertySources) {
-                configurableApplicationContext.getEnvironment()
-                    .getPropertySources()
-                    .addFirst(propertySource);
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static List<MapPropertySource> convertEntrySet(Set<Map.Entry> entrySet, Optional<String> parentKey) {
-        return entrySet.stream()
-            .map((Map.Entry e) -> convertToPropertySourceList(e, parentKey))
-            .flatMap(Collection::stream)
-            .collect(Collectors.toList());
-    }
-
-    private static List<MapPropertySource> convertToPropertySourceList(Map.Entry e, Optional<String> parentKey) {
-        String key = parentKey.map(s -> s + ".")
-            .orElse("") + (String) e.getKey();
-        Object value = e.getValue();
-        return covertToPropertySourceList(key, value);
-    }
-
-    @SuppressWarnings("unchecked")
-    private static List<MapPropertySource> covertToPropertySourceList(String key, Object value) {
-        if (value instanceof LinkedHashMap) {
-            LinkedHashMap map = (LinkedHashMap) value;
-            Set<Map.Entry> entrySet = map.entrySet();
-            return convertEntrySet(entrySet, Optional.ofNullable(key));
-        }
-        String finalKey = CUSTOM_PREFIX + key;
-        return Collections.singletonList(new MapPropertySource(finalKey, Collections.singletonMap(finalKey, value)));
-    }
-
-}
\ No newline at end of file
diff --git a/spring-boot/src/main/java/org/baeldung/properties/JsonPropertySourceFactory.java b/spring-boot/src/main/java/org/baeldung/properties/JsonPropertySourceFactory.java
deleted file mode 100644
index 9578179519..0000000000
--- a/spring-boot/src/main/java/org/baeldung/properties/JsonPropertySourceFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.baeldung.properties;
-
-import java.io.IOException;
-import java.util.Map;
-
-import org.springframework.core.env.MapPropertySource;
-import org.springframework.core.env.PropertySource;
-import org.springframework.core.io.support.EncodedResource;
-import org.springframework.core.io.support.PropertySourceFactory;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class JsonPropertySourceFactory implements PropertySourceFactory {
-
-    @Override
-    public PropertySource<?> createPropertySource(String name, EncodedResource resource) throws IOException {
-        Map readValue = new ObjectMapper().readValue(resource.getInputStream(), Map.class);
-        return new MapPropertySource("json-property", readValue);
-    }
-
-}
\ No newline at end of file
diff --git a/spring-boot/src/test/java/com/baeldung/properties/JsonPropertiesIntegrationTest.java b/spring-boot/src/test/java/com/baeldung/properties/JsonPropertiesIntegrationTest.java
deleted file mode 100644
index 48c551d1dd..0000000000
--- a/spring-boot/src/test/java/com/baeldung/properties/JsonPropertiesIntegrationTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.baeldung.properties;
-
-import java.util.Arrays;
-
-import org.baeldung.properties.ConfigPropertiesDemoApplication;
-import org.baeldung.properties.CustomJsonProperties;
-import org.baeldung.properties.JsonProperties;
-import org.baeldung.properties.JsonPropertyContextInitializer;
-import org.hamcrest.Matchers;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = ConfigPropertiesDemoApplication.class, initializers = JsonPropertyContextInitializer.class)
-public class JsonPropertiesIntegrationTest {
-
-    @Autowired
-    private JsonProperties jsonProperties;
-
-    @Autowired
-    private CustomJsonProperties customJsonProperties;
-
-    @Test
-    public void whenPropertiesLoadedViaJsonPropertySource_thenLoadFlatValues() {
-        Assert.assertEquals("mailer@mail.com", jsonProperties.getHost());
-        Assert.assertEquals(9090, jsonProperties.getPort());
-        Assert.assertTrue(jsonProperties.isResend());
-    }
-
-    @Test
-    public void whenPropertiesLoadedViaJsonPropertySource_thenLoadListValues() {
-        Assert.assertThat(jsonProperties.getTopics(), Matchers.is(Arrays.asList("spring", "boot")));
-    }
-
-    @Test
-    public void whenPropertiesLoadedViaJsonPropertySource_thenNestedLoadedAsMap() {
-        Assert.assertEquals("sender", jsonProperties.getSender()
-            .get("name"));
-        Assert.assertEquals("street", jsonProperties.getSender()
-            .get("address"));
-    }
-
-    @Test
-    public void whenLoadedIntoEnvironment_thenFlatValuesPopulated() {
-        Assert.assertEquals("mailer@mail.com", customJsonProperties.getHost());
-        Assert.assertEquals(9090, customJsonProperties.getPort());
-        Assert.assertTrue(customJsonProperties.isResend());
-    }
-
-    @Test
-    public void whenLoadedIntoEnvironment_thenValuesLoadedIntoClassObject() {
-        Assert.assertNotNull(customJsonProperties.getSender());
-        Assert.assertEquals("sender", customJsonProperties.getSender()
-            .getName());
-        Assert.assertEquals("street", customJsonProperties.getSender()
-            .getAddress());
-    }
-
-}
diff --git a/spring-boot/src/test/java/org/baeldung/properties/ConfigPropertiesIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/properties/ConfigPropertiesIntegrationTest.java
deleted file mode 100644
index f864fd4f8c..0000000000
--- a/spring-boot/src/test/java/org/baeldung/properties/ConfigPropertiesIntegrationTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.baeldung.properties;
-
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = ConfigPropertiesDemoApplication.class)
-@TestPropertySource("classpath:configprops-test.properties")
-public class ConfigPropertiesIntegrationTest {
-
-    @Autowired
-    private ConfigProperties properties;
-
-    @Test
-    public void whenSimplePropertyQueriedthenReturnsProperty() throws Exception {
-        Assert.assertEquals("Incorrectly bound hostName property", "host@mail.com", properties.getHostName());
-        Assert.assertEquals("Incorrectly bound port property", 9000, properties.getPort());
-        Assert.assertEquals("Incorrectly bound from property", "mailer@mail.com", properties.getFrom());
-    }
-
-    @Test
-    public void whenListPropertyQueriedthenReturnsProperty() throws Exception {
-        List<String> defaultRecipients = properties.getDefaultRecipients();
-        Assert.assertTrue("Couldn't bind list property!", defaultRecipients.size() == 2);
-        Assert.assertTrue("Incorrectly bound list property. Expected 2 entries!", defaultRecipients.size() == 2);
-        Assert.assertEquals("Incorrectly bound list[0] property", "admin@mail.com", defaultRecipients.get(0));
-        Assert.assertEquals("Incorrectly bound list[1] property", "owner@mail.com", defaultRecipients.get(1));
-    }
-
-    @Test
-    public void whenMapPropertyQueriedthenReturnsProperty() throws Exception {
-        Map<String, String> additionalHeaders = properties.getAdditionalHeaders();
-        Assert.assertTrue("Couldn't bind map property!", additionalHeaders != null);
-        Assert.assertTrue("Incorrectly bound map property. Expected 3 Entries!", additionalHeaders.size() == 3);
-        Assert.assertEquals("Incorrectly bound map[redelivery] property", "true", additionalHeaders.get("redelivery"));
-        Assert.assertEquals("Incorrectly bound map[secure] property", "true", additionalHeaders.get("secure"));
-        Assert.assertEquals("Incorrectly bound map[p3] property", "value", additionalHeaders.get("p3"));
-    }
-
-    @Test
-    public void whenObjectPropertyQueriedthenReturnsProperty() throws Exception {
-        Credentials credentials = properties.getCredentials();
-        Assert.assertTrue("Couldn't bind map property!", credentials != null);
-        Assert.assertEquals("Incorrectly bound object property, authMethod", "SHA1", credentials.getAuthMethod());
-        Assert.assertEquals("Incorrectly bound object property, username", "john", credentials.getUsername());
-        Assert.assertEquals("Incorrectly bound object property, password", "password", credentials.getPassword());
-    }
-
-    @Test
-    public void whenBeanMethodAnnotatedThenPropertiesCorrectlyBound(){
-        Item item = properties.item();
-        Assert.assertEquals("Incorrectly bound object property, item.name","Test item name", item.getName());
-        Assert.assertEquals("Incorrectly bound object property, item.size", 21, item.getSize());
-    }
-}
diff --git a/spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 91%
rename from spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextLiveTest.java
index a5ab1342a1..8a33efef43 100644
--- a/spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -9,7 +9,7 @@ import com.baeldung.SpringCloudConfigClientApplication;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringCloudConfigClientApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
 	@Test
 	public void contextLoads() {
diff --git a/spring-cloud-data-flow/README.MD b/spring-cloud-data-flow/README.MD
index 9e5cef19af..f2ab96de2c 100644
--- a/spring-cloud-data-flow/README.MD
+++ b/spring-cloud-data-flow/README.MD
@@ -1,4 +1,2 @@
-### Relevant Articles:
-- [Batch Processing with Spring Cloud Data Flow](http://www.baeldung.com/spring-cloud-data-flow-batch-processing)
-- [Getting Started with Stream Processing with Spring Cloud Data Flow](http://www.baeldung.com/spring-cloud-data-flow-stream-processing)
-- [Spring Cloud Data Flow With Apache Spark](https://www.baeldung.com/spring-cloud-data-flow-spark)
+
+This is an aggregator module for Spring Cloud Data Flow modules.
diff --git a/spring-cloud-data-flow/apache-spark-job/README.MD b/spring-cloud-data-flow/apache-spark-job/README.MD
new file mode 100644
index 0000000000..ac554f10bc
--- /dev/null
+++ b/spring-cloud-data-flow/apache-spark-job/README.MD
@@ -0,0 +1,3 @@
+### Relevant Articles:
+
+- [Spring Cloud Data Flow With Apache Spark](https://www.baeldung.com/spring-cloud-data-flow-spark)
diff --git a/spring-cloud-data-flow/batch-job/README.MD b/spring-cloud-data-flow/batch-job/README.MD
new file mode 100644
index 0000000000..898f85dbb2
--- /dev/null
+++ b/spring-cloud-data-flow/batch-job/README.MD
@@ -0,0 +1,3 @@
+### Relevant Articles:
+- [Batch Processing with Spring Cloud Data Flow](http://www.baeldung.com/spring-cloud-data-flow-batch-processing)
+
diff --git a/spring-cloud-data-flow/pom.xml b/spring-cloud-data-flow/pom.xml
index 36a780c28d..32e16c72fc 100644
--- a/spring-cloud-data-flow/pom.xml
+++ b/spring-cloud-data-flow/pom.xml
@@ -13,13 +13,9 @@
     </parent>
 
     <modules>
-        <module>data-flow-server</module>
-        <!-- <module>data-flow-shell</module> -->
-        <module>time-source</module>
-        <module>time-processor</module>
-        <module>log-sink</module>
+        <module>spring-cloud-data-flow-stream-processing</module>
+        <module>spring-cloud-data-flow-etl</module>
         <module>batch-job</module>
-        <module>etl</module>
         <module>apache-spark-job</module>
     </modules>
 
diff --git a/spring-cloud-data-flow/etl/README.MD b/spring-cloud-data-flow/spring-cloud-data-flow-etl/README.MD
similarity index 100%
rename from spring-cloud-data-flow/etl/README.MD
rename to spring-cloud-data-flow/spring-cloud-data-flow-etl/README.MD
diff --git a/spring-cloud-data-flow/etl/customer-mongodb-sink/pom.xml b/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml
similarity index 100%
rename from spring-cloud-data-flow/etl/customer-mongodb-sink/pom.xml
rename to spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml
diff --git a/spring-cloud-data-flow/etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/Customer.java b/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/Customer.java
similarity index 100%
rename from spring-cloud-data-flow/etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/Customer.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/Customer.java
diff --git a/spring-cloud-data-flow/etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerListener.java b/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerListener.java
similarity index 100%
rename from spring-cloud-data-flow/etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerListener.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerListener.java
diff --git a/spring-cloud-data-flow/etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerMongodbSinkApplication.java b/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerMongodbSinkApplication.java
similarity index 100%
rename from spring-cloud-data-flow/etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerMongodbSinkApplication.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerMongodbSinkApplication.java
diff --git a/spring-cloud-data-flow/etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerRepository.java b/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerRepository.java
similarity index 100%
rename from spring-cloud-data-flow/etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerRepository.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerRepository.java
diff --git a/spring-cloud-data-flow/etl/customer-mongodb-sink/src/main/resources/application.properties b/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/resources/application.properties
similarity index 100%
rename from spring-cloud-data-flow/etl/customer-mongodb-sink/src/main/resources/application.properties
rename to spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/resources/application.properties
diff --git a/spring-cloud-data-flow/etl/customer-transform/pom.xml b/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml
similarity index 100%
rename from spring-cloud-data-flow/etl/customer-transform/pom.xml
rename to spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml
diff --git a/spring-cloud-data-flow/etl/customer-transform/src/main/java/com/customer/customertransform/Customer.java b/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/Customer.java
similarity index 100%
rename from spring-cloud-data-flow/etl/customer-transform/src/main/java/com/customer/customertransform/Customer.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/Customer.java
diff --git a/spring-cloud-data-flow/etl/customer-transform/src/main/java/com/customer/customertransform/CustomerProcessorConfiguration.java b/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerProcessorConfiguration.java
similarity index 100%
rename from spring-cloud-data-flow/etl/customer-transform/src/main/java/com/customer/customertransform/CustomerProcessorConfiguration.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerProcessorConfiguration.java
diff --git a/spring-cloud-data-flow/etl/customer-transform/src/main/java/com/customer/customertransform/CustomerTransformApplication.java b/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerTransformApplication.java
similarity index 100%
rename from spring-cloud-data-flow/etl/customer-transform/src/main/java/com/customer/customertransform/CustomerTransformApplication.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerTransformApplication.java
diff --git a/spring-cloud-data-flow/etl/customer-transform/src/main/resources/application.properties b/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/resources/application.properties
similarity index 100%
rename from spring-cloud-data-flow/etl/customer-transform/src/main/resources/application.properties
rename to spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/resources/application.properties
diff --git a/spring-cloud-data-flow/etl/pom.xml b/spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml
similarity index 91%
rename from spring-cloud-data-flow/etl/pom.xml
rename to spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml
index 55b2f34289..ab34271273 100644
--- a/spring-cloud-data-flow/etl/pom.xml
+++ b/spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml
@@ -1,7 +1,7 @@
 <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>etl</artifactId>
+    <artifactId>spring-cloud-data-flow-etl</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>etl</name>
     <packaging>pom</packaging>
diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/README.MD b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/README.MD
new file mode 100644
index 0000000000..522c43252f
--- /dev/null
+++ b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/README.MD
@@ -0,0 +1,4 @@
+### Relevant Articles:
+
+- [Getting Started with Stream Processing with Spring Cloud Data Flow](http://www.baeldung.com/spring-cloud-data-flow-stream-processing)
+
diff --git a/spring-cloud-data-flow/data-flow-server/pom.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml
similarity index 100%
rename from spring-cloud-data-flow/data-flow-server/pom.xml
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml
diff --git a/spring-cloud-data-flow/data-flow-server/src/main/java/org/baeldung/spring/cloud/DataFlowServerApplication.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/java/org/baeldung/spring/cloud/DataFlowServerApplication.java
similarity index 100%
rename from spring-cloud-data-flow/data-flow-server/src/main/java/org/baeldung/spring/cloud/DataFlowServerApplication.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/java/org/baeldung/spring/cloud/DataFlowServerApplication.java
diff --git a/spring-amqp/src/main/resources/logback.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/logback.xml
similarity index 100%
rename from spring-amqp/src/main/resources/logback.xml
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/logback.xml
diff --git a/spring-cloud-data-flow/data-flow-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java
similarity index 100%
rename from spring-cloud-data-flow/data-flow-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java
diff --git a/spring-cloud-data-flow/data-flow-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 92%
rename from spring-cloud-data-flow/data-flow-server/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextLiveTest.java
index 83cb8067cf..980c096f5e 100644
--- a/spring-cloud-data-flow/data-flow-server/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = DataFlowServerApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-cloud-data-flow/data-flow-server/src/test/java/org/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java
similarity index 100%
rename from spring-cloud-data-flow/data-flow-server/src/test/java/org/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java
diff --git a/spring-cloud-data-flow/data-flow-shell/pom.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml
similarity index 100%
rename from spring-cloud-data-flow/data-flow-shell/pom.xml
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml
diff --git a/spring-cloud-data-flow/data-flow-shell/spring-shell.log b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/spring-shell.log
similarity index 100%
rename from spring-cloud-data-flow/data-flow-shell/spring-shell.log
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/spring-shell.log
diff --git a/spring-cloud-data-flow/data-flow-shell/src/main/java/org/baeldung/spring/cloud/DataFlowShellApplication.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/java/org/baeldung/spring/cloud/DataFlowShellApplication.java
similarity index 100%
rename from spring-cloud-data-flow/data-flow-shell/src/main/java/org/baeldung/spring/cloud/DataFlowShellApplication.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/java/org/baeldung/spring/cloud/DataFlowShellApplication.java
diff --git a/spring-cloud-data-flow/data-flow-server/src/main/resources/logback.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/resources/logback.xml
similarity index 100%
rename from spring-cloud-data-flow/data-flow-server/src/main/resources/logback.xml
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/resources/logback.xml
diff --git a/spring-cloud-data-flow/data-flow-shell/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/org/baeldung/SpringContextIntegrationTest.java
similarity index 100%
rename from spring-cloud-data-flow/data-flow-shell/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/org/baeldung/SpringContextIntegrationTest.java
diff --git a/spring-cloud-data-flow/data-flow-shell/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 91%
rename from spring-cloud-data-flow/data-flow-shell/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/org/baeldung/SpringContextLiveTest.java
index c456f69979..5be4f9c077 100644
--- a/spring-cloud-data-flow/data-flow-shell/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = DataFlowShellApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void contextLoads() {
diff --git a/spring-cloud-data-flow/log-sink/pom.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/pom.xml
similarity index 100%
rename from spring-cloud-data-flow/log-sink/pom.xml
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/pom.xml
diff --git a/spring-cloud-data-flow/log-sink/src/main/java/org/baeldung/spring/cloud/LogSinkApplication.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/java/org/baeldung/spring/cloud/LogSinkApplication.java
similarity index 100%
rename from spring-cloud-data-flow/log-sink/src/main/java/org/baeldung/spring/cloud/LogSinkApplication.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/java/org/baeldung/spring/cloud/LogSinkApplication.java
diff --git a/spring-cloud-data-flow/data-flow-shell/src/main/resources/logback.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/resources/logback.xml
similarity index 100%
rename from spring-cloud-data-flow/data-flow-shell/src/main/resources/logback.xml
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/resources/logback.xml
diff --git a/spring-cloud-data-flow/log-sink/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/org/baeldung/SpringContextIntegrationTest.java
similarity index 100%
rename from spring-cloud-data-flow/log-sink/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/org/baeldung/SpringContextIntegrationTest.java
diff --git a/spring-cloud-data-flow/log-sink/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-cloud-data-flow/log-sink/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/org/baeldung/SpringContextTest.java
diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml
new file mode 100644
index 0000000000..e5c6830393
--- /dev/null
+++ b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml
@@ -0,0 +1,23 @@
+<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>spring-cloud-data-flow-stream</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-cloud-data-flow-stream</name>
+    <packaging>pom</packaging>
+	
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>data-flow-server</module>
+        <module>data-flow-shell</module>
+        <module>time-source</module>
+        <module>time-processor</module>
+        <module>log-sink</module>
+    </modules>
+
+</project>
diff --git a/spring-cloud-data-flow/time-processor/pom.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/pom.xml
similarity index 100%
rename from spring-cloud-data-flow/time-processor/pom.xml
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/pom.xml
diff --git a/spring-cloud-data-flow/time-processor/src/main/java/org/baeldung/spring/cloud/TimeProcessorApplication.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/java/org/baeldung/spring/cloud/TimeProcessorApplication.java
similarity index 100%
rename from spring-cloud-data-flow/time-processor/src/main/java/org/baeldung/spring/cloud/TimeProcessorApplication.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/java/org/baeldung/spring/cloud/TimeProcessorApplication.java
diff --git a/spring-cloud-data-flow/log-sink/src/main/resources/logback.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/resources/logback.xml
similarity index 100%
rename from spring-cloud-data-flow/log-sink/src/main/resources/logback.xml
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/resources/logback.xml
diff --git a/spring-cloud-data-flow/time-processor/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/org/baeldung/SpringContextIntegrationTest.java
similarity index 100%
rename from spring-cloud-data-flow/time-processor/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/org/baeldung/SpringContextIntegrationTest.java
diff --git a/spring-cloud-data-flow/time-processor/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-cloud-data-flow/time-processor/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/org/baeldung/SpringContextTest.java
diff --git a/spring-cloud-data-flow/time-source/pom.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/pom.xml
similarity index 100%
rename from spring-cloud-data-flow/time-source/pom.xml
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/pom.xml
diff --git a/spring-cloud-data-flow/time-source/src/main/java/org/baeldung/spring/cloud/TimeSourceApplication.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/java/org/baeldung/spring/cloud/TimeSourceApplication.java
similarity index 100%
rename from spring-cloud-data-flow/time-source/src/main/java/org/baeldung/spring/cloud/TimeSourceApplication.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/java/org/baeldung/spring/cloud/TimeSourceApplication.java
diff --git a/spring-cloud-data-flow/time-processor/src/main/resources/logback.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/resources/logback.xml
similarity index 100%
rename from spring-cloud-data-flow/time-processor/src/main/resources/logback.xml
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/resources/logback.xml
diff --git a/spring-cloud-data-flow/time-source/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/org/baeldung/SpringContextIntegrationTest.java
similarity index 100%
rename from spring-cloud-data-flow/time-source/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/org/baeldung/SpringContextIntegrationTest.java
diff --git a/spring-cloud-data-flow/time-source/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-cloud-data-flow/time-source/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/org/baeldung/SpringContextTest.java
diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextTest.java b/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java
similarity index 90%
rename from spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextTest.java
rename to spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java
index a2d1cd1087..a3cbb3310d 100644
--- a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextTest.java
+++ b/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/README.md b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/README.md
new file mode 100644
index 0000000000..81e0ffe5c8
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles:
+
+- [Guide to Spring Cloud Stream with Kafka, Apache Avro and Confluent Schema Registry](https://www.baeldung.com/spring-cloud-stream-kafka-avro-confluent)
diff --git a/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextTest.java b/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java
similarity index 91%
rename from spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextTest.java
rename to spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java
index 73fcbe55f0..3be4d96964 100644
--- a/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextTest.java
+++ b/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = VaultSampleApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-core-2/README.md b/spring-core-2/README.md
new file mode 100644
index 0000000000..4c9e3b9ddf
--- /dev/null
+++ b/spring-core-2/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles:
+
+- [Understanding getBean() in Spring](https://www.baeldung.com/spring-getbean)
diff --git a/spring-core/README.md b/spring-core/README.md
index 18d14b7ecf..111b034bef 100644
--- a/spring-core/README.md
+++ b/spring-core/README.md
@@ -4,14 +4,10 @@
 - [How to use the Spring FactoryBean?](http://www.baeldung.com/spring-factorybean)
 - [Constructor Dependency Injection in Spring](http://www.baeldung.com/constructor-injection-in-spring)
 - [Constructor Injection in Spring with Lombok](http://www.baeldung.com/spring-injection-lombok)
-- [A Quick Guide to Spring @Value](http://www.baeldung.com/spring-value-annotation)
-- [Spring YAML Configuration](http://www.baeldung.com/spring-yaml)
 - [Introduction to Spring’s StreamUtils](http://www.baeldung.com/spring-stream-utils)
-- [Using Spring @Value with Defaults](http://www.baeldung.com/spring-value-defaults)
 - [XML-Based Injection in Spring](http://www.baeldung.com/spring-xml-injection)
 - [A Quick Guide to the Spring @Lazy Annotation](http://www.baeldung.com/spring-lazy-annotation)
 - [Injecting Prototype Beans into a Singleton Instance in Spring](http://www.baeldung.com/spring-inject-prototype-bean-into-singleton)
-- [How to Inject a Property Value Into a Class Not Managed by Spring?](http://www.baeldung.com/inject-properties-value-non-spring-class)
 - [@Lookup Annotation in Spring](http://www.baeldung.com/spring-lookup)
 - [BeanNameAware and BeanFactoryAware Interfaces in Spring](http://www.baeldung.com/spring-bean-name-factory-aware)
 - [Spring – Injecting Collections](http://www.baeldung.com/spring-injecting-collections)
diff --git a/spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextTest.java b/spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 91%
rename from spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextLiveTest.java
index 5e68a8e64f..5cb0a8167e 100644
--- a/spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -9,7 +9,7 @@ import com.baeldung.Application;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-di/pom.xml b/spring-di/pom.xml
new file mode 100644
index 0000000000..62456ba31c
--- /dev/null
+++ b/spring-di/pom.xml
@@ -0,0 +1,101 @@
+<?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>spring-di</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
+
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${org.springframework.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>${org.springframework.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <finalName>spring-di</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.2.2</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+            </properties>
+        </profile>
+    </profiles>
+
+    <properties>
+        <start-class>org.baeldung.org.baeldung.sample.App</start-class>
+        <!-- Spring -->
+        <org.springframework.version>5.0.6.RELEASE</org.springframework.version>
+        <annotation-api.version>1.3.2</annotation-api.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-di/src/main/java/org/baeldung/sample/App.java b/spring-di/src/main/java/org/baeldung/sample/App.java
new file mode 100644
index 0000000000..17fc49fc8c
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/App.java
@@ -0,0 +1,11 @@
+package org.baeldung.sample;
+
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+public class App {
+    public static void main(String[] args) {
+        AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(AppConfig.class);
+        FooService fooService = ctx.getBean(FooService.class);
+        fooService.doStuff();
+    }
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/AppConfig.java b/spring-di/src/main/java/org/baeldung/sample/AppConfig.java
new file mode 100644
index 0000000000..8a177d2611
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/AppConfig.java
@@ -0,0 +1,10 @@
+package org.baeldung.sample;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan("org.baeldung.sample")
+public class AppConfig {
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/Bar.java b/spring-di/src/main/java/org/baeldung/sample/Bar.java
new file mode 100644
index 0000000000..54e8d54418
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/Bar.java
@@ -0,0 +1,5 @@
+package org.baeldung.sample;
+
+public class Bar {
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/BarFormatter.java b/spring-di/src/main/java/org/baeldung/sample/BarFormatter.java
new file mode 100644
index 0000000000..8396653970
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/BarFormatter.java
@@ -0,0 +1,13 @@
+package org.baeldung.sample;
+
+import org.springframework.stereotype.Component;
+
+@FormatterType("Bar")
+@Component
+public class BarFormatter implements Formatter {
+
+    public String format() {
+        return "bar";
+    }
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/Foo.java b/spring-di/src/main/java/org/baeldung/sample/Foo.java
new file mode 100644
index 0000000000..562a00121a
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/Foo.java
@@ -0,0 +1,5 @@
+package org.baeldung.sample;
+
+public class Foo {
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/FooDAO.java b/spring-di/src/main/java/org/baeldung/sample/FooDAO.java
new file mode 100644
index 0000000000..151c0c38de
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/FooDAO.java
@@ -0,0 +1,5 @@
+package org.baeldung.sample;
+
+public class FooDAO {
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/FooFormatter.java b/spring-di/src/main/java/org/baeldung/sample/FooFormatter.java
new file mode 100644
index 0000000000..68cb7f81f2
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/FooFormatter.java
@@ -0,0 +1,13 @@
+package org.baeldung.sample;
+
+import org.springframework.stereotype.Component;
+
+@FormatterType("Foo")
+@Component
+public class FooFormatter implements Formatter {
+
+    public String format() {
+        return "foo";
+    }
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/FooService.java b/spring-di/src/main/java/org/baeldung/sample/FooService.java
new file mode 100644
index 0000000000..711711f205
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/FooService.java
@@ -0,0 +1,17 @@
+package org.baeldung.sample;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class FooService {
+
+    @Autowired
+    @FormatterType("Foo")
+    private Formatter formatter;
+
+    public String doStuff() {
+        return formatter.format();
+    }
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/Formatter.java b/spring-di/src/main/java/org/baeldung/sample/Formatter.java
new file mode 100644
index 0000000000..ab29c2b848
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/Formatter.java
@@ -0,0 +1,7 @@
+package org.baeldung.sample;
+
+public interface Formatter {
+
+    String format();
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/FormatterType.java b/spring-di/src/main/java/org/baeldung/sample/FormatterType.java
new file mode 100644
index 0000000000..a00a9750bf
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/FormatterType.java
@@ -0,0 +1,17 @@
+package org.baeldung.sample;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Qualifier
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FormatterType {
+
+    String value();
+
+}
diff --git a/spring-di/src/test/java/org/baeldung/sample/FooServiceIntegrationTest.java b/spring-di/src/test/java/org/baeldung/sample/FooServiceIntegrationTest.java
new file mode 100644
index 0000000000..6b518395a1
--- /dev/null
+++ b/spring-di/src/test/java/org/baeldung/sample/FooServiceIntegrationTest.java
@@ -0,0 +1,22 @@
+package org.baeldung.sample;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = AppConfig.class, loader = AnnotationConfigContextLoader.class)
+public class FooServiceIntegrationTest {
+
+    @Autowired
+    FooService fooService;
+
+    @Test
+    public void whenFooFormatterType_thenReturnFoo() {
+        Assert.assertEquals("foo", fooService.doStuff());
+    }
+}
diff --git a/spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 92%
rename from spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextLiveTest.java
index 3e9af8a336..bbd3b6c2ba 100644
--- a/spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -9,7 +9,7 @@ import com.baeldung.springejbclient.SpringEjbClientApplication;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringEjbClientApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-security-client/README.MD b/spring-security-client/README.MD
deleted file mode 100644
index 0b0af7ffe1..0000000000
--- a/spring-security-client/README.MD
+++ /dev/null
@@ -1,11 +0,0 @@
-=========
-## Spring Security Authentication/Authorization Example Project
-
-##The Course
-The "REST With Spring" Classes: http://github.learnspringsecurity.com
-
-### Relevant Articles: 
-- [Spring Security Manual Authentication](http://www.baeldung.com/spring-security-authentication)
-
-### Build the Project
-mvn clean install
diff --git a/spring-security-client/pom.xml b/spring-security-client/pom.xml
deleted file mode 100644
index 96ac837a09..0000000000
--- a/spring-security-client/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-    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>spring-security-client</artifactId>
-    <name>spring-security-client</name>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <modules>
-        <module>spring-security-jsp-authentication</module>
-        <module>spring-security-jsp-authorize</module>
-        <module>spring-security-jsp-config</module>
-        <module>spring-security-mvc</module>
-        <module>spring-security-thymeleaf-authentication</module>
-        <module>spring-security-thymeleaf-authorize</module>
-        <module>spring-security-thymeleaf-config</module>
-    </modules>
-</project>
diff --git a/spring-security-client/spring-security-jsp-authentication/pom.xml b/spring-security-client/spring-security-jsp-authentication/pom.xml
deleted file mode 100644
index 9cb2a45331..0000000000
--- a/spring-security-client/spring-security-jsp-authentication/pom.xml
+++ /dev/null
@@ -1,47 +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>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-security-jsp-authentication</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-security-jsp-authentication</name>
-    <packaging>war</packaging>
-    <description>Spring Security JSP Authentication tag sample</description>
-
-    <parent>
-        <artifactId>parent-boot-1</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-jasper</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-taglibs</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/spring-security-client/spring-security-jsp-authentication/src/main/java/org/baeldung/config/Application.java b/spring-security-client/spring-security-jsp-authentication/src/main/java/org/baeldung/config/Application.java
deleted file mode 100644
index c2c5939676..0000000000
--- a/spring-security-client/spring-security-jsp-authentication/src/main/java/org/baeldung/config/Application.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
-
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-public class Application extends SpringBootServletInitializer {
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(Application.class);
-    }
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-
-}
diff --git a/spring-security-client/spring-security-jsp-authentication/src/main/java/org/baeldung/config/MvcConfig.java b/spring-security-client/spring-security-jsp-authentication/src/main/java/org/baeldung/config/MvcConfig.java
deleted file mode 100644
index fa2a324146..0000000000
--- a/spring-security-client/spring-security-jsp-authentication/src/main/java/org/baeldung/config/MvcConfig.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-@Configuration
-public class MvcConfig extends WebMvcConfigurerAdapter {
-
-    public MvcConfig() {
-        super();
-    }
-
-    //
-
-    @Override
-    public void addViewControllers(final ViewControllerRegistry registry) {
-        super.addViewControllers(registry);
-        registry.addViewController("/").setViewName("forward:/index");
-        registry.addViewController("/index");
-    }
-
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-jsp-authentication/src/main/java/org/baeldung/config/SecurityConfig.java b/spring-security-client/spring-security-jsp-authentication/src/main/java/org/baeldung/config/SecurityConfig.java
deleted file mode 100644
index bd6c56d38a..0000000000
--- a/spring-security-client/spring-security-jsp-authentication/src/main/java/org/baeldung/config/SecurityConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@EnableWebSecurity
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
-        // @formatter:off
-        auth.inMemoryAuthentication()
-            .withUser("john").password("123").roles("USER")
-            .and()
-            .withUser("tom").password("111").roles("ADMIN");
-        // @formatter:on
-    }
-
-    @Override
-    public void configure(WebSecurity web) throws Exception {
-        web.ignoring().antMatchers("/resources/**");
-    }
-
-    @Override
-    protected void configure(final HttpSecurity http) throws Exception {
-        // @formatter:off
-        http.authorizeRequests()
-            .antMatchers("/login").permitAll()
-            .antMatchers("/admin").hasRole("ADMIN")
-            .anyRequest().authenticated()
-            .and().formLogin().permitAll()
-            ;
-        // @formatter:on
-    }
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-jsp-authentication/src/main/resources/application.properties b/spring-security-client/spring-security-jsp-authentication/src/main/resources/application.properties
deleted file mode 100644
index 26a80c79f3..0000000000
--- a/spring-security-client/spring-security-jsp-authentication/src/main/resources/application.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-server.port: 8081
-spring.mvc.view.prefix: /WEB-INF/jsp/
-spring.mvc.view.suffix: .jsp
\ No newline at end of file
diff --git a/spring-security-client/spring-security-jsp-authentication/src/main/resources/logback.xml b/spring-security-client/spring-security-jsp-authentication/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/spring-security-client/spring-security-jsp-authentication/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/spring-security-client/spring-security-jsp-authentication/src/main/webapp/WEB-INF/jsp/index.jsp b/spring-security-client/spring-security-jsp-authentication/src/main/webapp/WEB-INF/jsp/index.jsp
deleted file mode 100644
index 90c00e980a..0000000000
--- a/spring-security-client/spring-security-jsp-authentication/src/main/webapp/WEB-INF/jsp/index.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
- <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Spring Security JSP Authorize</title>
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"/>
-</head>
-<body>
-<nav class="navbar navbar-default">
-  <div class="container-fluid">
-    <div class="navbar-header">
-      <a class="navbar-brand">Spring Security JSP Authorize</a>
-      </div>
-    </div>
-</nav>
-
-<div class="container">
-    Current user name: <sec:authentication property="principal.username" /> 
-    <br/>
-    Current user roles: <sec:authentication property="principal.authorities" /> 
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-security-client/spring-security-jsp-authentication/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-client/spring-security-jsp-authentication/src/test/java/org/baeldung/SpringContextIntegrationTest.java
deleted file mode 100644
index 66243ef00d..0000000000
--- a/spring-security-client/spring-security-jsp-authentication/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextIntegrationTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-client/spring-security-jsp-authentication/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-client/spring-security-jsp-authentication/src/test/java/org/baeldung/SpringContextTest.java
deleted file mode 100644
index 0afb3899db..0000000000
--- a/spring-security-client/spring-security-jsp-authentication/src/test/java/org/baeldung/SpringContextTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-client/spring-security-jsp-authorize/pom.xml b/spring-security-client/spring-security-jsp-authorize/pom.xml
deleted file mode 100644
index ad4c9d105b..0000000000
--- a/spring-security-client/spring-security-jsp-authorize/pom.xml
+++ /dev/null
@@ -1,47 +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>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-security-jsp-authorize</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-security-jsp-authorize</name>
-    <description>Spring Security JSP Authorize tag sample</description>
-    <packaging>war</packaging>
-
-    <parent>
-        <artifactId>parent-boot-1</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-jasper</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-taglibs</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/spring-security-client/spring-security-jsp-authorize/src/main/java/org/baeldung/config/Application.java b/spring-security-client/spring-security-jsp-authorize/src/main/java/org/baeldung/config/Application.java
deleted file mode 100644
index c2c5939676..0000000000
--- a/spring-security-client/spring-security-jsp-authorize/src/main/java/org/baeldung/config/Application.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
-
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-public class Application extends SpringBootServletInitializer {
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(Application.class);
-    }
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-
-}
diff --git a/spring-security-client/spring-security-jsp-authorize/src/main/java/org/baeldung/config/MvcConfig.java b/spring-security-client/spring-security-jsp-authorize/src/main/java/org/baeldung/config/MvcConfig.java
deleted file mode 100644
index fa2a324146..0000000000
--- a/spring-security-client/spring-security-jsp-authorize/src/main/java/org/baeldung/config/MvcConfig.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-@Configuration
-public class MvcConfig extends WebMvcConfigurerAdapter {
-
-    public MvcConfig() {
-        super();
-    }
-
-    //
-
-    @Override
-    public void addViewControllers(final ViewControllerRegistry registry) {
-        super.addViewControllers(registry);
-        registry.addViewController("/").setViewName("forward:/index");
-        registry.addViewController("/index");
-    }
-
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-jsp-authorize/src/main/java/org/baeldung/config/SecurityConfig.java b/spring-security-client/spring-security-jsp-authorize/src/main/java/org/baeldung/config/SecurityConfig.java
deleted file mode 100644
index bd6c56d38a..0000000000
--- a/spring-security-client/spring-security-jsp-authorize/src/main/java/org/baeldung/config/SecurityConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@EnableWebSecurity
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
-        // @formatter:off
-        auth.inMemoryAuthentication()
-            .withUser("john").password("123").roles("USER")
-            .and()
-            .withUser("tom").password("111").roles("ADMIN");
-        // @formatter:on
-    }
-
-    @Override
-    public void configure(WebSecurity web) throws Exception {
-        web.ignoring().antMatchers("/resources/**");
-    }
-
-    @Override
-    protected void configure(final HttpSecurity http) throws Exception {
-        // @formatter:off
-        http.authorizeRequests()
-            .antMatchers("/login").permitAll()
-            .antMatchers("/admin").hasRole("ADMIN")
-            .anyRequest().authenticated()
-            .and().formLogin().permitAll()
-            ;
-        // @formatter:on
-    }
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-jsp-authorize/src/main/resources/application.properties b/spring-security-client/spring-security-jsp-authorize/src/main/resources/application.properties
deleted file mode 100644
index 26a80c79f3..0000000000
--- a/spring-security-client/spring-security-jsp-authorize/src/main/resources/application.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-server.port: 8081
-spring.mvc.view.prefix: /WEB-INF/jsp/
-spring.mvc.view.suffix: .jsp
\ No newline at end of file
diff --git a/spring-security-client/spring-security-jsp-authorize/src/main/resources/logback.xml b/spring-security-client/spring-security-jsp-authorize/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/spring-security-client/spring-security-jsp-authorize/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/spring-security-client/spring-security-jsp-authorize/src/main/webapp/WEB-INF/jsp/index.jsp b/spring-security-client/spring-security-jsp-authorize/src/main/webapp/WEB-INF/jsp/index.jsp
deleted file mode 100644
index 08af845bd4..0000000000
--- a/spring-security-client/spring-security-jsp-authorize/src/main/webapp/WEB-INF/jsp/index.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
- <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Spring Security JSP Authorize</title>
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"/>
-</head>
-<body>
-<nav class="navbar navbar-default">
-  <div class="container-fluid">
-    <div class="navbar-header">
-      <a class="navbar-brand">Spring Security JSP Authorize</a>
-      </div>
-    </div>
-</nav>
-
-<div class="container">
-    <sec:authorize access="hasRole('ROLE_ADMIN')">
-        Only admins can see this message
-    </sec:authorize>
-    
-    <sec:authorize access="hasRole('ROLE_USER')">
-        Only users can see this message
-    </sec:authorize>
-    <hr/>
-    
-    <sec:authorize url="/admin">
-        Only users who can call "/admin" URL can see this message
-    </sec:authorize>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-security-client/spring-security-jsp-authorize/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-client/spring-security-jsp-authorize/src/test/java/org/baeldung/SpringContextIntegrationTest.java
deleted file mode 100644
index 66243ef00d..0000000000
--- a/spring-security-client/spring-security-jsp-authorize/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextIntegrationTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-client/spring-security-jsp-authorize/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-client/spring-security-jsp-authorize/src/test/java/org/baeldung/SpringContextTest.java
deleted file mode 100644
index 0afb3899db..0000000000
--- a/spring-security-client/spring-security-jsp-authorize/src/test/java/org/baeldung/SpringContextTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-client/spring-security-jsp-config/pom.xml b/spring-security-client/spring-security-jsp-config/pom.xml
deleted file mode 100644
index 02ea206738..0000000000
--- a/spring-security-client/spring-security-jsp-config/pom.xml
+++ /dev/null
@@ -1,47 +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>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-security-jsp-config</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-security-jsp-config</name>
-    <description>Spring Security JSP configuration</description>
-    <packaging>war</packaging>
-
-    <parent>
-        <artifactId>parent-boot-1</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-jasper</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-taglibs</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/spring-security-client/spring-security-jsp-config/src/main/java/org/baeldung/config/Application.java b/spring-security-client/spring-security-jsp-config/src/main/java/org/baeldung/config/Application.java
deleted file mode 100644
index c2c5939676..0000000000
--- a/spring-security-client/spring-security-jsp-config/src/main/java/org/baeldung/config/Application.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
-
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-public class Application extends SpringBootServletInitializer {
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(Application.class);
-    }
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-
-}
diff --git a/spring-security-client/spring-security-jsp-config/src/main/java/org/baeldung/config/MvcConfig.java b/spring-security-client/spring-security-jsp-config/src/main/java/org/baeldung/config/MvcConfig.java
deleted file mode 100644
index fa2a324146..0000000000
--- a/spring-security-client/spring-security-jsp-config/src/main/java/org/baeldung/config/MvcConfig.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-@Configuration
-public class MvcConfig extends WebMvcConfigurerAdapter {
-
-    public MvcConfig() {
-        super();
-    }
-
-    //
-
-    @Override
-    public void addViewControllers(final ViewControllerRegistry registry) {
-        super.addViewControllers(registry);
-        registry.addViewController("/").setViewName("forward:/index");
-        registry.addViewController("/index");
-    }
-
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-jsp-config/src/main/java/org/baeldung/config/SecurityConfig.java b/spring-security-client/spring-security-jsp-config/src/main/java/org/baeldung/config/SecurityConfig.java
deleted file mode 100644
index bd6c56d38a..0000000000
--- a/spring-security-client/spring-security-jsp-config/src/main/java/org/baeldung/config/SecurityConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@EnableWebSecurity
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
-        // @formatter:off
-        auth.inMemoryAuthentication()
-            .withUser("john").password("123").roles("USER")
-            .and()
-            .withUser("tom").password("111").roles("ADMIN");
-        // @formatter:on
-    }
-
-    @Override
-    public void configure(WebSecurity web) throws Exception {
-        web.ignoring().antMatchers("/resources/**");
-    }
-
-    @Override
-    protected void configure(final HttpSecurity http) throws Exception {
-        // @formatter:off
-        http.authorizeRequests()
-            .antMatchers("/login").permitAll()
-            .antMatchers("/admin").hasRole("ADMIN")
-            .anyRequest().authenticated()
-            .and().formLogin().permitAll()
-            ;
-        // @formatter:on
-    }
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-jsp-config/src/main/resources/application.properties b/spring-security-client/spring-security-jsp-config/src/main/resources/application.properties
deleted file mode 100644
index 26a80c79f3..0000000000
--- a/spring-security-client/spring-security-jsp-config/src/main/resources/application.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-server.port: 8081
-spring.mvc.view.prefix: /WEB-INF/jsp/
-spring.mvc.view.suffix: .jsp
\ No newline at end of file
diff --git a/spring-security-client/spring-security-jsp-config/src/main/resources/logback.xml b/spring-security-client/spring-security-jsp-config/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/spring-security-client/spring-security-jsp-config/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/spring-security-client/spring-security-jsp-config/src/main/webapp/WEB-INF/jsp/index.jsp b/spring-security-client/spring-security-jsp-config/src/main/webapp/WEB-INF/jsp/index.jsp
deleted file mode 100644
index bd5ccb0c78..0000000000
--- a/spring-security-client/spring-security-jsp-config/src/main/webapp/WEB-INF/jsp/index.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Spring Security JSP</title>
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"/>
-</head>
-<body>
-<nav class="navbar navbar-default">
-  <div class="container-fluid">
-    <div class="navbar-header">
-      <a class="navbar-brand">Spring Security JSP</a>
-      </div>
-    </div>
-</nav>
-
-<div class="container">
-    Welcome
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-security-client/spring-security-jsp-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-client/spring-security-jsp-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java
deleted file mode 100644
index 66243ef00d..0000000000
--- a/spring-security-client/spring-security-jsp-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextIntegrationTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-client/spring-security-jsp-config/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-client/spring-security-jsp-config/src/test/java/org/baeldung/SpringContextTest.java
deleted file mode 100644
index 0afb3899db..0000000000
--- a/spring-security-client/spring-security-jsp-config/src/test/java/org/baeldung/SpringContextTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-client/spring-security-mvc/pom.xml b/spring-security-client/spring-security-mvc/pom.xml
deleted file mode 100644
index 75298026a8..0000000000
--- a/spring-security-client/spring-security-mvc/pom.xml
+++ /dev/null
@@ -1,30 +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>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-security-mvc</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-security-mvc</name>
-    <description>Spring Security MVC</description>
-    <packaging>war</packaging>
-
-    <parent>
-        <artifactId>parent-boot-1</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/spring-security-client/spring-security-mvc/src/main/java/org/baeldung/config/Application.java b/spring-security-client/spring-security-mvc/src/main/java/org/baeldung/config/Application.java
deleted file mode 100644
index 34c43fbe5a..0000000000
--- a/spring-security-client/spring-security-mvc/src/main/java/org/baeldung/config/Application.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
-
-@SpringBootApplication
-public class Application extends SpringBootServletInitializer {
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(Application.class);
-    }
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-
-}
diff --git a/spring-security-client/spring-security-mvc/src/main/java/org/baeldung/config/SecurityConfig.java b/spring-security-client/spring-security-mvc/src/main/java/org/baeldung/config/SecurityConfig.java
deleted file mode 100644
index bd6c56d38a..0000000000
--- a/spring-security-client/spring-security-mvc/src/main/java/org/baeldung/config/SecurityConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@EnableWebSecurity
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
-        // @formatter:off
-        auth.inMemoryAuthentication()
-            .withUser("john").password("123").roles("USER")
-            .and()
-            .withUser("tom").password("111").roles("ADMIN");
-        // @formatter:on
-    }
-
-    @Override
-    public void configure(WebSecurity web) throws Exception {
-        web.ignoring().antMatchers("/resources/**");
-    }
-
-    @Override
-    protected void configure(final HttpSecurity http) throws Exception {
-        // @formatter:off
-        http.authorizeRequests()
-            .antMatchers("/login").permitAll()
-            .antMatchers("/admin").hasRole("ADMIN")
-            .anyRequest().authenticated()
-            .and().formLogin().permitAll()
-            ;
-        // @formatter:on
-    }
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-mvc/src/main/resources/application.properties b/spring-security-client/spring-security-mvc/src/main/resources/application.properties
deleted file mode 100644
index c2eee0d931..0000000000
--- a/spring-security-client/spring-security-mvc/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-server.port: 8081
\ No newline at end of file
diff --git a/spring-security-client/spring-security-mvc/src/main/resources/logback.xml b/spring-security-client/spring-security-mvc/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/spring-security-client/spring-security-mvc/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/spring-security-client/spring-security-mvc/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-client/spring-security-mvc/src/test/java/org/baeldung/SpringContextIntegrationTest.java
deleted file mode 100644
index 66243ef00d..0000000000
--- a/spring-security-client/spring-security-mvc/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextIntegrationTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-client/spring-security-mvc/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-client/spring-security-mvc/src/test/java/org/baeldung/SpringContextTest.java
deleted file mode 100644
index 0afb3899db..0000000000
--- a/spring-security-client/spring-security-mvc/src/test/java/org/baeldung/SpringContextTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/pom.xml b/spring-security-client/spring-security-thymeleaf-authentication/pom.xml
deleted file mode 100644
index 01d2c6bdbe..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/pom.xml
+++ /dev/null
@@ -1,43 +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>
-
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-security-thymeleaf-authentication</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-security-thymeleaf-authentication</name>
-    <description>Spring Security thymeleaf authentication tag sample</description>
-    <packaging>war</packaging>
-
-    <parent>
-        <artifactId>parent-boot-1</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity4</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/MvcConfig.java b/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/MvcConfig.java
deleted file mode 100644
index 259433f6ae..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/MvcConfig.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.context.annotation.Profile;
-
-@Configuration
-@EnableWebMvc
-@Profile("!manual")
-public class MvcConfig extends WebMvcConfigurerAdapter {
-
-    public MvcConfig() {
-        super();
-    }
-
-    //
-    @Bean
-    public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
-        return new PropertySourcesPlaceholderConfigurer();
-    }
-
-    @Override
-    public void configureDefaultServletHandling(final DefaultServletHandlerConfigurer configurer) {
-        configurer.enable();
-    }
-
-    @Override
-    public void addViewControllers(final ViewControllerRegistry registry) {
-        super.addViewControllers(registry);
-        registry.addViewController("/").setViewName("forward:/index");
-        registry.addViewController("/index");
-    }
-
-    @Override
-    public void addResourceHandlers(final ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/resources/**").addResourceLocations("/resources/");
-    }
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/MvcConfigManual.java b/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/MvcConfigManual.java
deleted file mode 100644
index d80527c30a..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/MvcConfigManual.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-
-@Configuration
-@EnableWebMvc
-@Profile("manual")
-public class MvcConfigManual extends WebMvcConfigurerAdapter {
-
-    @Override
-    public void addViewControllers(ViewControllerRegistry registry) {
-        registry.addViewController("/home").setViewName("home");
-        registry.addViewController("/").setViewName("home");
-        registry.addViewController("/hello").setViewName("hello");
-        registry.addViewController("/login").setViewName("login");
-    }
-
-}
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/RegistrationController.java b/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/RegistrationController.java
deleted file mode 100644
index 2414ff9cac..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/RegistrationController.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.baeldung.config;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
-import org.springframework.security.authentication.AbstractAuthenticationToken;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.WebAuthenticationDetails;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Manually authenticate a user using Spring Security / Spring Web MVC' (upon successful account registration)
- * (http://stackoverflow.com/questions/4664893/how-to-manually-set-an-authenticated-user-in-spring-security-springmvc)
- * 
- * @author jim clayson
- */
-@Controller
-@Profile("manual")
-public class RegistrationController {
-    private static final Logger logger = LoggerFactory.getLogger(RegistrationController.class);
-
-    @Autowired
-    private AuthenticationManager authenticationManager;
-
-    /**
-     * For demo purposes this need only be a GET request method
-     * 
-     * @param request
-     * @param response
-     * @return The view. Page confirming either successful registration (and/or
-     *         successful authentication) or failed registration.
-     */
-    @GetMapping("/register")
-    public String registerAndAuthenticate(HttpServletRequest request, HttpServletResponse response) {
-        logger.debug("registerAndAuthenticate: attempt to register, application should manually authenticate.");
-
-        // Mocked values. Potentially could come from an HTML registration form,
-        // in which case this mapping would match on an HTTP POST, rather than a GET
-        String username = "user";
-        String password = "password";
-
-        if (requestQualifiesForManualAuthentication()) {
-            try {
-                authenticate(username, password, request, response);
-                logger.debug("registerAndAuthenticate: authentication completed.");
-            } catch (BadCredentialsException bce) {
-                logger.debug("Authentication failure: bad credentials");
-                bce.printStackTrace();
-                return "systemError"; // assume a low-level error, since the registration
-                // form would have been successfully validated
-            }
-        }
-
-        return "registrationSuccess";
-    }
-
-    private boolean requestQualifiesForManualAuthentication() {
-        // Some processing to determine that the user requires a Spring Security-recognized,
-        // application-directed login e.g. successful account registration.
-        return true;
-    }
-
-    private void authenticate(String username, String password, HttpServletRequest request, HttpServletResponse response) throws BadCredentialsException {
-        logger.debug("attempting to authenticated, manually ... ");
-
-        // create and populate the token
-        AbstractAuthenticationToken authToken = new UsernamePasswordAuthenticationToken(username, password);
-        authToken.setDetails(new WebAuthenticationDetails(request));
-
-        // This call returns an authentication object, which holds principle and user credentials
-        Authentication authentication = this.authenticationManager.authenticate(authToken);
-
-        // The security context holds the authentication object, and is stored
-        // in thread local scope.
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-
-        logger.debug("User should now be authenticated.");
-    }
-
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/SecurityConfig.java b/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/SecurityConfig.java
deleted file mode 100644
index 153cc67661..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/SecurityConfig.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.context.annotation.Profile;
-
-@Configuration
-@EnableWebSecurity
-@Profile("!manual")
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
-        // @formatter:off
-        auth.inMemoryAuthentication()
-            .withUser("john").password("123").roles("USER")
-            .and()
-            .withUser("tom").password("111").roles("ADMIN");
-        // @formatter:on
-    }
-
-    @Override
-    public void configure(WebSecurity web) throws Exception {
-        web.ignoring().antMatchers("/resources/**");
-    }
-
-    @Override
-    protected void configure(final HttpSecurity http) throws Exception {
-        // @formatter:off
-        http.authorizeRequests()
-            .antMatchers("/login").permitAll()
-            .antMatchers("/admin").hasRole("ADMIN")
-            .anyRequest().authenticated()
-            .and().formLogin().permitAll()
-            ;
-        // @formatter:on
-    }
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/WebSecurityConfigManual.java b/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/WebSecurityConfigManual.java
deleted file mode 100644
index 180a53deba..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/WebSecurityConfigManual.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@EnableWebSecurity
-@Profile("manual")
-public class WebSecurityConfigManual extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-     // @formatter:off
-        http
-            .authorizeRequests()
-                .antMatchers("/", "/home", "/register").permitAll()
-                .anyRequest().authenticated()
-                .and()
-            .formLogin()
-                .loginPage("/login").permitAll()
-                .and()
-            .logout().permitAll();
-     // @formatter:on
-    }
-
-    @Autowired
-    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-        auth.inMemoryAuthentication().withUser("user").password("password").roles("USER");
-    }
-}
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/application.properties b/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/application.properties
deleted file mode 100644
index bafddced85..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-server.port=8081
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/logback.xml b/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/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/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/hello.html b/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/hello.html
deleted file mode 100644
index b37731b0ed..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/hello.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity3">
-    <head>
-        <title>Hello World!</title>
-    </head>
-    <body>
-        <h1 th:inline="text">Hello [[${#httpServletRequest.remoteUser}]]!</h1>
-        <form th:action="@{/logout}" method="post">
-            <input type="submit" value="Sign Out"/>
-        </form>
-        <p>Click <a th:href="@{/home}">here</a> to go to the home page.</p>
-        
-    </body>
-</html>
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/home.html b/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/home.html
deleted file mode 100644
index 6dbdf491c6..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/home.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html 
-	xmlns="http://www.w3.org/1999/xhtml" 
-	xmlns:th="http://www.thymeleaf.org" 
-	xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity4">
-    <head>
-        <title>Spring Security Example</title>
-    </head>
-    <body>
-        <h1>Welcome!</h1>
-        
-        <p>Click <a th:href="@{/hello}">here</a> to see a greeting.</p>
-        <p sec:authorize="isAnonymous()">Click <a th:href="@{/register}">here</a> to send a dummy registration request, where the application logs you in.</p>
-    </body>
-</html>
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/index.html b/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/index.html
deleted file mode 100644
index c65b5f092b..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Spring Security Thymeleaf</title>
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"/>
-</head>
-<body>
-<nav class="navbar navbar-default">
-  <div class="container-fluid">
-    <div class="navbar-header">
-      <a class="navbar-brand">Spring Security Thymeleaf</a>
-      </div>
-    </div>
-</nav>
-
-<div class="container">
-    Current user name: <span sec:authentication="name">Bob</span>
-    <br/>
-    Current user roles: <span sec:authentication="principal.authorities">[ROLE_USER, ROLE_ADMIN]</span>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/login.html b/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/login.html
deleted file mode 100644
index 3f28efac69..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/login.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity3">
-    <head>
-        <title>Spring Security Example </title>
-    </head>
-    <body>
-        <div th:if="${param.error}">
-            Invalid username and password.
-        </div>
-        <div th:if="${param.logout}">
-            You have been logged out.
-        </div>
-        <form th:action="@{/login}" method="post">
-            <div><label> User Name : <input type="text" name="username"/> </label></div>
-            <div><label> Password: <input type="password" name="password"/> </label></div>
-            <div><input type="submit" value="Sign In"/></div>
-        </form>
-        <p>Click <a th:href="@{/home}">here</a> to go to the home page.</p>
-    </body>
-</html>
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/registrationError.html b/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/registrationError.html
deleted file mode 100644
index 756cc2390d..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/registrationError.html
+++ /dev/null
@@ -1 +0,0 @@
-Registration could not be completed at this time. Please try again later or contact support!
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/registrationSuccess.html b/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/registrationSuccess.html
deleted file mode 100644
index b1c4336f2f..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/main/resources/templates/registrationSuccess.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity3">
-    <head>
-        <title>Registration Success!</title>
-    </head>
-    <body>
-        <h2 th:inline="text">Registration succeeded. You have been logged in by the system. Welcome [[${#httpServletRequest.remoteUser}]]!</h2>
-        <form th:action="@{/logout}" method="post">
-            <input type="submit" value="Sign Out"/>
-        </form>
-        <p>Click <a th:href="@{/home}">here</a> to go to the home page.</p>
-        
-    </body>
-</html>
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-client/spring-security-thymeleaf-authentication/src/test/java/org/baeldung/SpringContextIntegrationTest.java
deleted file mode 100644
index 66243ef00d..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextIntegrationTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-client/spring-security-thymeleaf-authentication/src/test/java/org/baeldung/SpringContextTest.java
deleted file mode 100644
index 0afb3899db..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authentication/src/test/java/org/baeldung/SpringContextTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-client/spring-security-thymeleaf-authorize/pom.xml b/spring-security-client/spring-security-thymeleaf-authorize/pom.xml
deleted file mode 100644
index 8c600c1f81..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authorize/pom.xml
+++ /dev/null
@@ -1,43 +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>
-
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-security-thymeleaf-authorize</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-security-thymeleaf-authorize</name>
-    <description>Spring Security thymeleaf authorize tag sample</description>
-    <packaging>war</packaging>
-
-    <parent>
-        <artifactId>parent-boot-1</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity4</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/spring-security-client/spring-security-thymeleaf-authorize/src/main/java/org/baeldung/config/Application.java b/spring-security-client/spring-security-thymeleaf-authorize/src/main/java/org/baeldung/config/Application.java
deleted file mode 100644
index 329b104143..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authorize/src/main/java/org/baeldung/config/Application.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
-
-@SpringBootApplication
-public class Application extends SpringBootServletInitializer {
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-
-}
diff --git a/spring-security-client/spring-security-thymeleaf-authorize/src/main/java/org/baeldung/config/MvcConfig.java b/spring-security-client/spring-security-thymeleaf-authorize/src/main/java/org/baeldung/config/MvcConfig.java
deleted file mode 100644
index 9ade60e54c..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authorize/src/main/java/org/baeldung/config/MvcConfig.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-@Configuration
-@EnableWebMvc
-public class MvcConfig extends WebMvcConfigurerAdapter {
-
-    public MvcConfig() {
-        super();
-    }
-
-    //
-    @Bean
-    public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
-        return new PropertySourcesPlaceholderConfigurer();
-    }
-
-    @Override
-    public void configureDefaultServletHandling(final DefaultServletHandlerConfigurer configurer) {
-        configurer.enable();
-    }
-
-    @Override
-    public void addViewControllers(final ViewControllerRegistry registry) {
-        super.addViewControllers(registry);
-        registry.addViewController("/").setViewName("forward:/index");
-        registry.addViewController("/index");
-    }
-
-    @Override
-    public void addResourceHandlers(final ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/resources/**").addResourceLocations("/resources/");
-    }
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authorize/src/main/java/org/baeldung/config/SecurityConfig.java b/spring-security-client/spring-security-thymeleaf-authorize/src/main/java/org/baeldung/config/SecurityConfig.java
deleted file mode 100644
index bd6c56d38a..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authorize/src/main/java/org/baeldung/config/SecurityConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@EnableWebSecurity
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
-        // @formatter:off
-        auth.inMemoryAuthentication()
-            .withUser("john").password("123").roles("USER")
-            .and()
-            .withUser("tom").password("111").roles("ADMIN");
-        // @formatter:on
-    }
-
-    @Override
-    public void configure(WebSecurity web) throws Exception {
-        web.ignoring().antMatchers("/resources/**");
-    }
-
-    @Override
-    protected void configure(final HttpSecurity http) throws Exception {
-        // @formatter:off
-        http.authorizeRequests()
-            .antMatchers("/login").permitAll()
-            .antMatchers("/admin").hasRole("ADMIN")
-            .anyRequest().authenticated()
-            .and().formLogin().permitAll()
-            ;
-        // @formatter:on
-    }
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authorize/src/main/resources/application.properties b/spring-security-client/spring-security-thymeleaf-authorize/src/main/resources/application.properties
deleted file mode 100644
index bafddced85..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authorize/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-server.port=8081
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authorize/src/main/resources/logback.xml b/spring-security-client/spring-security-thymeleaf-authorize/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authorize/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/spring-security-client/spring-security-thymeleaf-authorize/src/main/resources/templates/index.html b/spring-security-client/spring-security-thymeleaf-authorize/src/main/resources/templates/index.html
deleted file mode 100644
index fcbbfb4957..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authorize/src/main/resources/templates/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Spring Security Thymeleaf</title>
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"/>
-</head>
-<body>
-<nav class="navbar navbar-default">
-  <div class="container-fluid">
-    <div class="navbar-header">
-      <a class="navbar-brand">Spring Security Thymeleaf</a>
-      </div>
-    </div>
-</nav>
-
-<div class="container">
-    <div sec:authorize="hasRole('ROLE_ADMIN')">
-	    Only admins can see this message
-	</div>
-	
-	<div sec:authorize="hasRole('ROLE_USER')">
-	    Only users can see this message
-	</div>
-    <hr/>
-    
-    <div sec:authorize-url="/admin">
-         Only users who can call "/admin" URL can see this message
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-authorize/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-client/spring-security-thymeleaf-authorize/src/test/java/org/baeldung/SpringContextIntegrationTest.java
deleted file mode 100644
index 66243ef00d..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authorize/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextIntegrationTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-client/spring-security-thymeleaf-authorize/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-client/spring-security-thymeleaf-authorize/src/test/java/org/baeldung/SpringContextTest.java
deleted file mode 100644
index 0afb3899db..0000000000
--- a/spring-security-client/spring-security-thymeleaf-authorize/src/test/java/org/baeldung/SpringContextTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-client/spring-security-thymeleaf-config/pom.xml b/spring-security-client/spring-security-thymeleaf-config/pom.xml
deleted file mode 100644
index aeda999405..0000000000
--- a/spring-security-client/spring-security-thymeleaf-config/pom.xml
+++ /dev/null
@@ -1,42 +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>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-security-thymeleaf-config</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-security-thymeleaf-config</name>
-    <description>Spring Security thymeleaf configuration sample project</description>
-    <packaging>war</packaging>
-
-    <parent>
-        <artifactId>parent-boot-1</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity4</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/spring-security-client/spring-security-thymeleaf-config/src/main/java/org/baeldung/config/Application.java b/spring-security-client/spring-security-thymeleaf-config/src/main/java/org/baeldung/config/Application.java
deleted file mode 100644
index 329b104143..0000000000
--- a/spring-security-client/spring-security-thymeleaf-config/src/main/java/org/baeldung/config/Application.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
-
-@SpringBootApplication
-public class Application extends SpringBootServletInitializer {
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-
-}
diff --git a/spring-security-client/spring-security-thymeleaf-config/src/main/java/org/baeldung/config/MvcConfig.java b/spring-security-client/spring-security-thymeleaf-config/src/main/java/org/baeldung/config/MvcConfig.java
deleted file mode 100644
index 9ade60e54c..0000000000
--- a/spring-security-client/spring-security-thymeleaf-config/src/main/java/org/baeldung/config/MvcConfig.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-@Configuration
-@EnableWebMvc
-public class MvcConfig extends WebMvcConfigurerAdapter {
-
-    public MvcConfig() {
-        super();
-    }
-
-    //
-    @Bean
-    public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
-        return new PropertySourcesPlaceholderConfigurer();
-    }
-
-    @Override
-    public void configureDefaultServletHandling(final DefaultServletHandlerConfigurer configurer) {
-        configurer.enable();
-    }
-
-    @Override
-    public void addViewControllers(final ViewControllerRegistry registry) {
-        super.addViewControllers(registry);
-        registry.addViewController("/").setViewName("forward:/index");
-        registry.addViewController("/index");
-    }
-
-    @Override
-    public void addResourceHandlers(final ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/resources/**").addResourceLocations("/resources/");
-    }
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-config/src/main/java/org/baeldung/config/SecurityConfig.java b/spring-security-client/spring-security-thymeleaf-config/src/main/java/org/baeldung/config/SecurityConfig.java
deleted file mode 100644
index bd6c56d38a..0000000000
--- a/spring-security-client/spring-security-thymeleaf-config/src/main/java/org/baeldung/config/SecurityConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.baeldung.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@EnableWebSecurity
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
-        // @formatter:off
-        auth.inMemoryAuthentication()
-            .withUser("john").password("123").roles("USER")
-            .and()
-            .withUser("tom").password("111").roles("ADMIN");
-        // @formatter:on
-    }
-
-    @Override
-    public void configure(WebSecurity web) throws Exception {
-        web.ignoring().antMatchers("/resources/**");
-    }
-
-    @Override
-    protected void configure(final HttpSecurity http) throws Exception {
-        // @formatter:off
-        http.authorizeRequests()
-            .antMatchers("/login").permitAll()
-            .antMatchers("/admin").hasRole("ADMIN")
-            .anyRequest().authenticated()
-            .and().formLogin().permitAll()
-            ;
-        // @formatter:on
-    }
-}
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-config/src/main/resources/application.properties b/spring-security-client/spring-security-thymeleaf-config/src/main/resources/application.properties
deleted file mode 100644
index bafddced85..0000000000
--- a/spring-security-client/spring-security-thymeleaf-config/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-server.port=8081
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-config/src/main/resources/logback.xml b/spring-security-client/spring-security-thymeleaf-config/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/spring-security-client/spring-security-thymeleaf-config/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/spring-security-client/spring-security-thymeleaf-config/src/main/resources/templates/index.html b/spring-security-client/spring-security-thymeleaf-config/src/main/resources/templates/index.html
deleted file mode 100644
index 8e7394ad6a..0000000000
--- a/spring-security-client/spring-security-thymeleaf-config/src/main/resources/templates/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Spring Security Thymeleaf</title>
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"/>
-</head>
-<body>
-<nav class="navbar navbar-default">
-  <div class="container-fluid">
-    <div class="navbar-header">
-      <a class="navbar-brand">Spring Security Thymeleaf</a>
-      </div>
-    </div>
-</nav>
-
-<div class="container">
-    Welcome
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-security-client/spring-security-thymeleaf-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-client/spring-security-thymeleaf-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java
deleted file mode 100644
index 66243ef00d..0000000000
--- a/spring-security-client/spring-security-thymeleaf-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextIntegrationTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-client/spring-security-thymeleaf-config/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-client/spring-security-thymeleaf-config/src/test/java/org/baeldung/SpringContextTest.java
deleted file mode 100644
index 0afb3899db..0000000000
--- a/spring-security-client/spring-security-thymeleaf-config/src/test/java/org/baeldung/SpringContextTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.config.Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class SpringContextTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-security-core/pom.xml b/spring-security-core/pom.xml
index 41dea087d3..b144357e25 100644
--- a/spring-security-core/pom.xml
+++ b/spring-security-core/pom.xml
@@ -9,10 +9,10 @@
     <packaging>war</packaging>
 
     <parent>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-1</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
@@ -36,6 +36,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
diff --git a/spring-security-core/src/main/java/org/baeldung/app/App.java b/spring-security-core/src/main/java/org/baeldung/app/App.java
index db0c9135c4..bf719b3b12 100644
--- a/spring-security-core/src/main/java/org/baeldung/app/App.java
+++ b/spring-security-core/src/main/java/org/baeldung/app/App.java
@@ -5,7 +5,7 @@ import javax.servlet.Filter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.web.filter.DelegatingFilterProxy;
diff --git a/spring-security-core/src/main/java/org/baeldung/config/WebSecurityConfig.java b/spring-security-core/src/main/java/org/baeldung/config/WebSecurityConfig.java
index 0b6cd34f3e..df7c7d1611 100644
--- a/spring-security-core/src/main/java/org/baeldung/config/WebSecurityConfig.java
+++ b/spring-security-core/src/main/java/org/baeldung/config/WebSecurityConfig.java
@@ -1,12 +1,15 @@
 package org.baeldung.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
 @Configuration
 @EnableWebSecurity
@@ -21,8 +24,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Autowired
     public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
         auth.inMemoryAuthentication()
-            .withUser("jim").password("jim").roles("USER", "ACTUATOR")
-            .and().withUser("pam").password("pam").roles("USER")
-            .and().withUser("michael").password("michael").roles("MANAGER");
+            .withUser("jim").password(passwordEncoder().encode("jim")).roles("USER", "ACTUATOR")
+            .and().withUser("pam").password(passwordEncoder().encode("pam")).roles("USER")
+            .and().withUser("michael").password(passwordEncoder().encode("michael")).roles("MANAGER");
+    }
+    
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
     }
 }
diff --git a/spring-security-core/src/main/java/org/baeldung/service/TaskService.java b/spring-security-core/src/main/java/org/baeldung/service/TaskService.java
index 4a0dae3aac..4efa3b0294 100644
--- a/spring-security-core/src/main/java/org/baeldung/service/TaskService.java
+++ b/spring-security-core/src/main/java/org/baeldung/service/TaskService.java
@@ -20,7 +20,7 @@ public class TaskService {
 
     @PreFilter("hasRole('MANAGER') or filterObject.assignee == authentication.name")
     public Iterable<Task> save(Iterable<Task> entities) {
-        return taskRepository.save(entities);
+        return taskRepository.saveAll(entities);
     }
 
 }
diff --git a/spring-security-core/src/main/resources/application.properties b/spring-security-core/src/main/resources/application.properties
new file mode 100644
index 0000000000..709574239b
--- /dev/null
+++ b/spring-security-core/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
diff --git a/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextTest.java b/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 92%
rename from spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextLiveTest.java
index 307d31a809..b41f2b0338 100644
--- a/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringSessionMongoDBApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextTest.java b/spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 92%
rename from spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextLiveTest.java
index 994f93c24f..b23ce7dbbb 100644
--- a/spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -9,7 +9,7 @@ import com.baeldung.spring.session.SessionWebApplication;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SessionWebApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-thymeleaf-2/README.md b/spring-thymeleaf-2/README.md
new file mode 100644
index 0000000000..9bd441a6bd
--- /dev/null
+++ b/spring-thymeleaf-2/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles:
+
+- [Working with Enums in Thymeleaf](https://www.baeldung.com/thymeleaf-enums)
diff --git a/spring-thymeleaf-2/pom.xml b/spring-thymeleaf-2/pom.xml
index 1b95cac43c..d31e5fa7f6 100644
--- a/spring-thymeleaf-2/pom.xml
+++ b/spring-thymeleaf-2/pom.xml
@@ -21,6 +21,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/lists/ListsController.java b/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/lists/ListsController.java
new file mode 100644
index 0000000000..55a7f7c38e
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/lists/ListsController.java
@@ -0,0 +1,64 @@
+package com.baeldung.thymeleaf.lists;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/lists")
+public class ListsController {
+
+    @GetMapping("/toList")
+    public String usingToList(Model model) {
+        List<String> colors = getColors();
+        String[] colorsArray = colors.toArray(new String[0]);
+        model.addAttribute("myArray", colorsArray);
+        return "lists/toList";
+    }
+
+    @GetMapping("/contains")
+    public String usingContains(Model model) {
+        model.addAttribute("myList", getColors());
+        model.addAttribute("others", getOtherColors());
+        return "lists/contains";
+    }
+
+    @GetMapping("/size")
+    public String usingSize(Model model) {
+        model.addAttribute("myList", getColors());
+        return "lists/size";
+    }
+
+    @GetMapping("/isEmpty")
+    public String usingIsEmpty(Model model) {
+        model.addAttribute("myList", getColors());
+        return "lists/isEmpty";
+    }
+
+    @GetMapping("/sort")
+    public String usingSort(Model model) {
+        model.addAttribute("myList", getColors());
+        model.addAttribute("reverse", Comparator.reverseOrder());
+        return "lists/sort";
+    }
+
+    private List<String> getColors() {
+        List<String> colors = new ArrayList<>();
+        colors.add("green");
+        colors.add("yellow");
+        colors.add("red");
+        colors.add("blue");
+        return colors;
+    }
+
+    private List<String> getOtherColors() {
+        List<String> colors = new ArrayList<>();
+        colors.add("green");
+        colors.add("blue");
+        return colors;
+    }
+}
diff --git a/spring-thymeleaf-2/src/main/resources/templates/lists/contains.html b/spring-thymeleaf-2/src/main/resources/templates/lists/contains.html
new file mode 100644
index 0000000000..2d874791d7
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/resources/templates/lists/contains.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Lists Utility Class in Thymeleaf</title>
+</head>
+<body>
+myList contains red: <span th:text="${#lists.contains(myList, 'red')}"/>
+
+myList contains red and green: <span th:text='${#lists.containsAll(myList, {"red", "green"})}'/>
+</body>
+</html>
diff --git a/spring-thymeleaf-2/src/main/resources/templates/lists/isEmpty.html b/spring-thymeleaf-2/src/main/resources/templates/lists/isEmpty.html
new file mode 100644
index 0000000000..06c66153c7
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/resources/templates/lists/isEmpty.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Lists Utility Class in Thymeleaf</title>
+</head>
+<body>
+
+isEmpty Check : <span th:text="${#lists.isEmpty(myList)}"/>
+
+<span th:unless="${#lists.isEmpty(myList)}">List is not empty</span>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-thymeleaf-2/src/main/resources/templates/lists/size.html b/spring-thymeleaf-2/src/main/resources/templates/lists/size.html
new file mode 100644
index 0000000000..594ff08467
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/resources/templates/lists/size.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Lists Utility Class in Thymeleaf</title>
+</head>
+<body>
+
+size: <span th:text="${#lists.size(myList)}"/>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-thymeleaf-2/src/main/resources/templates/lists/sort.html b/spring-thymeleaf-2/src/main/resources/templates/lists/sort.html
new file mode 100644
index 0000000000..e23c7bccbb
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/resources/templates/lists/sort.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Lists Utility Class in Thymeleaf</title>
+</head>
+<body>
+sort: <span th:text="${#lists.sort(myList)}"/>
+
+sort with Comparator: <span th:text="${#lists.sort(myList, reverse)}"/>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-thymeleaf-2/src/main/resources/templates/lists/toList.html b/spring-thymeleaf-2/src/main/resources/templates/lists/toList.html
new file mode 100644
index 0000000000..680c13160e
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/resources/templates/lists/toList.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Lists Utility Class in Thymeleaf</title>
+</head>
+<body>
+
+<span th:with="convertedList=${#lists.toList(myArray)}">
+    converted list size: <span th:text="${#lists.size(convertedList)}"/>
+</span>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-thymeleaf-2/src/test/java/com/baeldung/thymeleaf/lists/ListsControllerIntegrationTest.java b/spring-thymeleaf-2/src/test/java/com/baeldung/thymeleaf/lists/ListsControllerIntegrationTest.java
new file mode 100644
index 0000000000..252ec3bef3
--- /dev/null
+++ b/spring-thymeleaf-2/src/test/java/com/baeldung/thymeleaf/lists/ListsControllerIntegrationTest.java
@@ -0,0 +1,60 @@
+package com.baeldung.thymeleaf.lists;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@AutoConfigureMockMvc(printOnlyOnFailure = false)
+public class ListsControllerIntegrationTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    public void whenCalledToList_ThenConvertsToList() throws Exception {
+        mockMvc.perform(MockMvcRequestBuilders.get("/lists/toList"))
+          .andExpect(status().isOk())
+          .andExpect(content().string(containsString("converted list size: <span>4</span>")));
+    }
+
+    @Test
+    public void whenCalledContains_ThenChecksMembership() throws Exception {
+        mockMvc.perform(MockMvcRequestBuilders.get("/lists/contains"))
+          .andExpect(status().isOk())
+          .andExpect(content().string(containsString("myList contains red: <span>true</span>")))
+          .andExpect(content().string(containsString("myList contains red and green: <span>true</span>")));
+    }
+
+    @Test
+    public void whenCalledSize_ThenReturnsSize() throws Exception {
+        mockMvc.perform(MockMvcRequestBuilders.get("/lists/size"))
+          .andExpect(status().isOk())
+          .andExpect(content().string(containsString("size: <span>4</span>")));
+    }
+
+    @Test
+    public void whenCalledSort_ThenSortsItems() throws Exception {
+        mockMvc.perform(MockMvcRequestBuilders.get("/lists/sort"))
+          .andExpect(status().isOk())
+          .andExpect(content().string(containsString("sort: <span>[blue, green, red, yellow]</span>")))
+          .andExpect(content().string(containsString("sort with Comparator: <span>[yellow, red, green, blue]</span>")));
+    }
+
+    @Test
+    public void whenCalledIsEmpty_ThenChecksAnyMembers() throws Exception {
+        mockMvc.perform(MockMvcRequestBuilders.get("/lists/isEmpty"))
+          .andExpect(status().isOk())
+          .andExpect(content().string(containsString("isEmpty Check : <span>false</span>")));
+    }
+}
\ No newline at end of file
diff --git a/spring-userservice/src/test/java/org/baeldung/SpringContextTest.java b/spring-userservice/src/test/java/org/baeldung/SpringContextTest.java
deleted file mode 100644
index 2853a955fa..0000000000
--- a/spring-userservice/src/test/java/org/baeldung/SpringContextTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.custom.config.MvcConfig;
-import org.baeldung.custom.config.PersistenceDerbyJPAConfig;
-import org.baeldung.custom.config.SecSecurityConfig;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = { MvcConfig.class, PersistenceDerbyJPAConfig.class, SecSecurityConfig.class })
-public class SpringContextTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-vault/src/test/java/org/baeldung/SpringContextTest.java b/spring-vault/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 92%
rename from spring-vault/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-vault/src/test/java/org/baeldung/SpringContextLiveTest.java
index 95abe622fa..1b3db59ecb 100644
--- a/spring-vault/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-vault/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringVaultApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextTest.java b/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 92%
rename from spring-webflux-amqp/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-webflux-amqp/src/test/java/org/baeldung/SpringContextLiveTest.java
index 88d29d5ac0..effe8d2cfa 100644
--- a/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringWebfluxAmqpApplication.class)
-public class SpringContextTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/testing-modules/README.md b/testing-modules/README.md
index b269f547ec..d534e5cea6 100644
--- a/testing-modules/README.md
+++ b/testing-modules/README.md
@@ -1,15 +1,5 @@
 
 ## Testing Modules
 
-### Relevant Articles:
+This is a aggregator module containing several modules focused on testing libraries. 
 
-- [Quick Guide to BDDMockito](http://www.baeldung.com/bdd-mockito)
-- [AssertJ Exception Assertions](http://www.baeldung.com/assertj-exception-assertion)
-- [Using Hamcrest Number Matchers](http://www.baeldung.com/hamcrest-number-matchers)
-- [Assertions in JUnit 4 and JUnit 5](http://www.baeldung.com/junit-assertions)
-- [REST-assured with Groovy](http://www.baeldung.com/rest-assured-groovy)
-- [Hamcrest Bean Matchers](http://www.baeldung.com/hamcrest-bean-matchers)
-- [Hamcrest Object Matchers](http://www.baeldung.com/hamcrest-object-matchers)
-- [Headers, Cookies and Parameters with REST-assured](http://www.baeldung.com/rest-assured-header-cookie-parameter)
-- [JSON Schema Validation with REST-assured](http://www.baeldung.com/rest-assured-json-schema)
-- [Testing Callbacks with Mockito](http://www.baeldung.com/mockito-callbacks)
diff --git a/testing-modules/easy-random/README.md b/testing-modules/easy-random/README.md
new file mode 100644
index 0000000000..117d636bcc
--- /dev/null
+++ b/testing-modules/easy-random/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles:
+
+- [Quick Guide to EasyRandom in Java](https://www.baeldung.com/java-easy-random)
diff --git a/testing-modules/junit-5-advanced/README.md b/testing-modules/junit-5-advanced/README.md
index 7282a4efad..61a65b2e5a 100644
--- a/testing-modules/junit-5-advanced/README.md
+++ b/testing-modules/junit-5-advanced/README.md
@@ -1,3 +1,4 @@
-### Relevant Articles
+## Relevant Articles:
 
 - [JUnit 5 TestWatcher API](https://www.baeldung.com/junit-testwatcher)
+- [JUnit Custom Display Name Generator API](https://www.baeldung.com/junit-custom-display-name-generator)
diff --git a/testing-modules/junit-5/README.md b/testing-modules/junit-5/README.md
index d543b9b09b..14e018a5f9 100644
--- a/testing-modules/junit-5/README.md
+++ b/testing-modules/junit-5/README.md
@@ -11,3 +11,4 @@
 - [A Quick JUnit vs TestNG Comparison](http://www.baeldung.com/junit-vs-testng)
 - [Guide to JUnit 5 Parameterized Tests](https://www.baeldung.com/parameterized-tests-junit-5)
 - [JUnit 5 Conditional Test Execution with Annotations](https://www.baeldung.com/junit-5-conditional-test-execution)
+- [Assertions in JUnit 4 and JUnit 5](http://www.baeldung.com/junit-assertions)
diff --git a/testing-modules/mockito/README.md b/testing-modules/mockito/README.md
index 59954784f9..8fe57016e3 100644
--- a/testing-modules/mockito/README.md
+++ b/testing-modules/mockito/README.md
@@ -18,3 +18,7 @@
 - [Hamcrest Common Core Matchers](http://www.baeldung.com/hamcrest-core-matchers)
 - [Testing Callbacks with Mockito](http://www.baeldung.com/mockito-callbacks)
 - [Using Hamcrest Number Matchers](https://www.baeldung.com/hamcrest-number-matchers)
+- [Quick Guide to BDDMockito](http://www.baeldung.com/bdd-mockito)
+- [Hamcrest Bean Matchers](http://www.baeldung.com/hamcrest-bean-matchers)
+- [Hamcrest Object Matchers](http://www.baeldung.com/hamcrest-object-matchers)
+- [Testing Callbacks with Mockito](http://www.baeldung.com/mockito-callbacks)
diff --git a/testing-modules/rest-assured/README.md b/testing-modules/rest-assured/README.md
index ec108353a0..0012a63012 100644
--- a/testing-modules/rest-assured/README.md
+++ b/testing-modules/rest-assured/README.md
@@ -3,3 +3,7 @@
 - [REST-assured Support for Spring MockMvc](https://www.baeldung.com/spring-mock-mvc-rest-assured)
 - [Getting and Verifying Response Data with REST-assured](https://www.baeldung.com/rest-assured-response)
 - [REST Assured Authentication](https://www.baeldung.com/rest-assured-authentication)
+- [REST-assured with Groovy](http://www.baeldung.com/rest-assured-groovy)
+- [Headers, Cookies and Parameters with REST-assured](http://www.baeldung.com/rest-assured-header-cookie-parameter)
+- [JSON Schema Validation with REST-assured](http://www.baeldung.com/rest-assured-json-schema)
+
diff --git a/testing-modules/spring-testing/README.md b/testing-modules/spring-testing/README.md
index 0970eabeff..1b06c13953 100644
--- a/testing-modules/spring-testing/README.md
+++ b/testing-modules/spring-testing/README.md
@@ -1,8 +1,8 @@
-### Relevant Articles:
+## Relevant Articles:
 
 - [Mockito.mock() vs @Mock vs @MockBean](http://www.baeldung.com/java-spring-mockito-mock-mockbean)
 - [A Quick Guide to @TestPropertySource](https://www.baeldung.com/spring-test-property-source)
 - [Guide to ReflectionTestUtils for Unit Testing](https://www.baeldung.com/spring-reflection-test-utils)
 - [How to Test the @Scheduled Annotation](https://www.baeldung.com/spring-testing-scheduled-annotation)
 - [Using SpringJUnit4ClassRunner with Parameterized](https://www.baeldung.com/springjunit4classrunner-parameterized)
-- [Override properties in Spring]()
+- [Override Properties in Spring’s Tests](https://www.baeldung.com/spring-tests-override-properties)
diff --git a/testing-modules/testing/README.md b/testing-modules/testing/README.md
index 4a7829e867..135ef1054a 100644
--- a/testing-modules/testing/README.md
+++ b/testing-modules/testing/README.md
@@ -21,3 +21,4 @@
 - [Using Conditions with AssertJ Assertions](http://www.baeldung.com/assertj-conditions)
 - [A Guide to JavaFaker](https://www.baeldung.com/java-faker)
 - [Running JUnit Tests Programmatically, from a Java Application](https://www.baeldung.com/junit-tests-run-programmatically-from-java)
+- [AssertJ Exception Assertions](http://www.baeldung.com/assertj-exception-assertion)
diff --git a/xml/src/main/java/com/baeldung/xml/attribute/Dom4jTransformer.java b/xml/src/main/java/com/baeldung/xml/attribute/Dom4jTransformer.java
index a1922ad224..d4fdeb0d58 100644
--- a/xml/src/main/java/com/baeldung/xml/attribute/Dom4jTransformer.java
+++ b/xml/src/main/java/com/baeldung/xml/attribute/Dom4jTransformer.java
@@ -3,6 +3,7 @@ package com.baeldung.xml.attribute;
 import org.dom4j.*;
 import org.dom4j.io.DocumentSource;
 import org.dom4j.io.SAXReader;
+import org.xml.sax.SAXException;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.OutputKeys;
@@ -17,9 +18,12 @@ import java.util.List;
 public class Dom4jTransformer {
     private final Document input;
 
-    public Dom4jTransformer(String resourcePath) throws DocumentException {
+    public Dom4jTransformer(String resourcePath) throws DocumentException, SAXException {
         // 1- Build the doc from the XML file
         SAXReader xmlReader = new SAXReader();
+        xmlReader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        xmlReader.setFeature("http://xml.org/sax/features/external-general-entities", false);
+        xmlReader.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
         this.input = xmlReader.read(resourcePath);
     }
 
diff --git a/xml/src/main/java/com/baeldung/xml/attribute/JaxpTransformer.java b/xml/src/main/java/com/baeldung/xml/attribute/JaxpTransformer.java
index a2266a2b44..a55b00950c 100644
--- a/xml/src/main/java/com/baeldung/xml/attribute/JaxpTransformer.java
+++ b/xml/src/main/java/com/baeldung/xml/attribute/JaxpTransformer.java
@@ -32,7 +32,8 @@ public class JaxpTransformer {
         // 1- Build the doc from the XML file
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-        input = factory.newDocumentBuilder()
+        factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        this.input = factory.newDocumentBuilder()
             .parse(resourcePath);
     }
 
@@ -40,24 +41,24 @@ public class JaxpTransformer {
         // 2- Locate the node(s) with xpath
         XPath xpath = XPathFactory.newInstance()
             .newXPath();
-        NodeList nodes = (NodeList) xpath.evaluate(String.format("//*[contains(@%s, '%s')]", attribute, oldValue), input, XPathConstants.NODESET);
+        NodeList nodes = (NodeList) xpath.evaluate(String.format("//*[contains(@%s, '%s')]", attribute, oldValue), this.input, XPathConstants.NODESET);
         // 3- Make the change on the selected nodes
         for (int i = 0; i < nodes.getLength(); i++) {
             Element value = (Element) nodes.item(i);
             value.setAttribute(attribute, newValue);
         }
-        //Stream api syntax
-        //        IntStream
-        //          .range(0, nodes.getLength())
-        //          .mapToObj(i -> (Element) nodes.item(i))
-        //          .forEach(value -> value.setAttribute(attribute, newValue));
+        // Stream api syntax
+        // IntStream
+        // .range(0, nodes.getLength())
+        // .mapToObj(i -> (Element) nodes.item(i))
+        // .forEach(value -> value.setAttribute(attribute, newValue));
         // 4- Save the result to a new XML doc
         TransformerFactory factory = TransformerFactory.newInstance();
         factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
         Transformer xformer = factory.newTransformer();
         xformer.setOutputProperty(OutputKeys.INDENT, "yes");
         Writer output = new StringWriter();
-        xformer.transform(new DOMSource(input), new StreamResult(output));
+        xformer.transform(new DOMSource(this.input), new StreamResult(output));
         return output.toString();
     }
 }
diff --git a/xml/src/main/java/com/baeldung/xml/attribute/jmh/AttributeBenchMark.java b/xml/src/main/java/com/baeldung/xml/attribute/jmh/AttributeBenchMark.java
index 064e181713..f5f3a2ce6c 100644
--- a/xml/src/main/java/com/baeldung/xml/attribute/jmh/AttributeBenchMark.java
+++ b/xml/src/main/java/com/baeldung/xml/attribute/jmh/AttributeBenchMark.java
@@ -1,7 +1,19 @@
 package com.baeldung.xml.attribute.jmh;
 
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPathExpressionException;
+
 import org.dom4j.DocumentException;
-import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.Options;
@@ -12,30 +24,23 @@ import com.baeldung.xml.attribute.Dom4jTransformer;
 import com.baeldung.xml.attribute.JaxpTransformer;
 import com.baeldung.xml.attribute.JooxTransformer;
 
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.xpath.XPathExpressionException;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Benchmark)
 public class AttributeBenchMark {
 
     public static void main(String[] args) throws RunnerException {
-        Options opt = new OptionsBuilder()
-          .include(AttributeBenchMark.class.getSimpleName())
-          .forks(1)
-          .build();
+        Options opt = new OptionsBuilder().include(AttributeBenchMark.class.getSimpleName())
+            .forks(1)
+            .build();
         new Runner(opt).run();
     }
 
     @Benchmark
-    public String dom4jBenchmark() throws DocumentException, TransformerException {
-        String path = getClass()
-          .getResource("/xml/attribute.xml")
-          .toString();
+    public String dom4jBenchmark() throws DocumentException, TransformerException, SAXException {
+        String path = this.getClass()
+            .getResource("/xml/attribute.xml")
+            .toString();
         Dom4jTransformer transformer = new Dom4jTransformer(path);
         String attribute = "customer";
         String oldValue = "true";
@@ -46,9 +51,9 @@ public class AttributeBenchMark {
 
     @Benchmark
     public String jooxBenchmark() throws IOException, SAXException {
-        String path = getClass()
-          .getResource("/xml/attribute.xml")
-          .toString();
+        String path = this.getClass()
+            .getResource("/xml/attribute.xml")
+            .toString();
         JooxTransformer transformer = new JooxTransformer(path);
         String attribute = "customer";
         String oldValue = "true";
@@ -59,9 +64,9 @@ public class AttributeBenchMark {
 
     @Benchmark
     public String jaxpBenchmark() throws TransformerException, ParserConfigurationException, SAXException, IOException, XPathExpressionException {
-        String path = getClass()
-          .getResource("/xml/attribute.xml")
-          .toString();
+        String path = this.getClass()
+            .getResource("/xml/attribute.xml")
+            .toString();
         JaxpTransformer transformer = new JaxpTransformer(path);
         String attribute = "customer";
         String oldValue = "true";
diff --git a/xml/src/test/java/com/baeldung/xml/attribute/Dom4jProcessorUnitTest.java b/xml/src/test/java/com/baeldung/xml/attribute/Dom4jProcessorUnitTest.java
index 485744f9a5..351b8bc437 100644
--- a/xml/src/test/java/com/baeldung/xml/attribute/Dom4jProcessorUnitTest.java
+++ b/xml/src/test/java/com/baeldung/xml/attribute/Dom4jProcessorUnitTest.java
@@ -2,14 +2,19 @@ package com.baeldung.xml.attribute;
 
 import org.dom4j.DocumentException;
 import org.junit.jupiter.api.Test;
+import org.xml.sax.SAXException;
 
+import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.xpath.XPathExpressionException;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 /**
@@ -18,10 +23,9 @@ import static org.xmlunit.assertj.XmlAssert.assertThat;
 public class Dom4jProcessorUnitTest {
 
     @Test
-    public void givenXmlWithAttributes_whenModifyAttribute_thenGetXmlUpdated() throws TransformerFactoryConfigurationError, TransformerException, DocumentException {
-        String path = getClass()
-          .getResource("/xml/attribute.xml")
-          .toString();
+    public void givenXmlWithAttributes_whenModifyAttribute_thenGetXmlUpdated() throws TransformerFactoryConfigurationError, TransformerException, DocumentException, SAXException {
+        String path = getClass().getResource("/xml/attribute.xml")
+            .toString();
         Dom4jTransformer transformer = new Dom4jTransformer(path);
         String attribute = "customer";
         String oldValue = "true";
@@ -33,23 +37,32 @@ public class Dom4jProcessorUnitTest {
     }
 
     @Test
-    public void givenTwoXml_whenModifyAttribute_thenGetSimilarXml() throws IOException, TransformerFactoryConfigurationError, TransformerException, URISyntaxException, DocumentException {
-        String path = getClass()
-          .getResource("/xml/attribute.xml")
-          .toString();
+    public void givenTwoXml_whenModifyAttribute_thenGetSimilarXml() throws IOException, TransformerFactoryConfigurationError, TransformerException, URISyntaxException, DocumentException, SAXException {
+        String path = getClass().getResource("/xml/attribute.xml")
+            .toString();
         Dom4jTransformer transformer = new Dom4jTransformer(path);
         String attribute = "customer";
         String oldValue = "true";
         String newValue = "false";
-        String expectedXml = new String(Files.readAllBytes((Paths.get(getClass()
-          .getResource("/xml/attribute_expected.xml")
-          .toURI()))));
+        String expectedXml = new String(Files.readAllBytes((Paths.get(getClass().getResource("/xml/attribute_expected.xml")
+            .toURI()))));
 
         String result = transformer.modifyAttribute(attribute, oldValue, newValue);
 
-        assertThat(result)
-          .and(expectedXml)
-          .areSimilar();
+        assertThat(result).and(expectedXml)
+            .areSimilar();
+    }
+
+    @Test
+    public void givenXmlXee_whenInit_thenThrowException() throws IOException, SAXException, ParserConfigurationException, XPathExpressionException, TransformerFactoryConfigurationError, TransformerException {
+        String path = getClass().getResource("/xml/xee_attribute.xml")
+            .toString();
+
+        assertThatThrownBy(() -> {
+
+            new Dom4jTransformer(path);
+
+        }).isInstanceOf(DocumentException.class);
     }
 
 }
diff --git a/xml/src/test/java/com/baeldung/xml/attribute/JaxpProcessorUnitTest.java b/xml/src/test/java/com/baeldung/xml/attribute/JaxpProcessorUnitTest.java
index 8394016dbd..8d814783e0 100644
--- a/xml/src/test/java/com/baeldung/xml/attribute/JaxpProcessorUnitTest.java
+++ b/xml/src/test/java/com/baeldung/xml/attribute/JaxpProcessorUnitTest.java
@@ -1,5 +1,6 @@
 package com.baeldung.xml.attribute;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 import java.io.IOException;
@@ -11,6 +12,7 @@ import javax.xml.xpath.XPathExpressionException;
 
 import org.junit.jupiter.api.Test;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 /**
  * Unit test for {@link JaxpTransformer}.
@@ -31,4 +33,16 @@ public class JaxpProcessorUnitTest {
         assertThat(result).hasXPath("//*[contains(@customer, 'false')]");
     }
 
+    @Test
+    public void givenXmlXee_whenInit_thenThrowException() throws IOException, SAXException, ParserConfigurationException, XPathExpressionException, TransformerFactoryConfigurationError, TransformerException {
+        String path = getClass().getResource("/xml/xee_attribute.xml")
+            .toString();
+
+        assertThatThrownBy(() -> {
+
+            new JaxpTransformer(path);
+
+        }).isInstanceOf(SAXParseException.class);
+    }
+
 }
diff --git a/xml/src/test/java/com/baeldung/xml/attribute/JooxProcessorUnitTest.java b/xml/src/test/java/com/baeldung/xml/attribute/JooxProcessorUnitTest.java
index 38c7c59789..40d0c671e7 100644
--- a/xml/src/test/java/com/baeldung/xml/attribute/JooxProcessorUnitTest.java
+++ b/xml/src/test/java/com/baeldung/xml/attribute/JooxProcessorUnitTest.java
@@ -2,13 +2,19 @@ package com.baeldung.xml.attribute;
 
 import org.junit.jupiter.api.Test;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.xpath.XPathExpressionException;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 /**
@@ -18,9 +24,8 @@ public class JooxProcessorUnitTest {
 
     @Test
     public void givenXmlWithAttributes_whenModifyAttribute_thenGetXmlUpdated() throws IOException, SAXException, TransformerFactoryConfigurationError {
-        String path = getClass()
-          .getResource("/xml/attribute.xml")
-          .toString();
+        String path = getClass().getResource("/xml/attribute.xml")
+            .toString();
         JooxTransformer transformer = new JooxTransformer(path);
         String attribute = "customer";
         String oldValue = "true";
@@ -33,22 +38,31 @@ public class JooxProcessorUnitTest {
 
     @Test
     public void givenTwoXml_whenModifyAttribute_thenGetSimilarXml() throws IOException, TransformerFactoryConfigurationError, URISyntaxException, SAXException {
-        String path = getClass()
-          .getResource("/xml/attribute.xml")
-          .toString();
+        String path = getClass().getResource("/xml/attribute.xml")
+            .toString();
         JooxTransformer transformer = new JooxTransformer(path);
         String attribute = "customer";
         String oldValue = "true";
         String newValue = "false";
-        String expectedXml = new String(Files.readAllBytes((Paths.get(getClass()
-          .getResource("/xml/attribute_expected.xml")
-          .toURI()))));
+        String expectedXml = new String(Files.readAllBytes((Paths.get(getClass().getResource("/xml/attribute_expected.xml")
+            .toURI()))));
 
         String result = transformer.modifyAttribute(attribute, oldValue, newValue);
 
-        assertThat(result)
-          .and(expectedXml)
-          .areSimilar();
+        assertThat(result).and(expectedXml)
+            .areSimilar();
+    }
+
+    @Test
+    public void givenXmlXee_whenInit_thenThrowException() throws IOException, SAXException, ParserConfigurationException, XPathExpressionException, TransformerFactoryConfigurationError, TransformerException {
+        String path = getClass().getResource("/xml/xee_attribute.xml")
+            .toString();
+
+        assertThatThrownBy(() -> {
+
+            new JooxTransformer(path);
+
+        }).isInstanceOf(SAXParseException.class);
     }
 
 }
diff --git a/xml/src/test/resources/xml/xee_attribute.xml b/xml/src/test/resources/xml/xee_attribute.xml
new file mode 100644
index 0000000000..9633ca15b0
--- /dev/null
+++ b/xml/src/test/resources/xml/xee_attribute.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE notification [     
+ <!ENTITY xxe SYSTEM "file:///etc/passwd" >]>
+<notification id="5">
+	<bad_entry>&xxe;
+	</bad_entry>
+	<to customer="true">john@email.com</to>
+	<from>mary@email.com</from>
+</notification>
\ No newline at end of file
diff --git a/xstream/README.md b/xstream/README.md
index e8302c14ef..bf917e81fb 100644
--- a/xstream/README.md
+++ b/xstream/README.md
@@ -1,4 +1,6 @@
-### Relevant Articles:
+## Relevant Articles:
+
 - [XStream User Guide: JSON](http://www.baeldung.com/xstream-json-processing)
 - [XStream User Guide: Converting XML to Objects](http://www.baeldung.com/xstream-deserialize-xml-to-object)
 - [XStream User Guide: Converting Objects to XML](http://www.baeldung.com/xstream-serialize-object-to-xml)
+- [Remote Code Execution with XStream](https://www.baeldung.com/java-xstream-remote-code-execution)