diff --git a/.gitignore b/.gitignore
index be3bc420c5..90daf38dee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,7 @@ out/
 .DS_Store
 
 # Maven
-log/
+log/*
 target/
 
 # Gradle
@@ -83,4 +83,5 @@ jta/transaction-logs/
 software-security/sql-injection-samples/derby.log
 spring-soap/src/main/java/com/baeldung/springsoap/gen/
 /report-*.json
-transaction.log
\ No newline at end of file
+transaction.log
+*-shell.log
\ No newline at end of file
diff --git a/akka-http/README.md b/akka-http/README.md
index 3831b5079f..ebe6581ff6 100644
--- a/akka-http/README.md
+++ b/akka-http/README.md
@@ -1,3 +1,7 @@
-## Relevant articles:
+## Akka HTTP
+
+This module contains articles about Akka HTTP. 
+
+### Relevant articles:
 
 - [Introduction to Akka HTTP](https://www.baeldung.com/akka-http)
diff --git a/akka-streams/README.md b/akka-streams/README.md
index 5f71991def..a59b7fde5c 100644
--- a/akka-streams/README.md
+++ b/akka-streams/README.md
@@ -1,3 +1,7 @@
+## Akka Streams
+
+This module contains articles about Akka Streams. 
+
 ### Relevant articles
 
 - [Guide to Akka Streams](https://www.baeldung.com/akka-streams)
diff --git a/algorithms-genetic/README.md b/algorithms-genetic/README.md
index 124e9c09e5..1c9e831ac2 100644
--- a/algorithms-genetic/README.md
+++ b/algorithms-genetic/README.md
@@ -1,4 +1,8 @@
-## Relevant articles:
+## Genetic Algorithms
+
+This module contains articles about genetic algorithms. 
+
+### Relevant articles:
 
 - [Introduction to Jenetics Library](https://www.baeldung.com/jenetics)
 - [Ant Colony Optimization](https://www.baeldung.com/java-ant-colony-optimization)
diff --git a/algorithms-miscellaneous-1/README.md b/algorithms-miscellaneous-1/README.md
index 57f5a5d478..6a25f8cac8 100644
--- a/algorithms-miscellaneous-1/README.md
+++ b/algorithms-miscellaneous-1/README.md
@@ -1,4 +1,9 @@
-## Relevant articles:
+## Algorithms - Miscellaneous
+
+This module contains articles about algorithms. Some classes of algorithms, e.g., [sorting](/../algorithms-sorting) and
+[genetic algorithms](/../algorithms-genetic), have their own dedicated modules. 
+
+### Relevant articles:
 
 - [Validating Input With Finite Automata in Java](https://www.baeldung.com/java-finite-automata)
 - [Example of Hill Climbing Algorithm](https://www.baeldung.com/java-hill-climbing-algorithm)
@@ -6,4 +11,5 @@
 - [Binary Search Algorithm in Java](https://www.baeldung.com/java-binary-search)
 - [Introduction to Minimax Algorithm](https://www.baeldung.com/java-minimax-algorithm)
 - [How to Calculate Levenshtein Distance in Java?](https://www.baeldung.com/java-levenshtein-distance)
-- [How to Find the Kth Largest Element in Java](https://www.baeldung.com/java-kth-largest-element)
\ No newline at end of file
+- [How to Find the Kth Largest Element in Java](https://www.baeldung.com/java-kth-largest-element)
+- More articles: [[next -->]](/../algorithms-miscellaneous-2)
diff --git a/algorithms-miscellaneous-2/README.md b/algorithms-miscellaneous-2/README.md
index 76727a1d4f..7560fc4fe7 100644
--- a/algorithms-miscellaneous-2/README.md
+++ b/algorithms-miscellaneous-2/README.md
@@ -1,4 +1,9 @@
-## Relevant articles:
+## Algorithms - Miscellaneous
+
+This module contains articles about algorithms. Some classes of algorithms, e.g., [sorting](/../algorithms-sorting) and
+[genetic algorithms](/../algorithms-genetic), have their own dedicated modules. 
+
+### Relevant articles:
 
 - [Dijkstra Shortest Path Algorithm in Java](https://www.baeldung.com/java-dijkstra)
 - [Introduction to Cobertura](https://www.baeldung.com/cobertura)
@@ -8,3 +13,4 @@
 - [Create a Sudoku Solver in Java](https://www.baeldung.com/java-sudoku)
 - [Displaying Money Amounts in Words](https://www.baeldung.com/java-money-into-words)
 - [A Collaborative Filtering Recommendation System in Java](https://www.baeldung.com/java-collaborative-filtering-recommendations)
+- More articles: [[<-- prev]](/../algorithms-miscellaneous-1) [[next -->]](/../algorithms-miscellaneous-3)
diff --git a/algorithms-miscellaneous-3/README.md b/algorithms-miscellaneous-3/README.md
index 9748595a34..a1456c6b20 100644
--- a/algorithms-miscellaneous-3/README.md
+++ b/algorithms-miscellaneous-3/README.md
@@ -14,4 +14,6 @@ This module contains articles about algorithms. Some classes of algorithms, e.g.
 - [A Guide to the Folding Technique in Java](https://www.baeldung.com/folding-hashing-technique)
 - [Creating a Triangle with for Loops in Java](https://www.baeldung.com/java-print-triangle)
 - [Efficient Word Frequency Calculator in Java](https://www.baeldung.com/java-word-frequency)
-- More articles: [[<-- prev]](/algorithms-miscellaneous-2) [[next -->]](/algorithms-miscellaneous-4)
\ No newline at end of file
+- [Interpolation Search in Java](https://www.baeldung.com/java-interpolation-search)
+- [The K-Means Clustering Algorithm in Java](https://www.baeldung.com/java-k-means-clustering-algorithm)
+- More articles: [[<-- prev]](/algorithms-miscellaneous-2) [[next -->]](/algorithms-miscellaneous-4)
diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithm.java b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithm.java
new file mode 100644
index 0000000000..9d301f9578
--- /dev/null
+++ b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithm.java
@@ -0,0 +1,54 @@
+package com.baeldung.algorithms.breadthfirstsearch;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+
+public class BreadthFirstSearchAlgorithm {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(BreadthFirstSearchAlgorithm.class);
+
+    public static <T> Optional<Tree<T>> search(T value, Tree<T> root) {
+        Queue<Tree<T>> queue = new ArrayDeque<>();
+        queue.add(root);
+
+        Tree<T> currentNode;
+        while (!queue.isEmpty()) {
+            currentNode = queue.remove();
+            LOGGER.info("Visited node with value: {}", currentNode.getValue());
+
+            if (currentNode.getValue().equals(value)) {
+                return Optional.of(currentNode);
+            } else {
+                queue.addAll(currentNode.getChildren());
+            }
+        }
+
+        return Optional.empty();
+    }
+
+    public static <T> Optional<Node<T>> search(T value, Node<T> start) {
+        Queue<Node<T>> queue = new ArrayDeque<>();
+        queue.add(start);
+
+        Node<T> currentNode;
+        Set<Node<T>> alreadyVisited = new HashSet<>();
+
+        while (!queue.isEmpty()) {
+            currentNode = queue.remove();
+            LOGGER.info("Visited node with value: {}", currentNode.getValue());
+
+            if (currentNode.getValue().equals(value)) {
+                return Optional.of(currentNode);
+            } else {
+                alreadyVisited.add(currentNode);
+                queue.addAll(currentNode.getNeighbors());
+                queue.removeAll(alreadyVisited);
+            }
+        }
+
+        return Optional.empty();
+    }
+
+}
diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Node.java b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Node.java
new file mode 100644
index 0000000000..54a589ae26
--- /dev/null
+++ b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Node.java
@@ -0,0 +1,31 @@
+package com.baeldung.algorithms.breadthfirstsearch;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+public class Node<T> {
+
+    private T value;
+    private Set<Node<T>> neighbors;
+
+    public Node(T value) {
+        this.value = value;
+        this.neighbors = new HashSet<>();
+    }
+
+    public T getValue() {
+        return value;
+    }
+
+    public Set<Node<T>> getNeighbors() {
+        return Collections.unmodifiableSet(neighbors);
+    }
+
+    public void connect(Node<T> node) {
+        if (this == node) throw new IllegalArgumentException("Can't connect node to itself");
+        this.neighbors.add(node);
+        node.neighbors.add(this);
+    }
+
+}
diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Tree.java b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Tree.java
new file mode 100644
index 0000000000..842d2837ff
--- /dev/null
+++ b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/breadthfirstsearch/Tree.java
@@ -0,0 +1,34 @@
+package com.baeldung.algorithms.breadthfirstsearch;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class Tree<T> {
+
+    private T value;
+    private List<Tree<T>> children;
+
+    private Tree(T value) {
+        this.value = value;
+        this.children = new ArrayList<>();
+    }
+
+    public static <T> Tree<T> of(T value) {
+        return new Tree<>(value);
+    }
+
+    public T getValue() {
+        return value;
+    }
+
+    public List<Tree<T>> getChildren() {
+        return Collections.unmodifiableList(children);
+    }
+
+    public Tree<T> addChild(T value) {
+        Tree<T> newChild = new Tree<>(value);
+        children.add(newChild);
+        return newChild;
+    }
+}
diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java b/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java
new file mode 100644
index 0000000000..aa22fc5353
--- /dev/null
+++ b/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/breadthfirstsearch/BreadthFirstSearchAlgorithmUnitTest.java
@@ -0,0 +1,86 @@
+package com.baeldung.algorithms.breadthfirstsearch;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class BreadthFirstSearchAlgorithmUnitTest {
+
+    private Tree<Integer> root;
+    private Tree<Integer> rootFirstChild;
+    private Tree<Integer> depthMostChild;
+    private Tree<Integer> rootSecondChild;
+
+    private Node<Integer> start;
+    private Node<Integer> firstNeighbor;
+    private Node<Integer> firstNeighborNeighbor;
+    private Node<Integer> secondNeighbor;
+
+    @Test
+    void givenTree_whenSearchTen_thenRoot() {
+        initTree();
+        assertThat(BreadthFirstSearchAlgorithm.search(10, root)).isPresent().contains(root);
+    }
+
+    @Test
+    void givenTree_whenSearchThree_thenDepthMostValue() {
+        initTree();
+        assertThat(BreadthFirstSearchAlgorithm.search(3, root)).isPresent().contains(depthMostChild);
+    }
+
+    @Test
+    void givenTree_whenSearchFour_thenRootSecondChild() {
+        initTree();
+        assertThat(BreadthFirstSearchAlgorithm.search(4, root)).isPresent().contains(rootSecondChild);
+    }
+
+    @Test
+    void givenTree_whenSearchFive_thenNotFound() {
+        initTree();
+        assertThat(BreadthFirstSearchAlgorithm.search(5, root)).isEmpty();
+    }
+
+    private void initTree() {
+        root = Tree.of(10);
+        rootFirstChild = root.addChild(2);
+        depthMostChild = rootFirstChild.addChild(3);
+        rootSecondChild = root.addChild(4);
+    }
+
+    @Test
+    void givenNode_whenSearchTen_thenStart() {
+        initNode();
+        assertThat(BreadthFirstSearchAlgorithm.search(10, firstNeighborNeighbor)).isPresent().contains(start);
+    }
+
+    @Test
+    void givenNode_whenSearchThree_thenNeighborNeighbor() {
+        initNode();
+        assertThat(BreadthFirstSearchAlgorithm.search(3, firstNeighborNeighbor)).isPresent().contains(firstNeighborNeighbor);
+    }
+
+    @Test
+    void givenNode_whenSearchFour_thenSecondNeighbor() {
+        initNode();
+        assertThat(BreadthFirstSearchAlgorithm.search(4, firstNeighborNeighbor)).isPresent().contains(secondNeighbor);
+    }
+
+    @Test
+    void givenNode_whenSearchFive_thenNotFound() {
+        initNode();
+        assertThat(BreadthFirstSearchAlgorithm.search(5, firstNeighborNeighbor)).isEmpty();
+    }
+
+    private void initNode() {
+        start = new Node<>(10);
+        firstNeighbor = new Node<>(2);
+        start.connect(firstNeighbor);
+
+        firstNeighborNeighbor = new Node<>(3);
+        firstNeighbor.connect(firstNeighborNeighbor);
+        firstNeighborNeighbor.connect(start);
+
+        secondNeighbor = new Node<>(4);
+        start.connect(secondNeighbor);
+    }
+}
\ No newline at end of file
diff --git a/algorithms-miscellaneous-4/README.md b/algorithms-miscellaneous-4/README.md
index fabb4d29b8..6aad9a43e4 100644
--- a/algorithms-miscellaneous-4/README.md
+++ b/algorithms-miscellaneous-4/README.md
@@ -1,4 +1,9 @@
-## Relevant articles:
+## Algorithms - Miscellaneous
+
+This module contains articles about algorithms. Some classes of algorithms, e.g., [sorting](/../algorithms-sorting) and
+[genetic algorithms](/../algorithms-genetic), have their own dedicated modules. 
+
+### Relevant articles:
 
 - [Multi-Swarm Optimization Algorithm in Java](https://www.baeldung.com/java-multi-swarm-algorithm)
 - [String Search Algorithms for Large Texts](https://www.baeldung.com/java-full-text-search-algorithms)
@@ -6,4 +11,5 @@
 - [Find the Middle Element of a Linked List](https://www.baeldung.com/java-linked-list-middle-element)
 - [Find Substrings That Are Palindromes in Java](https://www.baeldung.com/java-palindrome-substrings)
 - [Find the Longest Substring without Repeating Characters](https://www.baeldung.com/java-longest-substring-without-repeated-characters)
-- [Permutations of an Array in Java](https://www.baeldung.com/java-array-permutations)
\ No newline at end of file
+- [Permutations of an Array in Java](https://www.baeldung.com/java-array-permutations)
+- More articles: [[<-- prev]](/../algorithms-miscellaneous-3) [[next -->]](/../algorithms-miscellaneous-5)
diff --git a/algorithms-miscellaneous-5/README.md b/algorithms-miscellaneous-5/README.md
index 7ed71e61cc..7a8f2e0a36 100644
--- a/algorithms-miscellaneous-5/README.md
+++ b/algorithms-miscellaneous-5/README.md
@@ -1,5 +1,11 @@
-## Relevant articles:
+## Algorithms - Miscellaneous
+
+This module contains articles about algorithms. Some classes of algorithms, e.g., [sorting](/../algorithms-sorting) and
+[genetic algorithms](/../algorithms-genetic), have their own dedicated modules. 
+
+### Relevant articles:
 
 - [Converting Between Byte Arrays and Hexadecimal Strings in Java](https://www.baeldung.com/java-byte-arrays-hex-strings)
 - [Reversing a Binary Tree in Java](https://www.baeldung.com/java-reversing-a-binary-tree)
-- [Find If Two Numbers Are Relatively Prime in Java](https://www.baeldung.com/java-two-relatively-prime-numbers)
\ No newline at end of file
+- [Find If Two Numbers Are Relatively Prime in Java](https://www.baeldung.com/java-two-relatively-prime-numbers)
+- More articles: [[<-- prev]](/../algorithms-miscellaneous-4)
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/knapsack/Knapsack.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/knapsack/Knapsack.java
new file mode 100644
index 0000000000..61c3f05a95
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/knapsack/Knapsack.java
@@ -0,0 +1,36 @@
+package com.baeldung.algorithms.knapsack;
+
+public class Knapsack {
+
+    public int knapsackRec(int[] w, int[] v, int n, int W) {
+        if (n <= 0) {
+            return 0;
+        } else if (w[n - 1] > W) {
+            return knapsackRec(w, v, n - 1, W);
+        } else {
+            return Math.max(knapsackRec(w, v, n - 1, W), v[n - 1] + knapsackRec(w, v, n - 1, W - w[n - 1]));
+        }
+    }
+
+    public int knapsackDP(int[] w, int[] v, int n, int W) {
+        if (n <= 0 || W <= 0) {
+            return 0;
+        }
+
+        int[][] m = new int[n + 1][W + 1];
+        for (int j = 0; j <= W; j++) {
+            m[0][j] = 0;
+        }
+
+        for (int i = 1; i <= n; i++) {
+            for (int j = 1; j <= W; j++) {
+                if (w[i - 1] > j) {
+                    m[i][j] = m[i - 1][j];
+                } else {
+                    m[i][j] = Math.max(m[i - 1][j], m[i - 1][j - w[i - 1]] + v[i - 1]);
+                }
+            }
+        }
+        return m[n][W];
+    }
+}
diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java
new file mode 100644
index 0000000000..b168e6b1eb
--- /dev/null
+++ b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/knapsack/KnapsackUnitTest.java
@@ -0,0 +1,44 @@
+package com.baeldung.algorithms.knapsack;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class KnapsackUnitTest {
+
+    @Test
+    public void givenWeightsandValues_whenCalculateMax_thenOutputCorrectResult() {
+        final int[] w = new int[] { 23, 26, 20, 18, 32, 27, 29, 26, 30, 27 };
+        final int[] v = new int[] { 505, 352, 458, 220, 354, 414, 498, 545, 473, 543 };
+        final int n = 10;
+        final int W = 67;
+        final Knapsack knapsack = new Knapsack();
+
+        assertEquals(1270, knapsack.knapsackRec(w, v, n, W));
+        assertEquals(1270, knapsack.knapsackDP(w, v, n, W));
+    }
+
+    @Test
+    public void givenZeroItems_whenCalculateMax_thenOutputZero() {
+        final int[] w = new int[] {};
+        final int[] v = new int[] {};
+        final int n = 0;
+        final int W = 67;
+        final Knapsack knapsack = new Knapsack();
+
+        assertEquals(0, knapsack.knapsackRec(w, v, n, W));
+        assertEquals(0, knapsack.knapsackDP(w, v, n, W));
+    }
+
+    @Test
+    public void givenZeroWeightLimit_whenCalculateMax_thenOutputZero() {
+        final int[] w = new int[] { 23, 26, 20, 18, 32, 27, 29, 26, 30, 27 };
+        final int[] v = new int[] { 505, 352, 458, 220, 354, 414, 498, 545, 473, 543 };
+        final int n = 10;
+        final int W = 0;
+        final Knapsack knapsack = new Knapsack();
+
+        assertEquals(0, knapsack.knapsackRec(w, v, n, W));
+        assertEquals(0, knapsack.knapsackDP(w, v, n, W));
+    }
+}
diff --git a/algorithms-sorting/README.md b/algorithms-sorting/README.md
index f19705f113..3f27cfea49 100644
--- a/algorithms-sorting/README.md
+++ b/algorithms-sorting/README.md
@@ -12,3 +12,8 @@ This module contains articles about sorting algorithms.
 - [Shell Sort in Java](https://www.baeldung.com/java-shell-sort)
 - [Counting Sort in Java](https://www.baeldung.com/java-counting-sort)
 - [Sorting Strings by Contained Numbers in Java](https://www.baeldung.com/java-sort-strings-contained-numbers)
+- [How an In-Place Sorting Algorithm Works](https://www.baeldung.com/java-in-place-sorting)
+- [Selection Sort in Java](https://www.baeldung.com/java-selection-sort)
+- [Sorting Strings by Contained Numbers in Java](https://www.baeldung.com/java-sort-strings-contained-numbers)
+- [Radix Sort in Java](https://www.baeldung.com/java-radix-sort)
+- [Sorting a String Alphabetically in Java](https://www.baeldung.com/java-sort-string-alphabetically)
diff --git a/algorithms-sorting/pom.xml b/algorithms-sorting/pom.xml
index b25adf05a8..5bb19a8069 100644
--- a/algorithms-sorting/pom.xml
+++ b/algorithms-sorting/pom.xml
@@ -28,6 +28,12 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </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.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -52,6 +58,7 @@
         <commons-math3.version>3.6.1</commons-math3.version>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <commons-codec.version>1.11</commons-codec.version>
+        <junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/java-strings/src/main/java/com/baeldung/string/sorting/AnagramValidator.java b/algorithms-sorting/src/main/java/com/baeldung/algorithms/stringsort/AnagramValidator.java
similarity index 93%
rename from java-strings/src/main/java/com/baeldung/string/sorting/AnagramValidator.java
rename to algorithms-sorting/src/main/java/com/baeldung/algorithms/stringsort/AnagramValidator.java
index c4f684383d..67b5e5facc 100644
--- a/java-strings/src/main/java/com/baeldung/string/sorting/AnagramValidator.java
+++ b/algorithms-sorting/src/main/java/com/baeldung/algorithms/stringsort/AnagramValidator.java
@@ -1,4 +1,4 @@
-package com.baeldung.string.sorting;
+package com.baeldung.algorithms.stringsort;
 
 import java.util.Arrays;
 
diff --git a/java-strings/src/test/java/com/baeldung/string/sorting/AnagramValidatorUnitTest.java b/algorithms-sorting/src/test/java/com/baeldung/algorithms/stringsort/AnagramValidatorUnitTest.java
similarity index 86%
rename from java-strings/src/test/java/com/baeldung/string/sorting/AnagramValidatorUnitTest.java
rename to algorithms-sorting/src/test/java/com/baeldung/algorithms/stringsort/AnagramValidatorUnitTest.java
index 07d31c7187..25fc274dd8 100644
--- a/java-strings/src/test/java/com/baeldung/string/sorting/AnagramValidatorUnitTest.java
+++ b/algorithms-sorting/src/test/java/com/baeldung/algorithms/stringsort/AnagramValidatorUnitTest.java
@@ -1,12 +1,10 @@
-package com.baeldung.string.sorting;
+package com.baeldung.algorithms.stringsort;
 
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
 import org.junit.jupiter.api.Test;
 
-import com.baeldung.string.sorting.AnagramValidator;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class AnagramValidatorUnitTest {
     
diff --git a/java-strings/src/test/java/com/baeldung/string/sorting/SortStringUnitTest.java b/algorithms-sorting/src/test/java/com/baeldung/algorithms/stringsort/SortStringUnitTest.java
similarity index 94%
rename from java-strings/src/test/java/com/baeldung/string/sorting/SortStringUnitTest.java
rename to algorithms-sorting/src/test/java/com/baeldung/algorithms/stringsort/SortStringUnitTest.java
index 90d1dad554..226de64f07 100644
--- a/java-strings/src/test/java/com/baeldung/string/sorting/SortStringUnitTest.java
+++ b/algorithms-sorting/src/test/java/com/baeldung/algorithms/stringsort/SortStringUnitTest.java
@@ -1,9 +1,9 @@
-package com.baeldung.string.sorting;
-
-import java.util.Arrays;
+package com.baeldung.algorithms.stringsort;
 
 import org.junit.jupiter.api.Test;
 
+import java.util.Arrays;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 class SortStringUnitTest {
diff --git a/animal-sniffer-mvn-plugin/pom.xml b/animal-sniffer-mvn-plugin/pom.xml
index 55e37e2ec4..fd8f6d3d8c 100644
--- a/animal-sniffer-mvn-plugin/pom.xml
+++ b/animal-sniffer-mvn-plugin/pom.xml
@@ -1,7 +1,6 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
     <artifactId>animal-sniffer-mvn-plugin</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>animal-sniffer-mvn-plugin</name>
diff --git a/apache-avro/pom.xml b/apache-avro/pom.xml
index e6fb4d24ff..6baae9c541 100644
--- a/apache-avro/pom.xml
+++ b/apache-avro/pom.xml
@@ -14,12 +14,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
@@ -46,15 +40,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler-plugin.version}</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.avro</groupId>
                 <artifactId>avro-maven-plugin</artifactId>
@@ -79,8 +64,6 @@
     </build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <compiler-plugin.version>3.5</compiler-plugin.version>
         <avro.version>1.8.2</avro.version>
         <slf4j.version>1.7.25</slf4j.version>
     </properties>
diff --git a/apache-fop/pom.xml b/apache-fop/pom.xml
index 879eb4f111..150756d51d 100644
--- a/apache-fop/pom.xml
+++ b/apache-fop/pom.xml
@@ -1,7 +1,6 @@
 <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>apache-fop</artifactId>
     <version>0.1-SNAPSHOT</version>
     <name>apache-fop</name>
diff --git a/apache-geode/pom.xml b/apache-geode/pom.xml
index 15c7e04d29..195dfadd20 100644
--- a/apache-geode/pom.xml
+++ b/apache-geode/pom.xml
@@ -19,25 +19,7 @@
             <artifactId>geode-core</artifactId>
             <version>${geode.core}</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-        </dependency>
     </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 	
     <properties>
         <geode.core>1.6.0</geode.core>
diff --git a/apache-meecrowave/pom.xml b/apache-meecrowave/pom.xml
index 4eb1094f94..51c6514992 100644
--- a/apache-meecrowave/pom.xml
+++ b/apache-meecrowave/pom.xml
@@ -1,7 +1,6 @@
 <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>apache-meecrowave</artifactId>
     <version>0.0.1</version>
     <name>apache-meecrowave</name>
@@ -38,13 +37,6 @@
             <version>${meecrowave-junit.version}</version>
             <scope>test</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/junit/junit -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 	
     <build>
diff --git a/apache-olingo/olingo2/pom.xml b/apache-olingo/olingo2/pom.xml
index 727e6ca484..95b123efbc 100644
--- a/apache-olingo/olingo2/pom.xml
+++ b/apache-olingo/olingo2/pom.xml
@@ -5,7 +5,6 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.baeldung.examples.olingo2</groupId>
 	<artifactId>olingo2</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
 	<name>olingo2</name>
 	<description>Sample Olingo 2 Project</description>
 
diff --git a/apache-pulsar/pom.xml b/apache-pulsar/pom.xml
index 8a0882dae1..fdd9ae1e95 100644
--- a/apache-pulsar/pom.xml
+++ b/apache-pulsar/pom.xml
@@ -24,8 +24,6 @@
     </dependencies>
 	
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-		<pulsar-client.version>2.1.1-incubating</pulsar-client.version>
+ 		<pulsar-client.version>2.1.1-incubating</pulsar-client.version>
     </properties>
 </project>
diff --git a/apache-shiro/README.md b/apache-shiro/README.md
index 553eeecc69..ed63c569da 100644
--- a/apache-shiro/README.md
+++ b/apache-shiro/README.md
@@ -4,4 +4,6 @@ This module contains articles about Apache Shiro
 
 ### Relevant articles:
 
-- [Introduction to Apache Shiro](https://www.baeldung.com/apache-shiro)
\ No newline at end of file
+- [Introduction to Apache Shiro](https://www.baeldung.com/apache-shiro)
+- [Permissions-Based Access Control with Apache Shiro](https://www.baeldung.com/apache-shiro-access-control)
+
diff --git a/apache-solrj/pom.xml b/apache-solrj/pom.xml
index 1227fdca46..b19ceb1e48 100644
--- a/apache-solrj/pom.xml
+++ b/apache-solrj/pom.xml
@@ -1,7 +1,6 @@
 <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>apache-solrj</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>apache-solrj</name>
diff --git a/apache-spark/README.md b/apache-spark/README.md
index 360a18f095..52313d66bf 100644
--- a/apache-spark/README.md
+++ b/apache-spark/README.md
@@ -6,3 +6,5 @@ This module contains articles about Apache Spark
 
 - [Introduction to Apache Spark](https://www.baeldung.com/apache-spark)
 - [Building a Data Pipeline with Kafka, Spark Streaming and Cassandra](https://www.baeldung.com/kafka-spark-data-pipeline)
+- [Machine Learning with Spark MLlib](https://www.baeldung.com/spark-mlib-machine-learning)
+
diff --git a/apache-spark/pom.xml b/apache-spark/pom.xml
index 3df81e5aee..41fd51d9fd 100644
--- a/apache-spark/pom.xml
+++ b/apache-spark/pom.xml
@@ -2,7 +2,6 @@
 	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>apache-spark</artifactId>
 	<version>1.0-SNAPSHOT</version>
 	<name>apache-spark</name>
@@ -59,15 +58,6 @@
 
 	<build>
 		<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>
-				</configuration>
-			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
@@ -95,7 +85,6 @@
 		<org.apache.spark.spark-streaming-kafka.version>2.3.0</org.apache.spark.spark-streaming-kafka.version>
 		<com.datastax.spark.spark-cassandra-connector.version>2.3.0</com.datastax.spark.spark-cassandra-connector.version>
 		<com.datastax.spark.spark-cassandra-connector-java.version>1.5.2</com.datastax.spark.spark-cassandra-connector-java.version>
-		<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
 	</properties>
 
 </project>
diff --git a/apache-velocity/pom.xml b/apache-velocity/pom.xml
index 24ab0b861d..b370b11cc1 100644
--- a/apache-velocity/pom.xml
+++ b/apache-velocity/pom.xml
@@ -1,7 +1,6 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
     <version>0.1-SNAPSHOT</version>
     <artifactId>apache-velocity</artifactId>
     <name>apache-velocity</name>
diff --git a/aws-lambda/pom.xml b/aws-lambda/pom.xml
index c799718e61..1f3c31f87c 100644
--- a/aws-lambda/pom.xml
+++ b/aws-lambda/pom.xml
@@ -2,7 +2,6 @@
 <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>aws-lambda</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>aws-lambda</name>
@@ -88,7 +87,6 @@
     
     <properties>
         <json-simple.version>1.1.1</json-simple.version>
-        <org.json.version>20180130</org.json.version>
         <commons-io.version>2.5</commons-io.version>
         <aws-lambda-java-events.version>1.3.0</aws-lambda-java-events.version>
         <aws-lambda-java-core.version>1.2.0</aws-lambda-java-core.version>
diff --git a/aws/pom.xml b/aws/pom.xml
index 75d5aac1eb..45a30f96ba 100644
--- a/aws/pom.xml
+++ b/aws/pom.xml
@@ -1,7 +1,6 @@
 <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>aws</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>aws</name>
diff --git a/axon/pom.xml b/axon/pom.xml
index 3d30cceb83..21e21f0ef2 100644
--- a/axon/pom.xml
+++ b/axon/pom.xml
@@ -30,7 +30,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
-            <version>${spring-boot.version}</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/azure/pom.xml b/azure/pom.xml
index 270b3e4829..3d9c296748 100644
--- a/azure/pom.xml
+++ b/azure/pom.xml
@@ -2,7 +2,6 @@
 <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>azure</artifactId>
     <version>0.1</version>
     <name>azure</name>
diff --git a/blade/pom.xml b/blade/pom.xml
index 37615bed01..6f8a78852d 100644
--- a/blade/pom.xml
+++ b/blade/pom.xml
@@ -3,19 +3,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <!-- WITH THIS mvn integration-test DOES WORK -->
-    <groupId>com.baeldung</groupId>
     <artifactId>blade</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <name>blade</name>
 
-
-    <!-- WITH THIS mvn integration-test DOESN'T WORK -->
-    <!-- <parent> -->
-    <!-- <groupId>com.baeldung</groupId> -->
-    <!-- <artifactId>parent-modules</artifactId> -->
-    <!-- <version>1.0.0-SNAPSHOT</version> -->
-    <!-- </parent> -->
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-modules</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
 
     <dependencies>
         <dependency>
@@ -45,12 +40,6 @@
         </dependency>
 
         <!-- TEST -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -79,20 +68,6 @@
     <build>
         <finalName>sample-blade-app</finalName>
         <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <forkCount>3</forkCount>
-                    <reuseForks>true</reuseForks>
-                    <excludes>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
@@ -172,34 +147,19 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 	
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
 		<blade-mvc.version>2.0.14.RELEASE</blade-mvc.version>
 		<bootstrap.version>4.2.1</bootstrap.version>
 		<commons-lang3.version>3.8.1</commons-lang3.version>
 		<lombok.version>1.18.4</lombok.version>
-		<junit.version>4.12</junit.version>
 		<httpclient.version>4.5.6</httpclient.version>
 		<httpmime.version>4.5.6</httpmime.version>
 		<httpcore.version>4.4.10</httpcore.version>
 		<assertj-core.version>3.11.1</assertj-core.version>
 		<maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
 		<process-exec-maven-plugin.version>0.7</process-exec-maven-plugin.version>
-		<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
-		<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     </properties>
 </project>
diff --git a/bootique/pom.xml b/bootique/pom.xml
index 4dd9ba4833..7601321b99 100644
--- a/bootique/pom.xml
+++ b/bootique/pom.xml
@@ -42,12 +42,6 @@
             <artifactId>bootique-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/cas/cas-server/pom.xml b/cas/cas-server/pom.xml
index 98f5f10493..8a1e602114 100644
--- a/cas/cas-server/pom.xml
+++ b/cas/cas-server/pom.xml
@@ -198,7 +198,6 @@
 
         <wrapper-maven-plugin.version>0.0.4</wrapper-maven-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
         
         <echo-maven-plugin.version>0.3.0</echo-maven-plugin.version>
         <pgpverify-maven-plugin.version>1.1.0</pgpverify-maven-plugin.version>
diff --git a/cdi/pom.xml b/cdi/pom.xml
index c98ad57495..809622a5db 100644
--- a/cdi/pom.xml
+++ b/cdi/pom.xml
@@ -36,12 +36,6 @@
             <version>${assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
diff --git a/checker-plugin/pom.xml b/checker-plugin/pom.xml
index 08408366a4..63def4dbdc 100644
--- a/checker-plugin/pom.xml
+++ b/checker-plugin/pom.xml
@@ -1,7 +1,6 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
     <artifactId>checker-plugin</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>checker-plugin</name>
diff --git a/cloud-foundry-uaa/cf-uaa-oauth2-client/pom.xml b/cloud-foundry-uaa/cf-uaa-oauth2-client/pom.xml
index c6de00dbe9..fe1b919905 100644
--- a/cloud-foundry-uaa/cf-uaa-oauth2-client/pom.xml
+++ b/cloud-foundry-uaa/cf-uaa-oauth2-client/pom.xml
@@ -4,7 +4,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.example</groupId>
     <artifactId>cf-uaa-oauth2-client</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>uaa-client-webapp</name>
     <description>Demo project for Spring Boot</description>
 
diff --git a/cloud-foundry-uaa/cf-uaa-oauth2-resource-server/pom.xml b/cloud-foundry-uaa/cf-uaa-oauth2-resource-server/pom.xml
index 56fb23e9d8..7cd47bb7b3 100644
--- a/cloud-foundry-uaa/cf-uaa-oauth2-resource-server/pom.xml
+++ b/cloud-foundry-uaa/cf-uaa-oauth2-resource-server/pom.xml
@@ -4,7 +4,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.cfuaa</groupId>
     <artifactId>cf-uaa-oauth2-resource-server</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>cf-uaa-oauth2-resource-server</name>
     <description>Demo project for Spring Boot</description>
 
diff --git a/code-generation/pom.xml b/code-generation/pom.xml
index 7aefc1b5b3..b52e558b53 100644
--- a/code-generation/pom.xml
+++ b/code-generation/pom.xml
@@ -1,7 +1,6 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
     <artifactId>code-generation</artifactId>
     <version>1.0</version>
     <name>code-generation</name>
diff --git a/core-groovy-2/README.md b/core-groovy-2/README.md
index 6359592da6..f1984f18f4 100644
--- a/core-groovy-2/README.md
+++ b/core-groovy-2/README.md
@@ -11,4 +11,5 @@ This module contains articles about core Groovy concepts
 - [Integrating Groovy into Java Applications](https://www.baeldung.com/groovy-java-applications)
 - [Concatenate Strings with Groovy](https://www.baeldung.com/groovy-concatenate-strings)
 - [Metaprogramming in Groovy](https://www.baeldung.com/groovy-metaprogramming)
-- [[<-- Prev]](/core-groovy)
\ No newline at end of file
+- [A Quick Guide to Working with Web Services in Groovy](https://www.baeldung.com/groovy-web-services)
+- [[<-- Prev]](/core-groovy)
diff --git a/core-groovy-2/pom.xml b/core-groovy-2/pom.xml
index 91e31d4cba..08526bac9a 100644
--- a/core-groovy-2/pom.xml
+++ b/core-groovy-2/pom.xml
@@ -181,10 +181,8 @@
         <hsqldb.version>2.4.0</hsqldb.version>
         <spock-core.version>1.1-groovy-2.4</spock-core.version>
         <groovy-wslite.version>1.1.3</groovy-wslite.version>        
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <logback.version>1.2.3</logback.version>
         <groovy.version>2.5.7</groovy.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 </project>
 
diff --git a/core-groovy/pom.xml b/core-groovy/pom.xml
index 029e5460ab..80d6f8d2d5 100644
--- a/core-groovy/pom.xml
+++ b/core-groovy/pom.xml
@@ -109,9 +109,6 @@
 
     <properties>
         <junit.platform.version>1.0.0</junit.platform.version>
-<!--         <groovy.version>2.4.13</groovy.version> -->
-<!--         <groovy-all.version>2.4.13</groovy-all.version> -->
-<!--         <groovy-sql.version>2.4.13</groovy-sql.version> -->
         <groovy.version>2.5.6</groovy.version>
         <groovy-all.version>2.5.6</groovy-all.version>
         <groovy-sql.version>2.5.6</groovy-sql.version>
diff --git a/core-java-modules/core-java-8-2/pom.xml b/core-java-modules/core-java-8-2/pom.xml
index 07bb3b7543..269631e0dd 100644
--- a/core-java-modules/core-java-8-2/pom.xml
+++ b/core-java-modules/core-java-8-2/pom.xml
@@ -3,7 +3,6 @@
     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-8-2</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-8-2</name>
@@ -30,24 +29,7 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <icu.version>64.2</icu.version>
         <assertj.version>3.12.2</assertj.version>
     </properties>
diff --git a/core-java-modules/core-java-8/pom.xml b/core-java-modules/core-java-8/pom.xml
index 9ef3cd1201..074359ae54 100644
--- a/core-java-modules/core-java-8/pom.xml
+++ b/core-java-modules/core-java-8/pom.xml
@@ -1,7 +1,6 @@
 <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-8</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-8</name>
@@ -20,31 +19,11 @@
             <artifactId>commons-collections4</artifactId>
             <version>${commons-collections4.version}</version>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
-            <version>${commons-math3.version}</version>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>${log4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>${commons-codec.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -58,64 +37,6 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.jayway.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${avaitility.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>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-bytecode</artifactId>
-            <version>${jmh-generator.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.codepoetics</groupId>
-            <artifactId>protonpack</artifactId>
-            <version>${protonpack.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.vavr</groupId>
-            <artifactId>vavr</artifactId>
-            <version>${vavr.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${joda.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>${asspectj.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-            <version>${asspectj.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>${powermock.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <version>${powermock.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -149,22 +70,10 @@
 
     <properties>
         <!-- util -->
-        <commons-math3.version>3.6.1</commons-math3.version>
         <commons-collections4.version>4.1</commons-collections4.version>
-        <collections-generic.version>4.01</collections-generic.version>
-        <commons-codec.version>1.10</commons-codec.version>
-        <vavr.version>0.9.0</vavr.version>
-        <protonpack.version>1.13</protonpack.version>
-        <joda.version>2.10</joda.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <asspectj.version>1.8.9</asspectj.version>
-        <powermock.version>2.0.0-RC.4</powermock.version>
-        <avaitility.version>1.7.0</avaitility.version>
-        <jmh-core.version>1.19</jmh-core.version>
-        <jmh-generator.version>1.19</jmh-generator.version>
-        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
         <!-- plugins -->
-        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
+        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
     </properties>
 </project>
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/Tuple.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/Tuple.java
index 7a9f62341e..82a84bb2d6 100644
--- a/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/Tuple.java
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/Tuple.java
@@ -1,12 +1,12 @@
 package com.baeldung.java_8_features.groupingby;
 
-public class Tuple {
+import java.util.Objects;
+
+public class Tuple {
+    private final BlogPostType type;
+    private final String author;
 
-    private BlogPostType type;
-    private String author;
-    
     public Tuple(BlogPostType type, String author) {
-        super();
         this.type = type;
         this.author = author;
     }
@@ -15,20 +15,27 @@ public class Tuple {
         return type;
     }
 
-    public void setType(BlogPostType type) {
-        this.type = type;
-    }
-
     public String getAuthor() {
         return author;
     }
 
-    public void setAuthor(String author) {
-        this.author = author;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        Tuple tuple = (Tuple) o;
+        return type == tuple.type && author.equals(tuple.author);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(type, author);
     }
 
     @Override
     public String toString() {
-        return "Tuple [type=" + type + ", author=" + author + ", getType()=" + getType() + ", getAuthor()=" + getAuthor() + ", getClass()=" + getClass() + ", hashCode()=" + hashCode() + ", toString()=" + super.toString() + "]";
+        return "Tuple{" + "type=" + type + ", author='" + author + '\'' + '}';
     }
 }
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/java_8_features/groupingby/Java8GroupingByCollectorUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java_8_features/groupingby/Java8GroupingByCollectorUnitTest.java
index 323586b85f..1da705294e 100644
--- a/core-java-modules/core-java-8/src/test/java/com/baeldung/java_8_features/groupingby/Java8GroupingByCollectorUnitTest.java
+++ b/core-java-modules/core-java-8/src/test/java/com/baeldung/java_8_features/groupingby/Java8GroupingByCollectorUnitTest.java
@@ -1,15 +1,32 @@
 package com.baeldung.java_8_features.groupingby;
 
-import com.baeldung.java_8_features.groupingby.BlogPost;
-import com.baeldung.java_8_features.groupingby.BlogPostType;
-import org.junit.Test;
+import static java.util.Comparator.comparingInt;
+import static java.util.stream.Collectors.averagingInt;
+import static java.util.stream.Collectors.counting;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.groupingByConcurrent;
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.mapping;
+import static java.util.stream.Collectors.maxBy;
+import static java.util.stream.Collectors.summarizingInt;
+import static java.util.stream.Collectors.summingInt;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toSet;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.EnumMap;
+import java.util.IntSummaryStatistics;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 
-import static java.util.Comparator.comparingInt;
-import static java.util.stream.Collectors.*;
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 public class Java8GroupingByCollectorUnitTest {
 
@@ -180,4 +197,19 @@ public class Java8GroupingByCollectorUnitTest {
         assertEquals(15, newsLikeStatistics.getMin());
     }
 
+    @Test
+    public void givenAListOfPosts_whenGroupedByComplexMapKeyType_thenGetAMapBetweenTupleAndList() {
+        Map<Tuple, List<BlogPost>> postsPerTypeAndAuthor = posts.stream()
+            .collect(groupingBy(post -> new Tuple(post.getType(), post.getAuthor())));
+
+        List<BlogPost> result = postsPerTypeAndAuthor.get(new Tuple(BlogPostType.GUIDE, "Author 1"));
+
+        assertThat(result.size()).isEqualTo(1);
+
+        BlogPost blogPost = result.get(0);
+
+        assertThat(blogPost.getTitle()).isEqualTo("Programming guide");
+        assertThat(blogPost.getType()).isEqualTo(BlogPostType.GUIDE);
+        assertThat(blogPost.getAuthor()).isEqualTo("Author 1");
+    }
 }
diff --git a/core-java-modules/core-java-annotations/pom.xml b/core-java-modules/core-java-annotations/pom.xml
index 7d7d7d4f7e..92b5afbd47 100644
--- a/core-java-modules/core-java-annotations/pom.xml
+++ b/core-java-modules/core-java-annotations/pom.xml
@@ -1,7 +1,6 @@
 <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-annotations</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-annotations</name>
@@ -14,42 +13,6 @@
         <relativePath>../../parent-java</relativePath>
     </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </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>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-bytecode</artifactId>
-            <version>${jmh-generator.version}</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <finalName>core-java-annotations</finalName>
         <resources>
@@ -60,13 +23,4 @@
         </resources>
     </build>
 
-    <properties>
-        <!-- testing -->
-        <assertj.version>3.6.1</assertj.version>
-        <asspectj.version>1.8.9</asspectj.version>
-        <jmh-core.version>1.19</jmh-core.version>
-        <jmh-generator.version>1.19</jmh-generator.version>
-        <!-- plugins -->
-        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
-    </properties>
 </project>
diff --git a/core-java-modules/core-java-arrays-2/pom.xml b/core-java-modules/core-java-arrays-2/pom.xml
index bfe8a349e1..a1da169f2f 100644
--- a/core-java-modules/core-java-arrays-2/pom.xml
+++ b/core-java-modules/core-java-arrays-2/pom.xml
@@ -1,7 +1,6 @@
 <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-arrays-2</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-arrays-2</name>
diff --git a/core-java-modules/core-java-arrays-2/src/main/java/com/baeldung/array/operations/ArrayOperations.java b/core-java-modules/core-java-arrays-2/src/main/java/com/baeldung/array/operations/ArrayOperations.java
index 94a00f7aba..4513dbf899 100644
--- a/core-java-modules/core-java-arrays-2/src/main/java/com/baeldung/array/operations/ArrayOperations.java
+++ b/core-java-modules/core-java-arrays-2/src/main/java/com/baeldung/array/operations/ArrayOperations.java
@@ -192,15 +192,48 @@ public class ArrayOperations {
         return array[new Random().nextInt(array.length)];
     }
 
-    public static Integer[] intersectionSimple(final Integer[] a, final Integer[] b){
-        return Stream.of(a).filter(Arrays.asList(b)::contains).toArray(Integer[]::new);
+    public static Integer[] intersectionSimple(final Integer[] a, final Integer[] b) {
+        return Stream.of(a)
+            .filter(Arrays.asList(b)::contains)
+            .toArray(Integer[]::new);
     }
 
-    public static Integer[] intersectionSet(final Integer[] a, final Integer[] b){
-        return Stream.of(a).filter(Arrays.asList(b)::contains).distinct().toArray(Integer[]::new);
+    public static Integer[] intersectionSet(final Integer[] a, final Integer[] b) {
+        return Stream.of(a)
+            .filter(Arrays.asList(b)::contains)
+            .distinct()
+            .toArray(Integer[]::new);
     }
 
-    public static Integer[] intersectionMultiSet(final Integer[] a, final Integer[] b){
-        return Stream.of(a).filter(new LinkedList<>(Arrays.asList(b))::remove).toArray(Integer[]::new);
+    public static Integer[] intersectionMultiSet(final Integer[] a, final Integer[] b) {
+        return Stream.of(a)
+            .filter(new LinkedList<>(Arrays.asList(b))::remove)
+            .toArray(Integer[]::new);
+    }
+
+    public static Integer[] addElementUsingPureJava(Integer[] srcArray, int elementToAdd) {
+        Integer[] destArray = new Integer[srcArray.length + 1];
+
+        for (int i = 0; i < srcArray.length; i++) {
+            destArray[i] = srcArray[i];
+        }
+
+        destArray[destArray.length - 1] = elementToAdd;
+        return destArray;
+    }
+
+    public static int[] insertAnElementAtAGivenIndex(final int[] srcArray, int index, int newElement) {
+        int[] destArray = new int[srcArray.length + 1];
+        int j = 0;
+        for (int i = 0; i < destArray.length - 1; i++) {
+
+            if (i == index) {
+                destArray[i] = newElement;
+            } else {
+                destArray[i] = srcArray[j];
+                j++;
+            }
+        }
+        return destArray;
     }
 }
diff --git a/core-java-modules/core-java-arrays-2/src/main/java/com/baeldung/arraylist/operations/ArrayListOperations.java b/core-java-modules/core-java-arrays-2/src/main/java/com/baeldung/arraylist/operations/ArrayListOperations.java
new file mode 100644
index 0000000000..b2aed553da
--- /dev/null
+++ b/core-java-modules/core-java-arrays-2/src/main/java/com/baeldung/arraylist/operations/ArrayListOperations.java
@@ -0,0 +1,23 @@
+package com.baeldung.arraylist.operations;
+
+import java.util.ArrayList;
+
+public class ArrayListOperations {
+
+    public static Integer getAnIntegerElement(ArrayList<Integer> anArrayList, int index) {
+        return anArrayList.get(index);
+    }
+
+    public static void modifyAnIntegerElement(ArrayList<Integer> anArrayList, int index, Integer newElement) {
+        anArrayList.set(index, newElement);
+    }
+
+    public static void appendAnIntegerElement(ArrayList<Integer> anArrayList, Integer newElement) {
+        anArrayList.add(newElement);
+    }
+
+    public static void insertAnIntegerElementAtIndex(ArrayList<Integer> anArrayList, int index, Integer newElement) {
+        anArrayList.add(index, newElement);
+    }
+
+}
diff --git a/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/array/operations/ArrayOperationsUnitTest.java b/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/array/operations/ArrayOperationsUnitTest.java
index d72681ca05..ea9bf2c5a9 100644
--- a/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/array/operations/ArrayOperationsUnitTest.java
+++ b/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/array/operations/ArrayOperationsUnitTest.java
@@ -1,12 +1,11 @@
 package com.baeldung.array.operations;
 
+import java.util.Arrays;
 import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
-import java.util.Arrays;
-
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertArrayEquals;
 
 public class ArrayOperationsUnitTest {
 
@@ -262,8 +261,7 @@ public class ArrayOperationsUnitTest {
 
     @Test
     public void whenMapIntArrayToString_thenReturnArray() {
-        String[] expectedArray = new String[] { "Value: 3", "Value: 5", "Value: 2", "Value: 5", "Value: 14",
-                "Value: 4" };
+        String[] expectedArray = new String[] { "Value: 3", "Value: 5", "Value: 2", "Value: 5", "Value: 14", "Value: 4" };
         String[] output = ArrayOperations.mapIntArrayToString(defaultIntArray);
 
         assertThat(output).containsExactly(expectedArray);
@@ -313,13 +311,10 @@ public class ArrayOperationsUnitTest {
         int[] output5 = ArrayOperations.shuffleIntArray(defaultIntArray);
         int[] output6 = ArrayOperations.shuffleIntArray(defaultIntArray);
 
-        Condition<int[]> atLeastOneArraysIsNotEqual = new Condition<int[]>(
-            "at least one output should be different (order-wise)") {
+        Condition<int[]> atLeastOneArraysIsNotEqual = new Condition<int[]>("at least one output should be different (order-wise)") {
             @Override
             public boolean matches(int[] value) {
-                return !Arrays.equals(value, output) || !Arrays.equals(value, output2) || !Arrays.equals(value, output3)
-                    || !Arrays.equals(value, output4) || !Arrays.equals(value, output5)
-                    || !Arrays.equals(value, output6);
+                return !Arrays.equals(value, output) || !Arrays.equals(value, output2) || !Arrays.equals(value, output3) || !Arrays.equals(value, output4) || !Arrays.equals(value, output5) || !Arrays.equals(value, output6);
             }
         };
 
@@ -335,13 +330,10 @@ public class ArrayOperationsUnitTest {
         Integer[] output5 = ArrayOperations.shuffleObjectArray(defaultObjectArray);
         Integer[] output6 = ArrayOperations.shuffleObjectArray(defaultObjectArray);
 
-        Condition<Integer[]> atLeastOneArraysIsNotEqual = new Condition<Integer[]>(
-            "at least one output should be different (order-wise)") {
+        Condition<Integer[]> atLeastOneArraysIsNotEqual = new Condition<Integer[]>("at least one output should be different (order-wise)") {
             @Override
             public boolean matches(Integer[] value) {
-                return !Arrays.equals(value, output) || !Arrays.equals(value, output2) || !Arrays.equals(value, output3)
-                    || !Arrays.equals(value, output4) || !Arrays.equals(value, output5)
-                    || !Arrays.equals(value, output6);
+                return !Arrays.equals(value, output) || !Arrays.equals(value, output2) || !Arrays.equals(value, output3) || !Arrays.equals(value, output4) || !Arrays.equals(value, output5) || !Arrays.equals(value, output6);
             }
         };
 
@@ -362,4 +354,27 @@ public class ArrayOperationsUnitTest {
 
         assertThat(defaultObjectArray).contains(output);
     }
+
+    @Test
+    public void givenSourceArrayAndElement_whenAddElementUsingPureJavaIsInvoked_thenNewElementMustBeAdded() {
+        Integer[] sourceArray = { 1, 2, 3, 4 };
+        int elementToAdd = 5;
+
+        Integer[] destArray = ArrayOperations.addElementUsingPureJava(sourceArray, elementToAdd);
+
+        Integer[] expectedArray = { 1, 2, 3, 4, 5 };
+        assertArrayEquals(expectedArray, destArray);
+    }
+
+    @Test
+    public void whenInsertAnElementAtAGivenIndexCalled_thenShiftTheFollowingElementsAndInsertTheElementInArray() {
+        int[] expectedArray = { 1, 4, 2, 3, 0 };
+        int[] anArray = new int[4];
+        anArray[0] = 1;
+        anArray[1] = 2;
+        anArray[2] = 3;
+        int[] outputArray = ArrayOperations.insertAnElementAtAGivenIndex(anArray, 1, 4);
+
+        assertThat(outputArray).containsExactly(expectedArray);
+    }
 }
diff --git a/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/arraylist/operations/ArrayListOperationsUnitTest.java b/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/arraylist/operations/ArrayListOperationsUnitTest.java
new file mode 100644
index 0000000000..1ec7645d8f
--- /dev/null
+++ b/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/arraylist/operations/ArrayListOperationsUnitTest.java
@@ -0,0 +1,50 @@
+package com.baeldung.arraylist.operations;
+
+import java.util.ArrayList;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ArrayListOperationsUnitTest {
+
+    private ArrayList<Integer> anArrayList;
+
+    @BeforeEach
+    public void setupDefaults() {
+        anArrayList = new ArrayList<>();
+        anArrayList.add(2);
+        anArrayList.add(3);
+        anArrayList.add(4);
+    }
+
+    @Test
+    public void whenGetAnIntegerElementCalled_thenReturnTheIntegerElement() {
+        Integer output = ArrayListOperations.getAnIntegerElement(anArrayList, 1);
+
+        assertThat(output).isEqualTo(3);
+    }
+
+    @Test
+    public void whenModifyAnIntegerElementCalled_thenModifyTheIntegerElement() {
+        ArrayListOperations.modifyAnIntegerElement(anArrayList, 2, 5);
+        Integer output = ArrayListOperations.getAnIntegerElement(anArrayList, 2);
+
+        assertThat(output).isEqualTo(5);
+    }
+
+    @Test
+    public void whenAppendAnIntegerElementCalled_thenTheIntegerElementIsAppendedToArrayList() {
+        ArrayListOperations.appendAnIntegerElement(anArrayList, 6);
+        Integer output = ArrayListOperations.getAnIntegerElement(anArrayList, anArrayList.size() - 1);
+
+        assertThat(output).isEqualTo(6);
+    }
+
+    @Test
+    public void whenInsertAnIntegerAtIndexCalled_thenTheIntegerElementIsInseredToArrayList() {
+        ArrayListOperations.insertAnIntegerElementAtIndex(anArrayList, 1, 10);
+        Integer output = ArrayListOperations.getAnIntegerElement(anArrayList, 1);
+
+        assertThat(output).isEqualTo(10);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-arrays/pom.xml b/core-java-modules/core-java-arrays/pom.xml
index 23db608abc..ca4e262ff9 100644
--- a/core-java-modules/core-java-arrays/pom.xml
+++ b/core-java-modules/core-java-arrays/pom.xml
@@ -1,7 +1,6 @@
 <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-arrays</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-arrays</name>
@@ -20,16 +19,6 @@
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>
@@ -47,11 +36,6 @@
             <artifactId>jmh-generator-annprocess</artifactId>
             <version>${jmh-generator-annprocess.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${springframework.spring-web.version}</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -64,21 +48,6 @@
         </resources>
 
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/*LiveTest.java</exclude>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*IntTest.java</exclude>
-                        <exclude>**/*LongRunningUnitTest.java</exclude>
-                        <exclude>**/*ManualTest.java</exclude>
-                    </excludes>
-                    <testFailureIgnore>true</testFailureIgnore>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -398,8 +367,6 @@
         <assertj-core.version>3.10.0</assertj-core.version>
 
         <!-- maven and spring plugins -->
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
-        <springframework.spring-web.version>4.3.4.RELEASE</springframework.spring-web.version>
         <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
         <onejar-maven-plugin.version>1.4.4</onejar-maven-plugin.version>
diff --git a/core-java-modules/core-java-collections-2/pom.xml b/core-java-modules/core-java-collections-2/pom.xml
index 0ac53ec180..217c1d9258 100644
--- a/core-java-modules/core-java-collections-2/pom.xml
+++ b/core-java-modules/core-java-collections-2/pom.xml
@@ -2,7 +2,6 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>core-java-collections-2</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>core-java-collections-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-array-list/README.md b/core-java-modules/core-java-collections-array-list/README.md
index 4423a77c78..302ea82130 100644
--- a/core-java-modules/core-java-collections-array-list/README.md
+++ b/core-java-modules/core-java-collections-array-list/README.md
@@ -7,4 +7,6 @@ This module contains articles about the Java ArrayList collection
 - [Guide to the Java ArrayList](http://www.baeldung.com/java-arraylist)
 - [Add Multiple Items to an Java ArrayList](http://www.baeldung.com/java-add-items-array-list)
 - [ClassCastException: Arrays$ArrayList cannot be cast to ArrayList](https://www.baeldung.com/java-classcastexception-arrays-arraylist)
-- [Multi Dimensional ArrayList in Java](https://www.baeldung.com/java-multi-dimensional-arraylist)
\ No newline at end of file
+- [Multi Dimensional ArrayList in Java](https://www.baeldung.com/java-multi-dimensional-arraylist)
+- [Removing an Element From an ArrayList](https://www.baeldung.com/java-arraylist-remove-element)
+
diff --git a/core-java-modules/core-java-collections-array-list/pom.xml b/core-java-modules/core-java-collections-array-list/pom.xml
index 95a5f3ea36..249103152a 100644
--- a/core-java-modules/core-java-collections-array-list/pom.xml
+++ b/core-java-modules/core-java-collections-array-list/pom.xml
@@ -19,28 +19,16 @@
             <artifactId>commons-collections4</artifactId>
             <version>${commons-collections4.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <properties>
         <commons-collections4.version>4.1</commons-collections4.version>
-        <commons-lang3.version>3.8.1</commons-lang3.version>
         <assertj.version>3.11.1</assertj.version>
     </properties>
 </project>
diff --git a/core-java-modules/core-java-collections-list-2/pom.xml b/core-java-modules/core-java-collections-list-2/pom.xml
index 727de0818a..9652a7d79f 100644
--- a/core-java-modules/core-java-collections-list-2/pom.xml
+++ b/core-java-modules/core-java-collections-list-2/pom.xml
@@ -19,11 +19,6 @@
             <artifactId>commons-collections4</artifactId>
             <version>${commons-collections4.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -39,8 +34,7 @@
     </dependencies>
 
     <properties>
-        <commons-collections4.version>4.1</commons-collections4.version>
-        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <commons-collections4.version>4.1</commons-collections4.version>    
         <assertj.version>3.11.1</assertj.version>
     </properties>
 </project>
diff --git a/core-java-modules/core-java-collections-list-2/src/main/java/com/baeldung/findastring/FindAStringInGivenList.java b/core-java-modules/core-java-collections-list-2/src/main/java/com/baeldung/findastring/FindAStringInGivenList.java
new file mode 100644
index 0000000000..67c62fe009
--- /dev/null
+++ b/core-java-modules/core-java-collections-list-2/src/main/java/com/baeldung/findastring/FindAStringInGivenList.java
@@ -0,0 +1,72 @@
+package com.baeldung.findastring;
+
+import com.google.common.base.Predicates;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import org.apache.commons.collections4.IterableUtils;
+import org.apache.commons.collections4.IteratorUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+public class FindAStringInGivenList {
+
+
+    public List<String> findUsingLoopWithRegex(String search, List<String> list) {
+
+        List<String> matches = new ArrayList<String>();
+
+        String pattern = ".*"+search+".*";
+        Pattern p = Pattern.compile(pattern);
+
+        for(String str: list) {
+            if (p.matcher(str).matches()) {
+                matches.add(str);
+            }
+        }
+
+        return matches;
+    }
+
+
+    public List<String> findUsingLoop(String search, List<String> list) {
+
+        List<String> matches = new ArrayList<String>();
+
+        for(String str: list) {
+            if (str.contains(search)) {
+                matches.add(str);
+            }
+        }
+
+        return matches;
+    }
+
+    public List<String> findUsingStream(String search, List<String> list) {
+
+        List<String> matchingElements =
+                list.stream()
+                        .filter(str -> str.trim().contains(search))
+                        .collect(Collectors.toList());
+
+        return matchingElements;
+    }
+
+    public List<String> findUsingGuava(String search, List<String> list) {
+        Iterable<String> result = Iterables.filter(list, Predicates.containsPattern(search));
+
+        return Lists.newArrayList(result.iterator());
+    }
+
+    public List<String> findUsingCommonsCollection(String search, List<String> list) {
+        Iterable<String> result = IterableUtils.filteredIterable(list, new org.apache.commons.collections4.Predicate<String>() {
+            public boolean evaluate(String listElement) {
+                return listElement.contains(search);
+            }
+        });
+
+        return IteratorUtils.toList(result.iterator());
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/com/baeldung/findastring/FindAStringInListUnitTest.java b/core-java-modules/core-java-collections-list-2/src/test/java/com/baeldung/findastring/FindAStringInListUnitTest.java
new file mode 100644
index 0000000000..ff5ca21505
--- /dev/null
+++ b/core-java-modules/core-java-collections-list-2/src/test/java/com/baeldung/findastring/FindAStringInListUnitTest.java
@@ -0,0 +1,62 @@
+package com.baeldung.findastring;
+
+import java.util.ArrayList;
+import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.Test;
+public class FindAStringInListUnitTest {
+
+    private static List<String> list = new ArrayList<>();
+
+    static {
+        list.add("Jack and Jill");
+        list.add("James and Sarah");
+        list.add("Sam and Louise");
+        list.add("Jack");
+        list.add("");
+    }
+
+    private static FindAStringInGivenList findAStringInGivenList = new FindAStringInGivenList();
+
+    @Test
+    public void givenAString_whenFoundUsingLoopWithRegex_thenReturnList() {
+        List matchingElements = findAStringInGivenList.findUsingLoopWithRegex("Jack", list);
+        assertEquals(2, matchingElements.size());
+        assertEquals("Jack and Jill", matchingElements.get(0));
+        assertEquals("Jack", matchingElements.get(1));
+    }
+
+    @Test
+    public void givenAString_whenFoundUsingLoop_thenReturnList() {
+        List matchingElements = findAStringInGivenList.findUsingLoop("Jack", list);
+        assertEquals(2, matchingElements.size());
+        assertEquals("Jack and Jill", matchingElements.get(0));
+        assertEquals("Jack", matchingElements.get(1));
+    }
+
+
+    @Test
+    public void givenAString_whenFoundUsingStream_thenReturnList(){
+        List matchingElements = findAStringInGivenList.findUsingStream("Jack", list);
+        assertEquals(2, matchingElements.size());
+        assertEquals("Jack and Jill", matchingElements.get(0));
+        assertEquals("Jack", matchingElements.get(1));
+    }
+
+    @Test
+    public void givenAString_whenFoundUsingCommonsCollection_thenReturnList(){
+        List matchingElements = findAStringInGivenList.findUsingCommonsCollection("Jack", list);
+        assertEquals(2, matchingElements.size());
+        assertEquals("Jack and Jill", matchingElements.get(0));
+        assertEquals("Jack", matchingElements.get(1));
+    }
+
+    @Test
+    public void givenAString_whenFoundUsingGuava_thenReturnList(){
+        List matchingElements = findAStringInGivenList.findUsingGuava("Jack", list);
+        assertEquals(2, matchingElements.size());
+        assertEquals("Jack and Jill", matchingElements.get(0));
+        assertEquals("Jack", matchingElements.get(1));
+    }
+
+}
diff --git a/core-java-modules/core-java-collections-list-3/pom.xml b/core-java-modules/core-java-collections-list-3/pom.xml
index 064b65d19e..dab5058cd3 100644
--- a/core-java-modules/core-java-collections-list-3/pom.xml
+++ b/core-java-modules/core-java-collections-list-3/pom.xml
@@ -19,23 +19,12 @@
             <artifactId>commons-collections4</artifactId>
             <version>${commons-collections4.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>net.sf.trove4j</groupId>
@@ -67,7 +56,6 @@
 
     <properties>
         <commons-collections4.version>4.1</commons-collections4.version>
-        <commons-lang3.version>3.8.1</commons-lang3.version>
         <assertj.version>3.11.1</assertj.version>
 		<trove4j.version>3.0.2</trove4j.version>
 		<fastutil.version>8.1.0</fastutil.version>
diff --git a/core-java-modules/core-java-collections-list-3/src/main/java/com/baeldung/list/DuplicatesCounter.java b/core-java-modules/core-java-collections-list-3/src/main/java/com/baeldung/list/DuplicatesCounter.java
new file mode 100644
index 0000000000..04e24e5fa1
--- /dev/null
+++ b/core-java-modules/core-java-collections-list-3/src/main/java/com/baeldung/list/DuplicatesCounter.java
@@ -0,0 +1,42 @@
+package com.baeldung.list;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * Demo different approaches to get count of duplicated elements in an
+ * arrayList
+ */
+public class DuplicatesCounter {
+
+    public static <T> Map<T, Long> countByClassicalLoop(List<T> inputList) {
+        Map<T, Long> resultMap = new HashMap<>();
+        for (T element : inputList) {
+            if (resultMap.containsKey(element)) {
+                resultMap.put(element, resultMap.get(element) + 1L);
+            } else {
+                resultMap.put(element, 1L);
+            }
+        }
+        return resultMap;
+    }
+
+    public static <T> Map<T, Long> countByClassicalLoopWithMapCompute(List<T> inputList) {
+        Map<T, Long> resultMap = new HashMap<>();
+        for (T element : inputList) {
+            resultMap.compute(element, (k, v) -> v == null ? 1 : v + 1);
+        }
+        return resultMap;
+    }
+
+    public static <T> Map<T, Long> countByStreamToMap(List<T> inputList) {
+        return inputList.stream().collect(Collectors.toMap(Function.identity(), v -> 1L, Long::sum));
+    }
+
+    public static <T> Map<T, Long> countByStreamGroupBy(List<T> inputList) {
+        return inputList.stream().collect(Collectors.groupingBy(k -> k, Collectors.counting()));
+    }
+}
diff --git a/core-java-modules/core-java-collections-list-3/src/test/java/com/baeldung/list/DuplicatesCounterUnitTest.java b/core-java-modules/core-java-collections-list-3/src/test/java/com/baeldung/list/DuplicatesCounterUnitTest.java
new file mode 100644
index 0000000000..4b6a03aaef
--- /dev/null
+++ b/core-java-modules/core-java-collections-list-3/src/test/java/com/baeldung/list/DuplicatesCounterUnitTest.java
@@ -0,0 +1,55 @@
+package com.baeldung.list;
+
+import org.assertj.core.util.Lists;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.data.MapEntry.entry;
+
+class DuplicatesCounterUnitTest {
+
+
+    private static List<String> INPUT_LIST = Lists.list(
+        "expect1",
+        "expect2", "expect2",
+        "expect3", "expect3", "expect3",
+        "expect4", "expect4", "expect4", "expect4");
+
+    @Test
+    void givenInput_whenCountByClassicalLoop_thenGetResultMap() {
+        Map<String, Long> result = DuplicatesCounter.countByClassicalLoop(INPUT_LIST);
+        verifyResult(result);
+    }
+
+
+    @Test
+    void givenInput_whenCountByClassicalLoopWithMapCompute_thenGetResultMap() {
+        Map<String, Long> result = DuplicatesCounter.countByClassicalLoopWithMapCompute(INPUT_LIST);
+        verifyResult(result);
+    }
+
+    @Test
+    void givenInput_whenCountByStreamToMap_thenGetResultMap() {
+        Map<String, Long> result = DuplicatesCounter.countByStreamToMap(INPUT_LIST);
+        verifyResult(result);
+    }
+
+    @Test
+    void givenInput_whenCountByStreamGroupBy_thenGetResultMap() {
+        Map<String, Long> result = DuplicatesCounter.countByStreamGroupBy(INPUT_LIST);
+        verifyResult(result);
+    }
+
+    private void verifyResult(Map<String, Long> resultMap) {
+        assertThat(resultMap)
+            .isNotEmpty().hasSize(4)
+            .containsExactly(
+                entry("expect1", 1L),
+                entry("expect2", 2L),
+                entry("expect3", 3L),
+                entry("expect4", 4L));
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-list/pom.xml b/core-java-modules/core-java-collections-list/pom.xml
index 581505dc1e..c8e881110e 100644
--- a/core-java-modules/core-java-collections-list/pom.xml
+++ b/core-java-modules/core-java-collections-list/pom.xml
@@ -30,18 +30,11 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <properties>
         <commons-collections4.version>4.1</commons-collections4.version>
         <commons-lang3.version>3.8.1</commons-lang3.version>
         <assertj.version>3.11.1</assertj.version>
-		<trove4j.version>3.0.2</trove4j.version>
     </properties>
 </project>
diff --git a/core-java-modules/core-java-collections-set/pom.xml b/core-java-modules/core-java-collections-set/pom.xml
index 101ed79de0..1dd1e06ca1 100644
--- a/core-java-modules/core-java-collections-set/pom.xml
+++ b/core-java-modules/core-java-collections-set/pom.xml
@@ -14,11 +14,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
@@ -38,7 +33,6 @@
 
     <properties>
         <commons-collections4.version>4.3</commons-collections4.version>
-        <guava.version>27.1-jre</guava.version>
         <gson.version>2.8.5</gson.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections/pom.xml b/core-java-modules/core-java-collections/pom.xml
index 7fd702845b..62b42b53e7 100644
--- a/core-java-modules/core-java-collections/pom.xml
+++ b/core-java-modules/core-java-collections/pom.xml
@@ -30,12 +30,6 @@
             <artifactId>jmh-generator-annprocess</artifactId>
             <version>${openjdk.jmh.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <properties>
diff --git a/core-java-modules/core-java-concurrency-advanced-2/README.md b/core-java-modules/core-java-concurrency-advanced-2/README.md
new file mode 100644
index 0000000000..988ada9e4a
--- /dev/null
+++ b/core-java-modules/core-java-concurrency-advanced-2/README.md
@@ -0,0 +1,19 @@
+=========
+
+## Core Java Concurrency Advanced Examples
+
+This module contains articles about advanced topics about multithreading with core Java.
+
+### Relevant Articles: 
+- [Semaphores in Java](https://www.baeldung.com/java-semaphore)
+- [Daemon Threads in Java](https://www.baeldung.com/java-daemon-thread)
+- [Priority-based Job Scheduling in Java](https://www.baeldung.com/java-priority-job-schedule)
+- [Brief Introduction to Java Thread.yield()](https://www.baeldung.com/java-thread-yield)
+- [Print Even and Odd Numbers Using 2 Threads](https://www.baeldung.com/java-even-odd-numbers-with-2-threads)
+- [Java CyclicBarrier vs CountDownLatch](https://www.baeldung.com/java-cyclicbarrier-countdownlatch)
+- [Guide to the Fork/Join Framework in Java](https://www.baeldung.com/java-fork-join)
+- [Guide to ThreadLocalRandom in Java](https://www.baeldung.com/java-thread-local-random)
+- [The Thread.join() Method in Java](https://www.baeldung.com/java-thread-join)
+- [Passing Parameters to Java Threads](https://www.baeldung.com/java-thread-parameters)
+
+[[<-- previous]](/core-java-modules/core-java-concurrency-advanced)[[next -->]](/core-java-modules/core-java-concurrency-advanced-3)
diff --git a/core-java-modules/core-java-concurrency-advanced-2/pom.xml b/core-java-modules/core-java-concurrency-advanced-2/pom.xml
new file mode 100644
index 0000000000..cad492b1ea
--- /dev/null
+++ b/core-java-modules/core-java-concurrency-advanced-2/pom.xml
@@ -0,0 +1,59 @@
+<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-concurrency-advanced-2</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-concurrency-advanced-2</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>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </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-annprocess.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-concurrency-advanced-2</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+        <jmh-core.version>1.19</jmh-core.version>
+        <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
+        
+        <assertj.version>3.6.1</assertj.version>
+    </properties>
+
+</project>
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExample.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExample.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExample.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExample.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExample.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExample.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExample.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExample.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExample.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExample.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExample.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExample.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExample.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExample.java
similarity index 88%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExample.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExample.java
index 76b6198bc4..cf497687cc 100644
--- a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExample.java
+++ b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExample.java
@@ -4,6 +4,7 @@ import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class CyclicBarrierResetExample {
@@ -36,6 +37,11 @@ public class CyclicBarrierResetExample {
             });
         }
         es.shutdown();
+        try {
+            es.awaitTermination(1, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
         return updateCount.get();
     }
 
diff --git a/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/daemon/NewThread.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/daemon/NewThread.java
new file mode 100644
index 0000000000..370ce99c09
--- /dev/null
+++ b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/daemon/NewThread.java
@@ -0,0 +1,23 @@
+package com.baeldung.concurrent.daemon;
+
+public class NewThread extends Thread {
+    public void run() {
+    	long startTime = System.currentTimeMillis();
+        while (true) {
+            for (int i = 0; i < 10; i++) {
+                System.out.println(this.getName() + ": New Thread is running..." + i);
+                try {
+                    //Wait for one sec so it doesn't print too fast
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+            // prevent the Thread to run forever. It will finish it's execution after 2 seconds
+            if (System.currentTimeMillis() - startTime > 2000) {
+            	Thread.currentThread().interrupt();
+            	break;
+            }
+        }
+    }
+}
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddSemaphore.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddSemaphore.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddSemaphore.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddSemaphore.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddWaitNotify.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddWaitNotify.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddWaitNotify.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/evenandodd/PrintEvenOddWaitNotify.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/AverageCalculator.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/parameters/AverageCalculator.java
similarity index 90%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/AverageCalculator.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/parameters/AverageCalculator.java
index a548b5d4a7..f0997b30bd 100644
--- a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/AverageCalculator.java
+++ b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/parameters/AverageCalculator.java
@@ -1,4 +1,4 @@
-package com.baeldung.concurrent.parameter;
+package com.baeldung.concurrent.parameters;
 
 import java.util.concurrent.Callable;
 import java.util.stream.IntStream;
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/ParameterizedThreadExample.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/parameters/ParameterizedThreadExample.java
similarity index 95%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/ParameterizedThreadExample.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/parameters/ParameterizedThreadExample.java
index 73c61f3fb1..177bf14dae 100644
--- a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/parameter/ParameterizedThreadExample.java
+++ b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/parameters/ParameterizedThreadExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.concurrent.parameter;
+package com.baeldung.concurrent.parameters;
 
 import java.util.concurrent.Callable;
 import java.util.stream.IntStream;
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/Job.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/prioritytaskexecution/Job.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/Job.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/prioritytaskexecution/Job.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/JobPriority.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/prioritytaskexecution/JobPriority.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/JobPriority.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/prioritytaskexecution/JobPriority.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobScheduler.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobScheduler.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobScheduler.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobScheduler.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/CounterUsingMutex.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/semaphores/CounterUsingMutex.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/CounterUsingMutex.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/semaphores/CounterUsingMutex.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/DelayQueueUsingTimedSemaphore.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/semaphores/DelayQueueUsingTimedSemaphore.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/DelayQueueUsingTimedSemaphore.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/semaphores/DelayQueueUsingTimedSemaphore.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/LoginQueueUsingSemaphore.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/semaphores/LoginQueueUsingSemaphore.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/semaphores/LoginQueueUsingSemaphore.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/semaphores/LoginQueueUsingSemaphore.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/yield/ThreadYield.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/yield/ThreadYield.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/yield/ThreadYield.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/concurrent/yield/ThreadYield.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/CustomRecursiveAction.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/forkjoin/CustomRecursiveAction.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/CustomRecursiveAction.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/forkjoin/CustomRecursiveAction.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/CustomRecursiveTask.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/forkjoin/CustomRecursiveTask.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/CustomRecursiveTask.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/forkjoin/CustomRecursiveTask.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/util/PoolUtil.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/forkjoin/util/PoolUtil.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/forkjoin/util/PoolUtil.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/forkjoin/util/PoolUtil.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarkRunner.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarkRunner.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarkRunner.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarkRunner.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarker.java b/core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarker.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarker.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/main/java/com/baeldung/threadlocalrandom/ThreadLocalRandomBenchMarker.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExampleUnitTest.java b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExampleUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExampleUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchCountExampleUnitTest.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExampleUnitTest.java b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExampleUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExampleUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/countdownlatch/CountdownLatchResetExampleUnitTest.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExampleUnitTest.java b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExampleUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExampleUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCountExampleUnitTest.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExampleUnitTest.java b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExampleUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExampleUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierResetExampleUnitTest.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadUnitTest.java b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadUnitTest.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/parameters/ParameterizedThreadUnitTest.java b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/parameters/ParameterizedThreadUnitTest.java
similarity index 93%
rename from core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/parameters/ParameterizedThreadUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/parameters/ParameterizedThreadUnitTest.java
index 21b374e609..4185d77dc3 100644
--- a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/parameters/ParameterizedThreadUnitTest.java
+++ b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/parameters/ParameterizedThreadUnitTest.java
@@ -1,14 +1,13 @@
-package com.baeldung.parameters;
+package com.baeldung.concurrent.parameters;
 
-import com.baeldung.concurrent.parameter.AverageCalculator;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.stream.IntStream;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
 
 public class ParameterizedThreadUnitTest {
 
diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerUnitTest.java b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerUnitTest.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/semaphores/SemaphoresManualTest.java b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/semaphores/SemaphoresManualTest.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/semaphores/SemaphoresManualTest.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/semaphores/SemaphoresManualTest.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/java8/Java8ForkJoinIntegrationTest.java b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/forkjoin/Java8ForkJoinIntegrationTest.java
similarity index 98%
rename from core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/java8/Java8ForkJoinIntegrationTest.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/forkjoin/Java8ForkJoinIntegrationTest.java
index 6778fd782b..c469fe0195 100644
--- a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/java8/Java8ForkJoinIntegrationTest.java
+++ b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/forkjoin/Java8ForkJoinIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8;
+package com.baeldung.forkjoin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/thread/join/ThreadJoinUnitTest.java b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/thread/join/ThreadJoinUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/thread/join/ThreadJoinUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/thread/join/ThreadJoinUnitTest.java
diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/threadlocalrandom/ThreadLocalRandomIntegrationTest.java b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/threadlocalrandom/ThreadLocalRandomIntegrationTest.java
similarity index 100%
rename from core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/threadlocalrandom/ThreadLocalRandomIntegrationTest.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/threadlocalrandom/ThreadLocalRandomIntegrationTest.java
diff --git a/core-java-modules/core-java-concurrency-advanced-3/README.md b/core-java-modules/core-java-concurrency-advanced-3/README.md
new file mode 100644
index 0000000000..d1622b5fe1
--- /dev/null
+++ b/core-java-modules/core-java-concurrency-advanced-3/README.md
@@ -0,0 +1,9 @@
+=========
+
+## Core Java Concurrency Advanced Examples
+
+This module contains articles about advanced topics about multithreading with core Java.
+
+### Relevant Articles: 
+
+[[<-- previous]](/core-java-modules/core-java-concurrency-advanced-2)
diff --git a/core-java-modules/core-java-concurrency-advanced-3/pom.xml b/core-java-modules/core-java-concurrency-advanced-3/pom.xml
new file mode 100644
index 0000000000..cc7b7b1e70
--- /dev/null
+++ b/core-java-modules/core-java-concurrency-advanced-3/pom.xml
@@ -0,0 +1,33 @@
+<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-concurrency-advanced-3</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-concurrency-advanced-3</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>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-concurrency-advanced-3</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+    </properties>
+
+</project>
diff --git a/core-java-modules/core-java-concurrency-advanced/.gitignore b/core-java-modules/core-java-concurrency-advanced/.gitignore
deleted file mode 100644
index 3de4cc647e..0000000000
--- a/core-java-modules/core-java-concurrency-advanced/.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/core-java-modules/core-java-concurrency-advanced/README.md b/core-java-modules/core-java-concurrency-advanced/README.md
index f76e68757a..0da59c88fb 100644
--- a/core-java-modules/core-java-concurrency-advanced/README.md
+++ b/core-java-modules/core-java-concurrency-advanced/README.md
@@ -1,25 +1,16 @@
 ## Core Java Concurrency Advanced Examples
 
-This module contains articles about advanced concurrency in core Java.
+This module contains articles about advanced topics about multithreading with core Java.
 
 ### Relevant Articles: 
-- [Introduction to Thread Pools in Java](http://www.baeldung.com/thread-pool-java-and-guava)
-- [Guide to CountDownLatch in Java](http://www.baeldung.com/java-countdown-latch)
-- [Guide to java.util.concurrent.Locks](http://www.baeldung.com/java-concurrent-locks)
-- [An Introduction to ThreadLocal in Java](http://www.baeldung.com/java-threadlocal)
-- [LongAdder and LongAccumulator in Java](http://www.baeldung.com/java-longadder-and-longaccumulator)
-- [The Dining Philosophers Problem in Java](http://www.baeldung.com/java-dining-philoshophers)
-- [Guide to the Java Phaser](http://www.baeldung.com/java-phaser)
-- [An Introduction to Atomic Variables in Java](http://www.baeldung.com/java-atomic-variables)
-- [CyclicBarrier in Java](http://www.baeldung.com/java-cyclic-barrier)
-- [Guide to the Volatile Keyword in Java](http://www.baeldung.com/java-volatile)
-- [Semaphores in Java](http://www.baeldung.com/java-semaphore)
-- [Daemon Threads in Java](http://www.baeldung.com/java-daemon-thread)
-- [Priority-based Job Scheduling in Java](http://www.baeldung.com/java-priority-job-schedule)
-- [Brief Introduction to Java Thread.yield()](https://www.baeldung.com/java-thread-yield)
-- [Print Even and Odd Numbers Using 2 Threads](https://www.baeldung.com/java-even-odd-numbers-with-2-threads)
-- [Java CyclicBarrier vs CountDownLatch](https://www.baeldung.com/java-cyclicbarrier-countdownlatch)
-- [Guide to the Fork/Join Framework in Java](http://www.baeldung.com/java-fork-join)
-- [Guide to ThreadLocalRandom in Java](http://www.baeldung.com/java-thread-local-random)
-- [The Thread.join() Method in Java](http://www.baeldung.com/java-thread-join)
-- [Passing Parameters to Java Threads](https://www.baeldung.com/java-thread-parameters)
+- [Introduction to Thread Pools in Java](https://www.baeldung.com/thread-pool-java-and-guava)
+- [Guide to CountDownLatch in Java](https://www.baeldung.com/java-countdown-latch)
+- [Guide to java.util.concurrent.Locks](https://www.baeldung.com/java-concurrent-locks)
+- [An Introduction to ThreadLocal in Java](https://www.baeldung.com/java-threadlocal)
+- [LongAdder and LongAccumulator in Java](https://www.baeldung.com/java-longadder-and-longaccumulator)
+- [The Dining Philosophers Problem in Java](https://www.baeldung.com/java-dining-philoshophers)
+- [Guide to the Java Phaser](https://www.baeldung.com/java-phaser)
+- [An Introduction to Atomic Variables in Java](https://www.baeldung.com/java-atomic-variables)
+- [CyclicBarrier in Java](https://www.baeldung.com/java-cyclic-barrier)
+- [Guide to the Volatile Keyword in Java](https://www.baeldung.com/java-volatile)
+- More Articles: [[next -->]](/core-java-modules/core-java-concurrency-advanced-2)
diff --git a/core-java-modules/core-java-concurrency-advanced/pom.xml b/core-java-modules/core-java-concurrency-advanced/pom.xml
index 5d41909ed3..4a9ee30d65 100644
--- a/core-java-modules/core-java-concurrency-advanced/pom.xml
+++ b/core-java-modules/core-java-concurrency-advanced/pom.xml
@@ -47,16 +47,6 @@
             <version>${avaitility.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-annprocess.version}</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -78,8 +68,6 @@
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
         <avaitility.version>1.7.0</avaitility.version>
-        <jmh-core.version>1.19</jmh-core.version>
-        <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExample.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExample.java
index 7c1299da62..00cf314706 100644
--- a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExample.java
+++ b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/cyclicbarrier/CyclicBarrierCompletionMethodExample.java
@@ -4,6 +4,7 @@ import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class CyclicBarrierCompletionMethodExample {
@@ -35,6 +36,11 @@ public class CyclicBarrierCompletionMethodExample {
             });
         }
         es.shutdown();
+        try {
+            es.awaitTermination(1, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
         return updateCount.get();
     }
 
diff --git a/core-java-modules/core-java-concurrency-basic-2/pom.xml b/core-java-modules/core-java-concurrency-basic-2/pom.xml
index 7e0a160456..396447ff75 100644
--- a/core-java-modules/core-java-concurrency-basic-2/pom.xml
+++ b/core-java-modules/core-java-concurrency-basic-2/pom.xml
@@ -1,7 +1,6 @@
 <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-concurrency-basic-2</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-basic-2</name>
@@ -27,7 +26,4 @@
         </resources>
     </build>
 
-    <properties>
-    </properties>
-
 </project>
diff --git a/core-java-modules/core-java-concurrency-basic/pom.xml b/core-java-modules/core-java-concurrency-basic/pom.xml
index 96b3ef76f7..93b8523eb4 100644
--- a/core-java-modules/core-java-concurrency-basic/pom.xml
+++ b/core-java-modules/core-java-concurrency-basic/pom.xml
@@ -1,7 +1,6 @@
 <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-concurrency-basic</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-basic</name>
diff --git a/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/semaphore/SemaPhoreDemo.java b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/semaphore/SemaPhoreDemo.java
index 3a1d8555d3..43261e5ee4 100644
--- a/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/semaphore/SemaPhoreDemo.java
+++ b/core-java-modules/core-java-concurrency-basic/src/main/java/com/baeldung/concurrent/semaphore/SemaPhoreDemo.java
@@ -12,9 +12,11 @@ public class SemaPhoreDemo {
 		System.out.println("Number of threads waiting to acquire: " + semaphore.getQueueLength());
 
 		if (semaphore.tryAcquire()) {
-			semaphore.acquire();
+			try {		
 			// perform some critical operations
-			semaphore.release();
+			} finally {
+				semaphore.release();
+			}
 		}
 
 	}
diff --git a/core-java-modules/core-java-concurrency-collections/pom.xml b/core-java-modules/core-java-concurrency-collections/pom.xml
index ea3bbe44f3..0d3a6042ac 100644
--- a/core-java-modules/core-java-concurrency-collections/pom.xml
+++ b/core-java-modules/core-java-concurrency-collections/pom.xml
@@ -1,7 +1,6 @@
 <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-concurrency-collections</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-collections</name>
@@ -15,38 +14,12 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>${commons-collections4.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
-            <version>${commons-math3.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.jayway.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${avaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -60,14 +33,8 @@
     </build>
 
     <properties>
-        <!-- util -->
-        <guava.version>21.0</guava.version>
-        <commons-math3.version>3.6.1</commons-math3.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
-        <collections-generic.version>4.01</collections-generic.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <avaitility.version>1.7.0</avaitility.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-datetime-conversion/README.md b/core-java-modules/core-java-datetime-conversion/README.md
new file mode 100644
index 0000000000..2503459f50
--- /dev/null
+++ b/core-java-modules/core-java-datetime-conversion/README.md
@@ -0,0 +1,9 @@
+## Java Date/time conversion Cookbooks and Examples
+
+This module contains articles about converting between Java date and time objects.
+
+### 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)
+- [Convert Date to LocalDate or LocalDateTime and Back](http://www.baeldung.com/java-date-to-localdate-and-localdatetime)
+- [Convert Between java.time.Instant and java.sql.Timestamp](https://www.baeldung.com/java-time-instant-to-java-sql-timestamp)
diff --git a/core-java-modules/core-java-datetime-conversion/pom.xml b/core-java-modules/core-java-datetime-conversion/pom.xml
new file mode 100644
index 0000000000..a93eca00af
--- /dev/null
+++ b/core-java-modules/core-java-datetime-conversion/pom.xml
@@ -0,0 +1,70 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-datetime-conversion</artifactId>
+    <version>${project.parent.version}</version>
+    <name>core-java-datetime-conversion</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>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>${joda-time.version}</version>
+        </dependency>
+        <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>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-datetime-conversion</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>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <joda-time.version>2.10</joda-time.version>
+        <!-- testing -->
+        <assertj.version>3.6.1</assertj.version>
+		<maven.compiler.source>1.9</maven.compiler.source>
+        <maven.compiler.target>1.9</maven.compiler.target>
+    </properties>
+</project>
diff --git a/java-dates/src/main/java/com/baeldung/datetolocaldate/DateToLocalDateConverter.java b/core-java-modules/core-java-datetime-conversion/src/main/java/com/baeldung/datetolocaldate/DateToLocalDateConverter.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/datetolocaldate/DateToLocalDateConverter.java
rename to core-java-modules/core-java-datetime-conversion/src/main/java/com/baeldung/datetolocaldate/DateToLocalDateConverter.java
diff --git a/java-dates/src/main/java/com/baeldung/datetolocaldate/DateToLocalDateTimeConverter.java b/core-java-modules/core-java-datetime-conversion/src/main/java/com/baeldung/datetolocaldate/DateToLocalDateTimeConverter.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/datetolocaldate/DateToLocalDateTimeConverter.java
rename to core-java-modules/core-java-datetime-conversion/src/main/java/com/baeldung/datetolocaldate/DateToLocalDateTimeConverter.java
diff --git a/java-dates/src/main/java/com/baeldung/datetolocaldate/LocalDateTimeToDateConverter.java b/core-java-modules/core-java-datetime-conversion/src/main/java/com/baeldung/datetolocaldate/LocalDateTimeToDateConverter.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/datetolocaldate/LocalDateTimeToDateConverter.java
rename to core-java-modules/core-java-datetime-conversion/src/main/java/com/baeldung/datetolocaldate/LocalDateTimeToDateConverter.java
diff --git a/java-dates/src/main/java/com/baeldung/datetolocaldate/LocalDateToDateConverter.java b/core-java-modules/core-java-datetime-conversion/src/main/java/com/baeldung/datetolocaldate/LocalDateToDateConverter.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/datetolocaldate/LocalDateToDateConverter.java
rename to core-java-modules/core-java-datetime-conversion/src/main/java/com/baeldung/datetolocaldate/LocalDateToDateConverter.java
diff --git a/java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java b/core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java
similarity index 100%
rename from java-dates-2/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java
rename to core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/convert/ConvertDateTimeUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/datetime/ConvertInstantToTimestampUnitTest.java b/core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/datetime/ConvertInstantToTimestampUnitTest.java
similarity index 97%
rename from java-dates/src/test/java/com/baeldung/datetime/ConvertInstantToTimestampUnitTest.java
rename to core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/datetime/ConvertInstantToTimestampUnitTest.java
index 3ba01a591a..e5fd80285c 100644
--- a/java-dates/src/test/java/com/baeldung/datetime/ConvertInstantToTimestampUnitTest.java
+++ b/core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/datetime/ConvertInstantToTimestampUnitTest.java
@@ -1,15 +1,14 @@
 package com.baeldung.datetime;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
 
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
-import java.time.ZoneId;
 import java.util.TimeZone;
 
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ConvertInstantToTimestampUnitTest {
 
diff --git a/java-dates/src/test/java/com/baeldung/datetolocaldate/DateToLocalDateConverterUnitTest.java b/core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/datetolocaldate/DateToLocalDateConverterUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/datetolocaldate/DateToLocalDateConverterUnitTest.java
rename to core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/datetolocaldate/DateToLocalDateConverterUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/datetolocaldate/DateToLocalDateTimeConverterUnitTest.java b/core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/datetolocaldate/DateToLocalDateTimeConverterUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/datetolocaldate/DateToLocalDateTimeConverterUnitTest.java
rename to core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/datetolocaldate/DateToLocalDateTimeConverterUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/datetolocaldate/LocalDateTimeToDateConverterUnitTest.java b/core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/datetolocaldate/LocalDateTimeToDateConverterUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/datetolocaldate/LocalDateTimeToDateConverterUnitTest.java
rename to core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/datetolocaldate/LocalDateTimeToDateConverterUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/datetolocaldate/LocalDateToDateConverterUnitTest.java b/core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/datetolocaldate/LocalDateToDateConverterUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/datetolocaldate/LocalDateToDateConverterUnitTest.java
rename to core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/datetolocaldate/LocalDateToDateConverterUnitTest.java
diff --git a/java-dates-2/src/test/java/com/baeldung/xmlgregoriancalendar/XmlGregorianCalendarConverterUnitTest.java b/core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/xmlgregoriancalendar/XmlGregorianCalendarConverterUnitTest.java
similarity index 100%
rename from java-dates-2/src/test/java/com/baeldung/xmlgregoriancalendar/XmlGregorianCalendarConverterUnitTest.java
rename to core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/xmlgregoriancalendar/XmlGregorianCalendarConverterUnitTest.java
diff --git a/core-java-modules/core-java-datetime-string/README.md b/core-java-modules/core-java-datetime-string/README.md
new file mode 100644
index 0000000000..cf00bdeb1f
--- /dev/null
+++ b/core-java-modules/core-java-datetime-string/README.md
@@ -0,0 +1,13 @@
+## Java Dates Parsing and Formatting Cookbooks and Examples
+
+This module contains articles about parsing and formatting Java date and time objects.
+
+### Relevant Articles: 
+- [Check If a String Is a Valid Date in Java](https://www.baeldung.com/java-string-valid-date)
+- [RegEx for matching Date Pattern in Java](http://www.baeldung.com/java-date-regular-expressions)
+- [Guide to DateTimeFormatter](https://www.baeldung.com/java-datetimeformatter)
+- [Format ZonedDateTime to String](https://www.baeldung.com/java-format-zoned-datetime-string)
+- [A Guide to SimpleDateFormat](https://www.baeldung.com/java-simple-date-format)
+- [Display All Time Zones With GMT And UTC in Java](http://www.baeldung.com/java-time-zones)
+- [Convert between String and Timestamp](https://www.baeldung.com/java-string-to-timestamp)
+- [Convert String to Date in Java](http://www.baeldung.com/java-string-to-date)
diff --git a/java-dates-2/pom.xml b/core-java-modules/core-java-datetime-string/pom.xml
similarity index 77%
rename from java-dates-2/pom.xml
rename to core-java-modules/core-java-datetime-string/pom.xml
index 08b2076d03..b4e7aff524 100644
--- a/java-dates-2/pom.xml
+++ b/core-java-modules/core-java-datetime-string/pom.xml
@@ -1,39 +1,35 @@
 <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-dates-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <artifactId>core-java-datetime-string</artifactId>
+    <version>${project.parent.version}</version>
+    <name>core-java-datetime-string</name>
     <packaging>jar</packaging>
-    <name>java-dates-2</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${joda-time.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
-
         <!-- https://mvnrepository.com/artifact/commons-validator/commons-validator -->
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
             <version>${commons-validator.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>
@@ -41,10 +37,21 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>${joda-time.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.darwinsys</groupId>
+            <artifactId>hirondelle-date4j</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
-        <finalName>java-dates-2</finalName>
+        <finalName>core-java-datetime-string</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -66,12 +73,11 @@
     </build>
 
     <properties>
+        <commons-validator.version>1.6</commons-validator.version>
+        <joda-time.version>2.10</joda-time.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <joda-time.version>2.10</joda-time.version>
-        <commons-lang3.version>3.9</commons-lang3.version>
-        <commons-validator.version>1.6</commons-validator.version>
-        <maven.compiler.source>1.9</maven.compiler.source>
+		<maven.compiler.source>1.9</maven.compiler.source>
         <maven.compiler.target>1.9</maven.compiler.target>
     </properties>
 </project>
diff --git a/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidator.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/date/validation/DateValidator.java
similarity index 100%
rename from java-dates-2/src/main/java/com/baeldung/date/validation/DateValidator.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/date/validation/DateValidator.java
diff --git a/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingApacheValidator.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/date/validation/DateValidatorUsingApacheValidator.java
similarity index 100%
rename from java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingApacheValidator.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/date/validation/DateValidatorUsingApacheValidator.java
diff --git a/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateFormat.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateFormat.java
similarity index 100%
rename from java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateFormat.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateFormat.java
diff --git a/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatter.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatter.java
similarity index 100%
rename from java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatter.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatter.java
diff --git a/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingLocalDate.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/date/validation/DateValidatorUsingLocalDate.java
similarity index 100%
rename from java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingLocalDate.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/date/validation/DateValidatorUsingLocalDate.java
diff --git a/java-dates/src/main/java/com/baeldung/regexp/datepattern/DateMatcher.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/DateMatcher.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/regexp/datepattern/DateMatcher.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/DateMatcher.java
diff --git a/java-dates/src/main/java/com/baeldung/regexp/datepattern/FormattedDateMatcher.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/FormattedDateMatcher.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/regexp/datepattern/FormattedDateMatcher.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/FormattedDateMatcher.java
diff --git a/java-dates/src/main/java/com/baeldung/regexp/datepattern/RangedDateMatcher.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/RangedDateMatcher.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/regexp/datepattern/RangedDateMatcher.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/RangedDateMatcher.java
diff --git a/java-dates/src/main/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcher.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcher.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcher.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcher.java
diff --git a/java-dates/src/main/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcher.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcher.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcher.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcher.java
diff --git a/java-dates/src/main/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcher.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcher.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcher.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcher.java
diff --git a/java-dates/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcher.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcher.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcher.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcher.java
diff --git a/java-dates/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcher.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcher.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcher.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcher.java
diff --git a/java-dates/src/main/java/com/baeldung/regexp/datepattern/optmization/OptimizedMatcher.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/optmization/OptimizedMatcher.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/regexp/datepattern/optmization/OptimizedMatcher.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/regexp/datepattern/optmization/OptimizedMatcher.java
diff --git a/java-dates/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java
diff --git a/java-dates/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java
diff --git a/java-dates/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
diff --git a/java-dates/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java
diff --git a/java-dates/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/zonedatetime/OffsetDateTimeExample.java
similarity index 89%
rename from java-dates/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/zonedatetime/OffsetDateTimeExample.java
index fb92eb8d0d..90077795f0 100644
--- a/java-dates/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java
+++ b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/zonedatetime/OffsetDateTimeExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
diff --git a/java-dates/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/zonedatetime/OffsetTimeExample.java
similarity index 89%
rename from java-dates/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/zonedatetime/OffsetTimeExample.java
index 58e2d4d5ad..e280d365c2 100644
--- a/java-dates/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java
+++ b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/zonedatetime/OffsetTimeExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import java.time.OffsetTime;
 import java.time.ZoneOffset;
diff --git a/java-dates/src/main/java/com/baeldung/zoneddatetime/ZoneDateTimeExample.java b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/zonedatetime/ZoneDateTimeExample.java
similarity index 93%
rename from java-dates/src/main/java/com/baeldung/zoneddatetime/ZoneDateTimeExample.java
rename to core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/zonedatetime/ZoneDateTimeExample.java
index b54b8c5225..a0dd304876 100644
--- a/java-dates/src/main/java/com/baeldung/zoneddatetime/ZoneDateTimeExample.java
+++ b/core-java-modules/core-java-datetime-string/src/main/java/com/baeldung/zonedatetime/ZoneDateTimeExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
diff --git a/java-dates/src/test/java/com/baeldung/date/StringToDateUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/date/StringToDateUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/date/StringToDateUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/date/StringToDateUnitTest.java
diff --git a/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingApacheValidatorUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/date/validation/DateValidatorUsingApacheValidatorUnitTest.java
similarity index 100%
rename from java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingApacheValidatorUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/date/validation/DateValidatorUsingApacheValidatorUnitTest.java
diff --git a/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateFormatUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateFormatUnitTest.java
similarity index 100%
rename from java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateFormatUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateFormatUnitTest.java
diff --git a/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatterUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatterUnitTest.java
similarity index 100%
rename from java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatterUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatterUnitTest.java
diff --git a/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingLocalDateUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/date/validation/DateValidatorUsingLocalDateUnitTest.java
similarity index 100%
rename from java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingLocalDateUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/date/validation/DateValidatorUsingLocalDateUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/datetime/DateTimeFormatterUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/datetime/DateTimeFormatterUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/datetime/DateTimeFormatterUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/datetime/DateTimeFormatterUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/regexp/datepattern/FormattedDateMatcherUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/FormattedDateMatcherUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/regexp/datepattern/FormattedDateMatcherUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/FormattedDateMatcherUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/regexp/datepattern/RangedDateMatcherUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/RangedDateMatcherUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/regexp/datepattern/RangedDateMatcherUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/RangedDateMatcherUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcherUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcherUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcherUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcherUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcherUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcherUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcherUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcherUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcherUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcherUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcherUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcherUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcherUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcherUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcherUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcherUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcherUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcherUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcherUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcherUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/regexp/datepattern/gregorian/testhelper/GregorianDateTestHelper.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/testhelper/GregorianDateTestHelper.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/regexp/datepattern/gregorian/testhelper/GregorianDateTestHelper.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/regexp/datepattern/gregorian/testhelper/GregorianDateTestHelper.java
diff --git a/java-dates/src/test/java/com/baeldung/simpledateformat/SimpleDateFormatUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/simpledateformat/SimpleDateFormatUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/simpledateformat/SimpleDateFormatUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/simpledateformat/SimpleDateFormatUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/timestamp/StringToTimestampConverterUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/timestamp/StringToTimestampConverterUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/timestamp/StringToTimestampConverterUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/timestamp/StringToTimestampConverterUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/timestamp/TimestampToStringConverterTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/timestamp/TimestampToStringConverterTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/timestamp/TimestampToStringConverterTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/timestamp/TimestampToStringConverterTest.java
diff --git a/java-dates/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/zonedatetime/OffsetDateTimeExampleUnitTest.java
similarity index 93%
rename from java-dates/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/zonedatetime/OffsetDateTimeExampleUnitTest.java
index a08d3737cd..7634ff1572 100644
--- a/java-dates/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java
+++ b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/zonedatetime/OffsetDateTimeExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/java-dates/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/zonedatetime/OffsetTimeExampleUnitTest.java
similarity index 93%
rename from java-dates/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/zonedatetime/OffsetTimeExampleUnitTest.java
index 488f934179..6134e48f70 100644
--- a/java-dates/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java
+++ b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/zonedatetime/OffsetTimeExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/java-dates/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/zonedatetime/ZoneDateTimeExampleUnitTest.java
similarity index 96%
rename from java-dates/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/zonedatetime/ZoneDateTimeExampleUnitTest.java
index e78ff3e3fd..cc19055beb 100644
--- a/java-dates/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java
+++ b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/zonedatetime/ZoneDateTimeExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/java-dates/src/test/java/com/baeldung/zoneddatetime/ZonedDateTimeUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/zonedatetime/ZonedDateTimeUnitTest.java
similarity index 98%
rename from java-dates/src/test/java/com/baeldung/zoneddatetime/ZonedDateTimeUnitTest.java
rename to core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/zonedatetime/ZonedDateTimeUnitTest.java
index 65f63bc787..150983c61b 100644
--- a/java-dates/src/test/java/com/baeldung/zoneddatetime/ZonedDateTimeUnitTest.java
+++ b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/zonedatetime/ZonedDateTimeUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
diff --git a/core-java-modules/core-java-datetime/README.md b/core-java-modules/core-java-datetime/README.md
deleted file mode 100644
index 71aea2e9db..0000000000
--- a/core-java-modules/core-java-datetime/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-=========
-
-## Core Java 8 Cookbooks and Examples
-
-### Relevant Articles: 
-- [Set the Time Zone of a Date in Java](https://www.baeldung.com/java-set-date-time-zone)
-- [Overriding System Time for Testing in Java](https://www.baeldung.com/java-override-system-time)
\ No newline at end of file
diff --git a/core-java-modules/core-java-datetime/pom.xml b/core-java-modules/core-java-datetime/pom.xml
deleted file mode 100644
index e2f86c7254..0000000000
--- a/core-java-modules/core-java-datetime/pom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<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-datetime</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>core-java-datetime</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>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- test scoped -->
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${joda.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>${asspectj.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>${powermock.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <version>${powermock.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jmockit</groupId>
-            <artifactId>jmockit</artifactId>
-            <version>${jmockit.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>core-java-datetime</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <argLine>
-                        -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
-                    </argLine>
-                    <disableXmlReport>true</disableXmlReport>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <!-- util -->
-        <commons-math3.version>3.6.1</commons-math3.version>
-        <joda.version>2.10</joda.version>
-        <!-- testing -->
-        <assertj.version>3.6.1</assertj.version>
-        <asspectj.version>1.8.9</asspectj.version>
-        <powermock.version>2.0.0-RC.4</powermock.version>
-        <jmockit.version>1.44</jmockit.version>
-        <!-- plugins -->
-        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
-    </properties>
-</project>
diff --git a/core-java-modules/core-java-exceptions/README.md b/core-java-modules/core-java-exceptions/README.md
index 0120b970c3..ba327b06f2 100644
--- a/core-java-modules/core-java-exceptions/README.md
+++ b/core-java-modules/core-java-exceptions/README.md
@@ -11,3 +11,5 @@ This module contains articles about core java exceptions
 - [Difference Between Throw and Throws in Java](https://www.baeldung.com/java-throw-throws)
 - [“Sneaky Throws” in Java](https://www.baeldung.com/java-sneaky-throws)
 - [The StackOverflowError in Java](https://www.baeldung.com/java-stack-overflow-error)
+- [Checked and Unchecked Exceptions in Java](https://www.baeldung.com/java-checked-unchecked-exceptions)
+
diff --git a/core-java-modules/core-java-function/pom.xml b/core-java-modules/core-java-function/pom.xml
index 5ed7ca68c2..22b2fd9bda 100644
--- a/core-java-modules/core-java-function/pom.xml
+++ b/core-java-modules/core-java-function/pom.xml
@@ -1,7 +1,6 @@
 <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-function</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-function</name>
@@ -15,11 +14,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>
@@ -42,8 +36,5 @@
     <properties>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <asspectj.version>1.8.9</asspectj.version>
-        <!-- plugins -->
-        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
     </properties>
 </project>
diff --git a/core-java-modules/core-java-io-2/README.md b/core-java-modules/core-java-io-2/README.md
new file mode 100644
index 0000000000..2299320f32
--- /dev/null
+++ b/core-java-modules/core-java-io-2/README.md
@@ -0,0 +1,6 @@
+
+### Relevant Articles:
+
+- [Create a File in a Specific Directory in Java](https://www.baeldung.com/java-create-file-in-directory)
+- [A Guide to the Java FileReader Class](https://www.baeldung.com/java-filereader)
+
diff --git a/core-java-modules/core-java-io-2/src/test/java/com/baeldung/file/FileClassDemoUnitTest.java b/core-java-modules/core-java-io-2/src/test/java/com/baeldung/file/FileClassDemoUnitTest.java
new file mode 100644
index 0000000000..b60a12d208
--- /dev/null
+++ b/core-java-modules/core-java-io-2/src/test/java/com/baeldung/file/FileClassDemoUnitTest.java
@@ -0,0 +1,179 @@
+package com.baeldung.file;
+
+import org.junit.Test;
+
+import java.io.*;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class FileClassDemoUnitTest {
+
+    @Test
+    public void givenDirectoryCreated_whenMkdirIsInvoked_thenDirectoryIsDeleted() {
+        File directory = new File("testDirectory");
+        if (!directory.isDirectory() || !directory.exists()) {
+            directory.mkdir();
+        }
+
+        assertTrue(directory.delete());
+    }
+
+    @Test
+    public void givenFileCreated_whenCreateNewFileIsInvoked_thenFileIsDeleted() throws IOException {
+        File file = new File("testFile.txt");
+        if (!file.isFile() || !file.exists()) {
+            file.createNewFile();
+        }
+
+        assertTrue(file.delete());
+    }
+
+
+    @Test
+    public void givenFileCreated_whenCreateNewFileInvoked_thenMetadataIsAsExpected() throws IOException {
+
+        // different Operating systems have different separator characters
+        String separatorCharacter = System.getProperty("file.separator");
+
+        File parentDirectory = makeDirectory("filesDirectory");
+
+        File childFile = new File(parentDirectory, "file1.txt");
+        childFile.createNewFile();
+
+        assertTrue(childFile.getName().equals("file1.txt"));
+        assertTrue(childFile.getParentFile().getName().equals(parentDirectory.getName()));
+        assertTrue(childFile.getPath().equals(parentDirectory.getPath() + separatorCharacter + "file1.txt"));
+
+        removeDirectory(parentDirectory);
+    }
+
+
+    @Test(expected = FileNotFoundException.class)
+    public void givenReadOnlyFileCreated_whenCreateNewFileInvoked_thenFileCannotBeWrittenTo() throws IOException {
+        File parentDirectory = makeDirectory("filesDirectory");
+
+        File childFile = new File(parentDirectory, "file1.txt");
+        childFile.createNewFile();
+
+        childFile.setWritable(false);
+
+        FileOutputStream fos = new FileOutputStream(childFile);
+        fos.write("Hello World".getBytes()); // write operation
+        fos.flush();
+        fos.close();
+
+        removeDirectory(parentDirectory);
+    }
+
+    @Test(expected = FileNotFoundException.class)
+    public void givenWriteOnlyFileCreated_whenCreateNewFileInvoked_thenFileCannotBeReadFrom() throws IOException {
+        File parentDirectory = makeDirectory("filesDirectory");
+
+        File childFile = new File(parentDirectory, "file1.txt");
+        childFile.createNewFile();
+
+        childFile.setReadable(false);
+
+        FileInputStream fis = new FileInputStream(childFile);
+        fis.read(); // read operation
+        fis.close();
+
+        removeDirectory(parentDirectory);
+    }
+
+    @Test
+    public void givenFilesCreatedInDirectory_whenCreateNewFileInvoked_thenTheyCanBeListedAsExpected() throws IOException {
+        File directory = makeDirectory("filtersDirectory");
+
+        File csvFile = new File(directory, "csvFile.csv");
+        csvFile.createNewFile();
+
+        File txtFile = new File(directory, "txtFile.txt");
+        txtFile.createNewFile();
+
+        //normal listing
+        assertEquals(2, directory.list().length);
+
+        //filtered listing
+        FilenameFilter csvFilter = (dir, ext) -> ext.endsWith(".csv");
+        assertEquals(1, directory.list(csvFilter).length);
+
+        removeDirectory(directory);
+    }
+
+    @Test
+    public void givenDirectoryIsCreated_whenMkdirInvoked_thenDirectoryCanBeRenamed() {
+
+        File source = makeDirectory("source");
+        File destination = makeDirectory("destination");
+        source.renameTo(destination);
+
+        assertFalse(source.isDirectory());
+        assertTrue(destination.isDirectory());
+
+        removeDirectory(destination);
+    }
+
+    @Test
+    public void givenDataIsWrittenToFile_whenWriteIsInvoked_thenFreeSpaceOnSystemDecreases() throws IOException {
+
+        String name = System.getProperty("user.home") + System.getProperty("file.separator") + "test";
+        File testDir = makeDirectory(name);
+        File sample = new File(testDir, "sample.txt");
+
+        long freeSpaceBeforeWrite = testDir.getFreeSpace();
+        writeSampleDataToFile(sample);
+
+        long freeSpaceAfterWrite = testDir.getFreeSpace();
+        assertTrue(freeSpaceAfterWrite < freeSpaceBeforeWrite);
+
+        removeDirectory(testDir);
+    }
+
+    private static File makeDirectory(String directoryName) {
+        File directory = new File(directoryName);
+        directory.mkdir();
+        if (directory.isDirectory()) {
+            return directory;
+        }
+        throw new RuntimeException("Directory not created for " + directoryName);
+    }
+
+    private static void removeDirectory(File directory) {
+        // make sure you don't delete your home directory here
+        if (directory.getPath().equals(System.getProperty("user.home"))) {
+            return;
+        }
+
+        // remove directory and its files from system
+        if (directory != null && directory.exists()) {
+            // delete all files inside the directory
+            File[] filesInDirectory = directory.listFiles();
+            if (filesInDirectory != null) {
+                List<File> files = Arrays.asList(filesInDirectory);
+                files.forEach(f -> deleteFile(f));
+            }
+
+            // finally delete the directory itself
+            deleteFile(directory);
+        }
+    }
+
+    private static void deleteFile(File fileToDelete) {
+        if (fileToDelete != null && fileToDelete.exists()) {
+            fileToDelete.delete();
+        }
+    }
+
+    private static void writeSampleDataToFile(File sample) throws IOException {
+        //write sample text to file
+        try (FileOutputStream out = new FileOutputStream(sample)) {
+            for (int i = 1; i <= 100000; i++) {
+                String sampleText = "Sample line number " + i + "\n";
+                out.write(sampleText.getBytes());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-io-files/pom.xml b/core-java-modules/core-java-io-files/pom.xml
index 0f4b5eea1d..2aa6c7bf44 100644
--- a/core-java-modules/core-java-io-files/pom.xml
+++ b/core-java-modules/core-java-io-files/pom.xml
@@ -14,76 +14,6 @@
     </parent>
 
     <dependencies>
-        <!-- utils -->
-        <dependency>
-            <groupId>net.sourceforge.collections</groupId>
-            <artifactId>collections-generic</artifactId>
-            <version>${collections-generic.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>${commons-collections4.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
-            <version>${commons-math3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.decimal4j</groupId>
-            <artifactId>decimal4j</artifactId>
-            <version>${decimal4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>${bouncycastle.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.unix4j</groupId>
-            <artifactId>unix4j-command</artifactId>
-            <version>${unix4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.grep4j</groupId>
-            <artifactId>grep4j</artifactId>
-            <version>${grep4j.version}</version>
-        </dependency>
-        <!-- web -->
-        <!-- marshalling -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <!-- logging -->
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>
@@ -91,86 +21,12 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.jayway.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${avaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>${commons-codec.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.javamoney</groupId>
-            <artifactId>moneta</artifactId>
-            <version>${moneta.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.owasp.esapi</groupId>
-            <artifactId>esapi</artifactId>
-            <version>${esapi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.messaging.mq</groupId>
-            <artifactId>fscontext</artifactId>
-            <version>${fscontext.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.codepoetics</groupId>
-            <artifactId>protonpack</artifactId>
-            <version>${protonpack.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>one.util</groupId>
-            <artifactId>streamex</artifactId>
-            <version>${streamex.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.vavr</groupId>
-            <artifactId>vavr</artifactId>
-            <version>${vavr.version}</version>
-        </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-annprocess.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
             <version>${hsqldb.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.asynchttpclient/async-http-client -->
-        <dependency>
-            <groupId>org.asynchttpclient</groupId>
-            <artifactId>async-http-client</artifactId>
-            <version>${async-http-client.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.opencsv</groupId>
-            <artifactId>opencsv</artifactId>
-            <version>${opencsv.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- Mime Type Resolution Libraries -->
-        <dependency>
-            <groupId>org.apache.tika</groupId>
-            <artifactId>tika-core</artifactId>
-            <version>${tika.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.jmimemagic</groupId>
-            <artifactId>jmimemagic</artifactId>
-            <version>${jmime-magic.version}</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -262,33 +118,13 @@
 
     <properties>
 
-        <!-- util -->
-        <bouncycastle.version>1.55</bouncycastle.version>
-        <commons-codec.version>1.10</commons-codec.version>
-        <commons-math3.version>3.6.1</commons-math3.version>
-        <decimal4j.version>1.0.3</decimal4j.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
-        <collections-generic.version>4.01</collections-generic.version>
-        <unix4j.version>0.4</unix4j.version>
-        <grep4j.version>1.8.7</grep4j.version>
-        <fscontext.version>4.6-b01</fscontext.version>
-        <protonpack.version>1.13</protonpack.version>
-        <streamex.version>0.6.5</streamex.version>
-        <vavr.version>0.9.0</vavr.version>
-        <opencsv.version>4.1</opencsv.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <avaitility.version>1.7.0</avaitility.version>
 
         <!-- maven plugins -->
         <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
         <hsqldb.version>2.4.0</hsqldb.version>
-        <esapi.version>2.1.0.1</esapi.version>
-        <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
-        <async-http-client.version>2.4.5</async-http-client.version>
         <!-- Mime Type Libraries -->
-        <tika.version>1.18</tika.version>
-        <jmime-magic.version>0.1.5</jmime-magic.version>
         <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
 
     </properties>
diff --git a/core-java-modules/core-java-io/README.md b/core-java-modules/core-java-io/README.md
index 023d7d64b5..34b2f371e1 100644
--- a/core-java-modules/core-java-io/README.md
+++ b/core-java-modules/core-java-io/README.md
@@ -41,4 +41,5 @@ This module contains articles about core Java input and output (IO)
 - [List Files in a Directory in Java](https://www.baeldung.com/java-list-directory-files)
 - [Java InputStream to Byte Array and ByteBuffer](https://www.baeldung.com/convert-input-stream-to-array-of-bytes)
 - [Introduction to the Java NIO Selector](https://www.baeldung.com/java-nio-selector)
+- [How to Avoid the Java FileNotFoundException When Loading Resources](https://www.baeldung.com/java-classpath-resource-cannot-be-opened)
 - [[More -->]](/core-java-modules/core-java-io-2)
diff --git a/core-java-modules/core-java-io/pom.xml b/core-java-modules/core-java-io/pom.xml
index 84bf3baeed..3478f71286 100644
--- a/core-java-modules/core-java-io/pom.xml
+++ b/core-java-modules/core-java-io/pom.xml
@@ -14,76 +14,6 @@
     </parent>
 
     <dependencies>
-        <!-- utils -->
-        <dependency>
-            <groupId>net.sourceforge.collections</groupId>
-            <artifactId>collections-generic</artifactId>
-            <version>${collections-generic.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>${commons-collections4.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
-            <version>${commons-math3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.decimal4j</groupId>
-            <artifactId>decimal4j</artifactId>
-            <version>${decimal4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>${bouncycastle.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.unix4j</groupId>
-            <artifactId>unix4j-command</artifactId>
-            <version>${unix4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.grep4j</groupId>
-            <artifactId>grep4j</artifactId>
-            <version>${grep4j.version}</version>
-        </dependency>
-        <!-- web -->
-        <!-- marshalling -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <!-- logging -->
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>
@@ -91,57 +21,6 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.jayway.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${avaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>${commons-codec.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.javamoney</groupId>
-            <artifactId>moneta</artifactId>
-            <version>${moneta.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.owasp.esapi</groupId>
-            <artifactId>esapi</artifactId>
-            <version>${esapi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.messaging.mq</groupId>
-            <artifactId>fscontext</artifactId>
-            <version>${fscontext.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.codepoetics</groupId>
-            <artifactId>protonpack</artifactId>
-            <version>${protonpack.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>one.util</groupId>
-            <artifactId>streamex</artifactId>
-            <version>${streamex.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.vavr</groupId>
-            <artifactId>vavr</artifactId>
-            <version>${vavr.version}</version>
-        </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-annprocess.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
@@ -171,6 +50,12 @@
             <artifactId>jmimemagic</artifactId>
             <version>${jmime-magic.version}</version>
         </dependency>
+        <!-- Context Libraries -->
+        <dependency>
+            <groupId>com.sun.messaging.mq</groupId>
+            <artifactId>fscontext</artifactId>
+            <version>${fscontext.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -263,34 +148,19 @@
     <properties>
 
         <!-- util -->
-        <bouncycastle.version>1.55</bouncycastle.version>
-        <commons-codec.version>1.10</commons-codec.version>
-        <commons-math3.version>3.6.1</commons-math3.version>
-        <decimal4j.version>1.0.3</decimal4j.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
-        <collections-generic.version>4.01</collections-generic.version>
-        <unix4j.version>0.4</unix4j.version>
-        <grep4j.version>1.8.7</grep4j.version>
-        <fscontext.version>4.6-b01</fscontext.version>
-        <protonpack.version>1.13</protonpack.version>
-        <streamex.version>0.6.5</streamex.version>
-        <vavr.version>0.9.0</vavr.version>
         <opencsv.version>4.1</opencsv.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <avaitility.version>1.7.0</avaitility.version>
 
         <!-- maven plugins -->
         <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
         <hsqldb.version>2.4.0</hsqldb.version>
-        <esapi.version>2.1.0.1</esapi.version>
-        <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
         <async-http-client.version>2.4.5</async-http-client.version>
         <!-- Mime Type Libraries -->
         <tika.version>1.18</tika.version>
         <jmime-magic.version>0.1.5</jmime-magic.version>
         <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
-
+        <fscontext.version>4.4.2</fscontext.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-jndi/README.md b/core-java-modules/core-java-jndi/README.md
new file mode 100644
index 0000000000..d9fb324c9a
--- /dev/null
+++ b/core-java-modules/core-java-jndi/README.md
@@ -0,0 +1,4 @@
+
+### Relevant Articles:
+
+- [Java Naming and Directory Interface Overview](https://www.baeldung.com/jndi)
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml b/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml
index 757d9229df..09ca44d9be 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml
+++ b/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml
@@ -3,7 +3,6 @@
          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.consumermodule</groupId>
     <artifactId>consumermodule</artifactId>
     <version>1.0</version>
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule/pom.xml b/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule/pom.xml
index 4de3df8c01..861f06f089 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule/pom.xml
+++ b/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule/pom.xml
@@ -3,16 +3,16 @@
          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.servicemodule</groupId>
+    <artifactId>servicemodule</artifactId>
+    <version>1.0</version>
+
     <parent>
         <artifactId>>com.baeldung.decoupling-pattern2</artifactId>
         <groupId>decoupling-pattern2</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>com.baeldung.servicemodule</groupId>
-    <artifactId>servicemodule</artifactId>
-    <version>1.0</version>
-
     <build>
         <plugins>
             <plugin>
diff --git a/core-java-modules/core-java-jvm/README.md b/core-java-modules/core-java-jvm/README.md
index 9f1d21fa6f..89600ad924 100644
--- a/core-java-modules/core-java-jvm/README.md
+++ b/core-java-modules/core-java-jvm/README.md
@@ -1,8 +1,12 @@
 ## Core Java JVM Cookbooks and Examples
 
+This module contains articles about working with the Java Virtual Machine (JVM).
+
 ### Relevant Articles: 
 
 - [Method Inlining in the JVM](https://www.baeldung.com/jvm-method-inlining)
-- [JVM Log Forging](http://www.baeldung.com/jvm-log-forging)
-- [Guide to Java Instrumentation](http://www.baeldung.com/java-instrumentation)
-- [Class Loaders in Java](http://www.baeldung.com/java-classloaders)
+- [JVM Log Forging](https://www.baeldung.com/jvm-log-forging)
+- [Guide to Java Instrumentation](https://www.baeldung.com/java-instrumentation)
+- [Class Loaders in Java](https://www.baeldung.com/java-classloaders)
+- [A Guide to System.exit()](https://www.baeldung.com/java-system-exit)
+- [Guide to System.gc()](https://www.baeldung.com/java-system-gc)
diff --git a/core-java-modules/core-java-jvm/pom.xml b/core-java-modules/core-java-jvm/pom.xml
index b6fd81fe45..74960820d7 100644
--- a/core-java-modules/core-java-jvm/pom.xml
+++ b/core-java-modules/core-java-jvm/pom.xml
@@ -1,7 +1,6 @@
 <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-jvm</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
diff --git a/core-java-modules/core-java-lambdas/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
index 835815aecd..957294153b 100644
--- a/core-java-modules/core-java-lambdas/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
@@ -35,9 +35,9 @@ public class MethodReferenceUnitTest {
     public void referenceToInstanceMethodOfArbitratyObjectOfParticularType() {
         List<Integer> numbers = Arrays.asList(5, 3, 50, 24, 40, 2, 9, 18);
         numbers.stream()
-            .sorted((a, b) -> Integer.compare(a, b));
+            .sorted((a, b) -> a.compareTo(b));
         numbers.stream()
-            .sorted(Integer::compare);
+            .sorted(Integer::compareTo);
     }
 
     @Test
diff --git a/core-java-modules/core-java-lang-2/README.md b/core-java-modules/core-java-lang-2/README.md
index 9904e59035..ee57ec6198 100644
--- a/core-java-modules/core-java-lang-2/README.md
+++ b/core-java-modules/core-java-lang-2/README.md
@@ -4,4 +4,5 @@ This module contains articles about core features in the Java language
 
 ### Relevant Articles: 
 - [Java Primitives versus Objects](https://www.baeldung.com/java-primitives-vs-objects)
-- [[<-- Prev]](/core-java-modules/core-java-lang)
\ No newline at end of file
+- [Command-Line Arguments in Java](https://www.baeldung.com/java-command-line-arguments)
+- [[<-- Prev]](/core-java-modules/core-java-lang)
diff --git a/core-java-modules/core-java-lang-2/pom.xml b/core-java-modules/core-java-lang-2/pom.xml
index fb4a5bd009..22df5f7951 100644
--- a/core-java-modules/core-java-lang-2/pom.xml
+++ b/core-java-modules/core-java-lang-2/pom.xml
@@ -1,7 +1,6 @@
 <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-2</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-2</name>
diff --git a/core-java-modules/core-java-lang-math/README.md b/core-java-modules/core-java-lang-math/README.md
index cfa3052f43..b316ed1cfb 100644
--- a/core-java-modules/core-java-lang-math/README.md
+++ b/core-java-modules/core-java-lang-math/README.md
@@ -5,3 +5,4 @@
 ### Relevant Articles: 
 - [Java 8 Math New Methods](https://www.baeldung.com/java-8-math)
 - [Java 8 Unsigned Arithmetic Support](https://www.baeldung.com/java-unsigned-arithmetic)
+- [How to Separate Double into Integer and Decimal Parts](https://www.baeldung.com/java-separate-double-into-integer-decimal-parts)
diff --git a/core-java-modules/core-java-lang-math/pom.xml b/core-java-modules/core-java-lang-math/pom.xml
index f3e5132e5b..f884aca3a9 100644
--- a/core-java-modules/core-java-lang-math/pom.xml
+++ b/core-java-modules/core-java-lang-math/pom.xml
@@ -1,7 +1,6 @@
 <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-math</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-math</name>
@@ -15,11 +14,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>
@@ -42,8 +36,5 @@
     <properties>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <asspectj.version>1.8.9</asspectj.version>
-        <!-- plugins -->
-        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
     </properties>
 </project>
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/doubles/SplitFloatingPointNumbers.java b/core-java-modules/core-java-lang-math/src/main/java/com/baeldung/doubles/SplitFloatingPointNumbers.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/doubles/SplitFloatingPointNumbers.java
rename to core-java-modules/core-java-lang-math/src/main/java/com/baeldung/doubles/SplitFloatingPointNumbers.java
diff --git a/core-java-modules/core-java-lang-oop-2/README.md b/core-java-modules/core-java-lang-oop-2/README.md
index dca7b14d68..f387e8d4a2 100644
--- a/core-java-modules/core-java-lang-oop-2/README.md
+++ b/core-java-modules/core-java-lang-oop-2/README.md
@@ -7,7 +7,6 @@ This module contains articles about Object-oriented programming (OOP) in Java
 - [Cannot Reference “X” Before Supertype Constructor Has Been Called](https://www.baeldung.com/java-cannot-reference-x-before-supertype-constructor-error)
 - [Anonymous Classes in Java](https://www.baeldung.com/java-anonymous-classes)
 - [Raw Types in Java](https://www.baeldung.com/raw-types-java)
-- [Java ‘private’ Access Modifier](https://www.baeldung.com/java-private-keyword)
 - [Marker Interfaces in Java](https://www.baeldung.com/java-marker-interfaces)
 - [Java equals() and hashCode() Contracts](https://www.baeldung.com/java-equals-hashcode-contracts)
 - [Immutable Objects in Java](https://www.baeldung.com/java-immutable-object)
@@ -15,4 +14,5 @@ This module contains articles about Object-oriented programming (OOP) in Java
 - [A Guide to Constructors in Java](https://www.baeldung.com/java-constructors)
 - [Composition, Aggregation, and Association in Java](https://www.baeldung.com/java-composition-aggregation-association)
 - [Static and Default Methods in Interfaces in Java](https://www.baeldung.com/java-static-default-methods)
-- [[<-- Prev]](/core-java-modules/core-java-lang-oop)[[More -->]](/core-java-modules/core-java-lang-oop-3)
\ No newline at end of file
+- [Java Copy Constructor](https://www.baeldung.com/java-copy-constructor)
+- [[<-- Prev]](/core-java-modules/core-java-lang-oop)[[More -->]](/core-java-modules/core-java-lang-oop-3)
diff --git a/core-java-modules/core-java-lang-oop-2/pom.xml b/core-java-modules/core-java-lang-oop-2/pom.xml
index d27df147b7..5bca2f0dbf 100644
--- a/core-java-modules/core-java-lang-oop-2/pom.xml
+++ b/core-java-modules/core-java-lang-oop-2/pom.xml
@@ -1,7 +1,6 @@
 <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-oop-2</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-oop-2</name>
@@ -29,13 +28,6 @@
             <scope>test</scope>
         </dependency>
 	</dependencies>
-
-    <properties>
-        <h2.version>1.4.199</h2.version>
-        <!-- testing -->
-        <assertj-core.version>3.10.0</assertj-core.version>
-        <equalsverifier.version>3.0.3</equalsverifier.version>
-    </properties>
     
     <build>
         <finalName>core-java-lang-oop-2</finalName>
@@ -47,4 +39,10 @@
         </resources>
     </build>
 
+    <properties>
+        <!-- testing -->
+        <assertj-core.version>3.10.0</assertj-core.version>
+        <equalsverifier.version>3.0.3</equalsverifier.version>
+    </properties>
+
 </project>
diff --git a/core-java-modules/core-java-lang-oop-3/README.md b/core-java-modules/core-java-lang-oop-3/README.md
index c3a32124b5..4ac6c3ffe9 100644
--- a/core-java-modules/core-java-lang-oop-3/README.md
+++ b/core-java-modules/core-java-lang-oop-3/README.md
@@ -9,4 +9,9 @@ This module contains articles about Object-oriented programming (OOP) in Java
 - [Guide to the this Java Keyword](https://www.baeldung.com/java-this)
 - [Java Public Access Modifier](https://www.baeldung.com/java-public-keyword)
 - [Composition, Aggregation and Association in Java](https://www.baeldung.com/java-composition-aggregation-association)
+- [Nested Classes in Java](https://www.baeldung.com/java-nested-classes)
+- [A Guide to Inner Interfaces in Java](https://www.baeldung.com/java-inner-interfaces)
+- [Java Classes and Objects](https://www.baeldung.com/java-classes-objects)
+- [Java Interfaces](https://www.baeldung.com/java-interfaces)
+- [Static and Dynamic Binding in Java](https://www.baeldung.com/java-static-dynamic-binding)
 - [[<-- Prev]](/core-java-modules/core-java-lang-oop-2)
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang-oop-3/pom.xml b/core-java-modules/core-java-lang-oop-3/pom.xml
index 29807b5bef..1caf17bef3 100644
--- a/core-java-modules/core-java-lang-oop-3/pom.xml
+++ b/core-java-modules/core-java-lang-oop-3/pom.xml
@@ -1,7 +1,6 @@
 <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-oop-3</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-oop-3</name>
@@ -15,6 +14,24 @@
     </parent>
 
     <dependencies>
+        <!-- logging -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -23,4 +40,18 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <finalName>core-java-lang-oop-3</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+        <assertj-core.version>3.10.0</assertj-core.version>
+    </properties>
+
 </project>
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/binding/Animal.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/binding/Animal.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/binding/Animal.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/binding/Animal.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/binding/AnimalActivity.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/binding/AnimalActivity.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/binding/AnimalActivity.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/binding/AnimalActivity.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/binding/Cat.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/binding/Cat.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/binding/Cat.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/binding/Cat.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/CommaSeparatedCustomers.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/innerinterfaces/CommaSeparatedCustomers.java
similarity index 92%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/CommaSeparatedCustomers.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/innerinterfaces/CommaSeparatedCustomers.java
index 29ed2d3d26..a815720d62 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/CommaSeparatedCustomers.java
+++ b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/innerinterfaces/CommaSeparatedCustomers.java
@@ -1,4 +1,4 @@
-package com.baeldung.interfaces;
+package com.baeldung.innerinterfaces;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/Customer.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/innerinterfaces/Customer.java
similarity index 88%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/Customer.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/innerinterfaces/Customer.java
index d2f2b48074..ce27460cbb 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/Customer.java
+++ b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/innerinterfaces/Customer.java
@@ -1,4 +1,4 @@
-package com.baeldung.interfaces;
+package com.baeldung.innerinterfaces;
 
 public class Customer {
     public interface List {
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/Box.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/Box.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/Box.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/Box.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/Employee.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/Employee.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/Employee.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/Employee.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/EmployeeSalaryComparator.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/EmployeeSalaryComparator.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/EmployeeSalaryComparator.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/EmployeeSalaryComparator.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/HasColor.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/HasColor.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/HasColor.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/HasColor.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Car.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/multiinheritance/Car.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Car.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/multiinheritance/Car.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Fly.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/multiinheritance/Fly.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Fly.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/multiinheritance/Fly.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Transform.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/multiinheritance/Transform.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Transform.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/multiinheritance/Transform.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Vehicle.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/multiinheritance/Vehicle.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/multiinheritance/Vehicle.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/multiinheritance/Vehicle.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Circle.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/polymorphysim/Circle.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Circle.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/polymorphysim/Circle.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/MainTestClass.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/polymorphysim/MainTestClass.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/MainTestClass.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/polymorphysim/MainTestClass.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Shape.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/polymorphysim/Shape.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Shape.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/polymorphysim/Shape.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Square.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/polymorphysim/Square.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/interfaces/polymorphysim/Square.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/interfaces/polymorphysim/Square.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/objects/Car.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/objects/Car.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/objects/Car.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/objects/Car.java
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/parameterpassing/NonPrimitives.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/parameterpassing/NonPrimitives.java
similarity index 99%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/parameterpassing/NonPrimitives.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/parameterpassing/NonPrimitives.java
index 0e1746fc38..2c6ff3d683 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/parameterpassing/NonPrimitives.java
+++ b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/parameterpassing/NonPrimitives.java
@@ -17,7 +17,7 @@ public class NonPrimitives {
         b1.num++;
     }
 }
- 
+
 class FooClass {
     public int num;
    
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/parameterpassing/Primitives.java b/core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/parameterpassing/Primitives.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/parameterpassing/Primitives.java
rename to core-java-modules/core-java-lang-oop-3/src/main/java/com/baeldung/parameterpassing/Primitives.java
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/binding/AnimalActivityUnitTest.java b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/binding/AnimalActivityUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/binding/AnimalActivityUnitTest.java
rename to core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/binding/AnimalActivityUnitTest.java
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/binding/AnimalUnitTest.java b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/binding/AnimalUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/binding/AnimalUnitTest.java
rename to core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/binding/AnimalUnitTest.java
index a34640b58a..11201965d9 100644
--- a/core-java-modules/core-java-lang/src/test/java/com/baeldung/binding/AnimalUnitTest.java
+++ b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/binding/AnimalUnitTest.java
@@ -14,13 +14,13 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import java.util.List;
-
 /**
  * Created by madhumita.g on 01-08-2018.
  */
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/binding/CatUnitTest.java b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/binding/CatUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/binding/CatUnitTest.java
rename to core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/binding/CatUnitTest.java
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/interfaces/InnerInterfaceUnitTest.java b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/innerinterfaces/InnerInterfaceUnitTest.java
similarity index 78%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/interfaces/InnerInterfaceUnitTest.java
rename to core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/innerinterfaces/InnerInterfaceUnitTest.java
index 65d7c860a8..65e51ed93d 100644
--- a/core-java-modules/core-java-lang/src/test/java/com/baeldung/interfaces/InnerInterfaceUnitTest.java
+++ b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/innerinterfaces/InnerInterfaceUnitTest.java
@@ -1,11 +1,13 @@
-package com.baeldung.interfaces;
-
-import static org.junit.Assert.assertEquals;
+package com.baeldung.innerinterfaces;
 
+import com.baeldung.innerinterfaces.CommaSeparatedCustomers;
+import com.baeldung.innerinterfaces.Customer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import static org.junit.Assert.assertEquals;
+
 @RunWith(JUnit4.class)
 public class InnerInterfaceUnitTest {
     @Test
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/AnonymousInner.java b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/nestedclass/AnonymousInner.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/AnonymousInner.java
rename to core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/nestedclass/AnonymousInner.java
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/Enclosing.java b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/nestedclass/Enclosing.java
similarity index 81%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/Enclosing.java
rename to core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/nestedclass/Enclosing.java
index 3db33cde9b..a7c0e1b29f 100644
--- a/core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/Enclosing.java
+++ b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/nestedclass/Enclosing.java
@@ -15,7 +15,7 @@ public class Enclosing {
 
     @Test
     public void test() {
-        Enclosing.StaticNested nested = new Enclosing.StaticNested();
+        StaticNested nested = new StaticNested();
         nested.run();
     }
 }
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/NewEnclosing.java b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/nestedclass/NewEnclosing.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/NewEnclosing.java
rename to core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/nestedclass/NewEnclosing.java
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/NewOuter.java b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/nestedclass/NewOuter.java
similarity index 91%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/NewOuter.java
rename to core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/nestedclass/NewOuter.java
index 260f69fd1b..37c8be7817 100644
--- a/core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/NewOuter.java
+++ b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/nestedclass/NewOuter.java
@@ -23,7 +23,7 @@ public class NewOuter {
     @Test
     public void test() {
         NewOuter outer = new NewOuter();
-        NewOuter.InnerClass inner = outer.new InnerClass();
+        InnerClass inner = outer.new InnerClass();
         inner.run();
 
     }
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/Outer.java b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/nestedclass/Outer.java
similarity index 86%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/Outer.java
rename to core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/nestedclass/Outer.java
index d5e46670c9..196cd6cd38 100644
--- a/core-java-modules/core-java-lang/src/test/java/com/baeldung/nestedclass/Outer.java
+++ b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/nestedclass/Outer.java
@@ -14,7 +14,7 @@ public class Outer {
     @Test
     public void test() {
         Outer outer = new Outer();
-        Outer.Inner inner = outer.new Inner();
+        Inner inner = outer.new Inner();
         inner.run();
     }
 }
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/objects/CarUnitTest.java b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/objects/ObjectsUnitTest.java
similarity index 96%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/objects/CarUnitTest.java
rename to core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/objects/ObjectsUnitTest.java
index a1ef20523e..e0f8766be4 100644
--- a/core-java-modules/core-java-lang/src/test/java/com/baeldung/objects/CarUnitTest.java
+++ b/core-java-modules/core-java-lang-oop-3/src/test/java/com/baeldung/objects/ObjectsUnitTest.java
@@ -1,11 +1,11 @@
 package com.baeldung.objects;
 
-import static org.junit.Assert.*;
-
 import org.junit.Before;
 import org.junit.Test;
 
-public class CarUnitTest {
+import static org.junit.Assert.*;
+
+public class ObjectsUnitTest {
     
     private Car car;
 
diff --git a/core-java-modules/core-java-lang-oop/pom.xml b/core-java-modules/core-java-lang-oop/pom.xml
index d86347b51f..bdd9857dfa 100644
--- a/core-java-modules/core-java-lang-oop/pom.xml
+++ b/core-java-modules/core-java-lang-oop/pom.xml
@@ -1,7 +1,6 @@
 <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-oop</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-oop</name>
@@ -32,23 +31,6 @@
             <artifactId>gson</artifactId>
             <version>${gson.version}</version>
         </dependency>
-        <!-- logging -->
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>
diff --git a/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/deepcopy/DeepCopyUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/deepcopy/DeepCopyUnitTest.java
index d6b1cd90b9..d60ab155dc 100644
--- a/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/deepcopy/DeepCopyUnitTest.java
+++ b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/deepcopy/DeepCopyUnitTest.java
@@ -25,7 +25,7 @@ public class DeepCopyUnitTest {
     }
 
     @Test
-    public void whenModifyingOriginalObject_thenConstructorCopyShouldNotChange() {
+    public void whenModifyingOriginalObject_thenCopyShouldNotChange() {
         Address address = new Address("Downing St 10", "London", "England");
         User pm = new User("Prime", "Minister", address);
         User deepCopy = new User(pm);
@@ -125,4 +125,13 @@ public class DeepCopyUnitTest {
         end = System.currentTimeMillis();
         System.out.println("Cloning with Jackson took " + (end - start) + " milliseconds.");
     }
+    
+    @Test
+    public void whenModifyingOriginalObject_ThenCopyShouldChange() {
+        Address address = new Address("Downing St 10", "London", "England");
+        User pm = new User("Prime", "Minister", address);
+        User shallowCopy = new User(pm.getFirstName(), pm.getLastName(), pm.getAddress());
+        address.setCountry("Great Britain");
+        assertThat(shallowCopy.getAddress().getCountry()).isEqualTo(pm.getAddress().getCountry());
+    }
 }
diff --git a/core-java-modules/core-java-lang-operators/README.md b/core-java-modules/core-java-lang-operators/README.md
index 280c630882..c4f5049d61 100644
--- a/core-java-modules/core-java-lang-operators/README.md
+++ b/core-java-modules/core-java-lang-operators/README.md
@@ -4,3 +4,6 @@
 - [The Modulo Operator in Java](https://www.baeldung.com/modulo-java)
 - [Java instanceof Operator](https://www.baeldung.com/java-instanceof)
 - [A Guide to Increment and Decrement Unary Operators in Java](https://www.baeldung.com/java-unary-operators)
+- [Java Compound Operators](https://www.baeldung.com/java-compound-operators)
+- [The XOR Operator in Java](https://www.baeldung.com/java-xor-operator)
+
diff --git a/core-java-modules/core-java-lang-operators/pom.xml b/core-java-modules/core-java-lang-operators/pom.xml
index 58cab9d507..81865552dd 100644
--- a/core-java-modules/core-java-lang-operators/pom.xml
+++ b/core-java-modules/core-java-lang-operators/pom.xml
@@ -2,7 +2,6 @@
          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>
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/compoundoperators/CompoundOperatorsUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/compoundoperators/CompoundOperatorsUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/compoundoperators/CompoundOperatorsUnitTest.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/compoundoperators/CompoundOperatorsUnitTest.java
diff --git a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Car.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/Car.java
similarity index 62%
rename from core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Car.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/Car.java
index a680c4e670..7fa52a5eb1 100644
--- a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Car.java
+++ b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/Car.java
@@ -1,4 +1,4 @@
-package com.baeldung.java.diamond;
+package com.baeldung.diamondoperator;
 
 public class Car<T extends Engine> implements Vehicle<T> {
 
diff --git a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/DiamondOperatorUnitTest.java
similarity index 87%
rename from core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/DiamondOperatorUnitTest.java
index ee5f639926..b50119b3c6 100644
--- a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java
+++ b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/DiamondOperatorUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.java.diamond;
+package com.baeldung.diamondoperator;
 
 import static org.junit.Assert.assertNotNull;
 
diff --git a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Diesel.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/Diesel.java
similarity index 76%
rename from core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Diesel.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/Diesel.java
index 90eb7d9340..0b92d11318 100644
--- a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Diesel.java
+++ b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/Diesel.java
@@ -1,4 +1,4 @@
-package com.baeldung.java.diamond;
+package com.baeldung.diamondoperator;
 
 public class Diesel implements Engine {
 
diff --git a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Engine.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/Engine.java
similarity index 54%
rename from core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Engine.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/Engine.java
index 746baf3254..0afd48114a 100644
--- a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Engine.java
+++ b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/Engine.java
@@ -1,4 +1,4 @@
-package com.baeldung.java.diamond;
+package com.baeldung.diamondoperator;
 
 public interface Engine {
 
diff --git a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Vehicle.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/Vehicle.java
similarity index 56%
rename from core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Vehicle.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/Vehicle.java
index 8395cdd970..89a5dfefef 100644
--- a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Vehicle.java
+++ b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/diamondoperator/Vehicle.java
@@ -1,4 +1,4 @@
-package com.baeldung.java.diamond;
+package com.baeldung.diamondoperator;
 
 public interface Vehicle<T extends Engine> {
 
diff --git a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/keyword/InstanceOfUnitTest.java
similarity index 97%
rename from core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/keyword/InstanceOfUnitTest.java
index 6966fa3944..0e082b69d3 100644
--- a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java
+++ b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/keyword/InstanceOfUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.keyword.test;
+package com.baeldung.keyword;
 
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
diff --git a/core-java-modules/core-java-lang-syntax-2/README.md b/core-java-modules/core-java-lang-syntax-2/README.md
index d8daadf2aa..a3b11865af 100644
--- a/core-java-modules/core-java-lang-syntax-2/README.md
+++ b/core-java-modules/core-java-lang-syntax-2/README.md
@@ -5,4 +5,10 @@ This module contains articles about Java syntax
 ### Relevant Articles: 
 
 - [Java ‘private’ Access Modifier](https://www.baeldung.com/java-private-keyword)
+- [Guide to Java Packages](https://www.baeldung.com/java-packages)
+- [If-Else Statement in Java](https://www.baeldung.com/java-if-else)
+- [Control Structures in Java](https://www.baeldung.com/java-control-structures)
+- [Java Double Brace Initialization](https://www.baeldung.com/java-double-brace-initialization)
+- [The Java Native Keyword and Methods](https://www.baeldung.com/java-native)
+- [Variable Scope in Java](https://www.baeldung.com/java-variable-scope)
 - [[<-- Prev]](/core-java-modules/core-java-lang-syntax)
diff --git a/core-java-modules/core-java-lang-syntax-2/pom.xml b/core-java-modules/core-java-lang-syntax-2/pom.xml
index 1a8316628f..98eea99fc0 100644
--- a/core-java-modules/core-java-lang-syntax-2/pom.xml
+++ b/core-java-modules/core-java-lang-syntax-2/pom.xml
@@ -1,7 +1,6 @@
 <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-syntax-2</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-syntax-2</name>
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/controlstructures/ConditionalBranches.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/controlstructures/ConditionalBranches.java
similarity index 97%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/controlstructures/ConditionalBranches.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/controlstructures/ConditionalBranches.java
index bace609699..e15386f048 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/controlstructures/ConditionalBranches.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/controlstructures/ConditionalBranches.java
@@ -1,4 +1,4 @@
-package com.baeldung.controlstructures;
+package com.baeldung.core.controlstructures;
 
 public class ConditionalBranches {
 
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/controlstructures/Loops.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/controlstructures/Loops.java
similarity index 99%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/controlstructures/Loops.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/controlstructures/Loops.java
index bc4515bfc7..9d73127cae 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/controlstructures/Loops.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/controlstructures/Loops.java
@@ -1,4 +1,4 @@
-package com.baeldung.controlstructures;
+package com.baeldung.core.controlstructures;
 
 public class Loops {
 
diff --git a/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/FirstClass.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/FirstClass.java
new file mode 100644
index 0000000000..a80387d61a
--- /dev/null
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/FirstClass.java
@@ -0,0 +1,18 @@
+package com.baeldung.core.modifiers;
+
+public class FirstClass {
+
+    protected String name;
+    
+    protected FirstClass(String name) {
+        this.name = name;
+    }
+
+    protected String getName() {
+        return name;
+    }
+
+    protected static class InnerClass {
+        public InnerClass() {}
+    }
+}
diff --git a/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/GenericClass.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/GenericClass.java
new file mode 100644
index 0000000000..83381931d0
--- /dev/null
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/GenericClass.java
@@ -0,0 +1,15 @@
+package com.baeldung.core.modifiers;
+
+public class GenericClass {
+
+    public static void main(String[] args) {
+        // accessing protected constructor
+        FirstClass first = new FirstClass("random name");
+        // using protected method
+        System.out.println("FirstClass name is " + first.getName());
+        // accessing a protected field
+        first.name = "new name";
+        // instantiating protected inner class
+        FirstClass.InnerClass innerClass = new FirstClass.InnerClass();
+    }
+}
diff --git a/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/otherpackage/SecondClass.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/otherpackage/SecondClass.java
new file mode 100644
index 0000000000..528f97539a
--- /dev/null
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/otherpackage/SecondClass.java
@@ -0,0 +1,18 @@
+package com.baeldung.core.modifiers.otherpackage;
+
+import com.baeldung.core.modifiers.FirstClass;
+
+public class SecondClass extends FirstClass {
+    
+    public SecondClass(String name) {
+        // accessing protected constructor
+        super(name);
+        // using protected method
+        System.out.println("SecondClass name is " + this.getName());
+        // accessing a protected field
+        this.name = "new name";
+        // instantiating protected inner class -> add public constructor to InnerClass
+        FirstClass.InnerClass innerClass = new FirstClass.InnerClass();
+    }
+      
+}
diff --git a/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/otherpackage/SecondGenericClass.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/otherpackage/SecondGenericClass.java
new file mode 100644
index 0000000000..d29533edef
--- /dev/null
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/otherpackage/SecondGenericClass.java
@@ -0,0 +1,20 @@
+package com.baeldung.core.modifiers.otherpackage;
+
+import com.baeldung.core.modifiers.FirstClass;
+//import com.baeldung.core.modifiers.FirstClass.InnerClass;
+
+public class SecondGenericClass {
+
+    // uncomment the following lines to see the errors
+    public static void main(String[] args) {
+        // accessing protected constructor
+        // FirstClass first = new FirstClass("random name");
+        // using protected method
+        // System.out.println("FirstClass name is " + first.getName());
+        // accessing a protected field
+        // first.name = "new name";
+        // instantiating protected inner class
+        // FirstClass.InnerClass innerClass = new FirstClass.InnerClass();
+    }
+
+}
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/nativekeyword/DateTimeUtils.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/nativekeyword/DateTimeUtils.java
similarity index 78%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/nativekeyword/DateTimeUtils.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/nativekeyword/DateTimeUtils.java
index 0762b0eb8a..1d101719ca 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/nativekeyword/DateTimeUtils.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/nativekeyword/DateTimeUtils.java
@@ -1,4 +1,4 @@
-package com.baeldung.nativekeyword;
+package com.baeldung.core.nativekeyword;
 
 public class DateTimeUtils {
 
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/nativekeyword/NativeMainApp.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/nativekeyword/NativeMainApp.java
similarity index 74%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/nativekeyword/NativeMainApp.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/nativekeyword/NativeMainApp.java
index 76fe548ed3..4bf6b88840 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/nativekeyword/NativeMainApp.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/nativekeyword/NativeMainApp.java
@@ -1,6 +1,4 @@
-package com.baeldung.nativekeyword;
-
-import com.baeldung.nativekeyword.DateTimeUtils;
+package com.baeldung.core.nativekeyword;
 
 public class NativeMainApp {
     public static void main(String[] args) {
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/TodoApp.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/packages/TodoApp.java
similarity index 86%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/TodoApp.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/packages/TodoApp.java
index 0f4a56f708..d8283f6b0d 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/TodoApp.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/packages/TodoApp.java
@@ -1,9 +1,9 @@
-package com.baeldung.packages;
+package com.baeldung.core.packages;
+
+import com.baeldung.core.packages.domain.TodoItem;
 
 import java.time.LocalDate;
 
-import com.baeldung.packages.domain.TodoItem;
-
 public class TodoApp {
 
     public static void main(String[] args) {
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/TodoList.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/packages/TodoList.java
similarity index 84%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/TodoList.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/packages/TodoList.java
index 6ed6cd4ec1..f9f6ac3aca 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/TodoList.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/packages/TodoList.java
@@ -1,10 +1,10 @@
-package com.baeldung.packages;
+package com.baeldung.core.packages;
+
+import com.baeldung.core.packages.domain.TodoItem;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.baeldung.packages.domain.TodoItem;
-
 public class TodoList {
     private List<TodoItem> todoItems;
 
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/domain/TodoItem.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/packages/domain/TodoItem.java
similarity index 94%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/domain/TodoItem.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/packages/domain/TodoItem.java
index 972e574a7f..195f763974 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/packages/domain/TodoItem.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/packages/domain/TodoItem.java
@@ -1,4 +1,4 @@
-package com.baeldung.packages.domain;
+package com.baeldung.core.packages.domain;
 
 import java.time.LocalDate;
 
diff --git a/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/Employee.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/privatemodifier/Employee.java
similarity index 96%
rename from core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/Employee.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/privatemodifier/Employee.java
index 6ec68d6ebb..4598400e93 100644
--- a/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/Employee.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/privatemodifier/Employee.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.modifiers;
+package com.baeldung.core.privatemodifier;
 
 public class Employee {
 
diff --git a/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/ExampleClass.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/privatemodifier/ExampleClass.java
similarity index 84%
rename from core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/ExampleClass.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/privatemodifier/ExampleClass.java
index 41f0b7a690..8659b4ad9c 100644
--- a/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/ExampleClass.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/privatemodifier/ExampleClass.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.modifiers;
+package com.baeldung.core.privatemodifier;
 
 public class ExampleClass {
 
diff --git a/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/PublicOuterClass.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/privatemodifier/PublicOuterClass.java
similarity index 90%
rename from core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/PublicOuterClass.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/privatemodifier/PublicOuterClass.java
index 329ebf3bb6..8a9e8a8eb3 100644
--- a/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/modifiers/PublicOuterClass.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/privatemodifier/PublicOuterClass.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.modifiers;
+package com.baeldung.core.privatemodifier;
 
 public class PublicOuterClass {
 
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/BracketScopeExample.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/BracketScopeExample.java
similarity index 89%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/BracketScopeExample.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/BracketScopeExample.java
index 8deec35c16..99feeb060d 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/BracketScopeExample.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/BracketScopeExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.scope;
+package com.baeldung.core.scope;
 
 public class BracketScopeExample {
 
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/ClassScopeExample.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/ClassScopeExample.java
similarity index 86%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/ClassScopeExample.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/ClassScopeExample.java
index c81fcc9550..8bcfee44f2 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/ClassScopeExample.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/ClassScopeExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.scope;
+package com.baeldung.core.scope;
 
 public class ClassScopeExample {
 
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/LoopScopeExample.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/LoopScopeExample.java
similarity index 92%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/LoopScopeExample.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/LoopScopeExample.java
index be41252623..8067085404 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/LoopScopeExample.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/LoopScopeExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.scope;
+package com.baeldung.core.scope;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/MethodScopeExample.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/MethodScopeExample.java
similarity index 87%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/MethodScopeExample.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/MethodScopeExample.java
index 63a6a25271..86b2021c6d 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/MethodScopeExample.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/MethodScopeExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.scope;
+package com.baeldung.core.scope;
 
 public class MethodScopeExample {
 
diff --git a/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/NestedScopesExample.java b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/NestedScopesExample.java
similarity index 86%
rename from core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/NestedScopesExample.java
rename to core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/NestedScopesExample.java
index c3c5bec221..51351d237c 100644
--- a/core-java-modules/core-java-lang/src/main/java/com/baeldung/scope/NestedScopesExample.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/main/java/com/baeldung/core/scope/NestedScopesExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.scope;
+package com.baeldung.core.scope;
 
 public class NestedScopesExample {
 
diff --git a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java b/core-java-modules/core-java-lang-syntax-2/src/test/java/com/baeldung/core/doublebrace/DoubleBraceUnitTest.java
similarity index 96%
rename from core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java
rename to core-java-modules/core-java-lang-syntax-2/src/test/java/com/baeldung/core/doublebrace/DoubleBraceUnitTest.java
index b03b01d074..fe47dd4c26 100644
--- a/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/test/java/com/baeldung/core/doublebrace/DoubleBraceUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.java.doublebrace;
+package com.baeldung.core.doublebrace;
 
 import org.junit.Test;
 
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/nativekeyword/DateTimeUtilsManualTest.java b/core-java-modules/core-java-lang-syntax-2/src/test/java/com/baeldung/core/nativekeyword/DateTimeUtilsManualTest.java
similarity index 95%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/nativekeyword/DateTimeUtilsManualTest.java
rename to core-java-modules/core-java-lang-syntax-2/src/test/java/com/baeldung/core/nativekeyword/DateTimeUtilsManualTest.java
index ac27c11c68..1c70acc483 100644
--- a/core-java-modules/core-java-lang/src/test/java/com/baeldung/nativekeyword/DateTimeUtilsManualTest.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/test/java/com/baeldung/core/nativekeyword/DateTimeUtilsManualTest.java
@@ -1,11 +1,11 @@
-package com.baeldung.nativekeyword;
-
-import static org.junit.Assert.assertNotNull;
+package com.baeldung.core.nativekeyword;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
 
+import static org.junit.Assert.assertNotNull;
+
 public class DateTimeUtilsManualTest {
 
     private static final Logger LOG = org.slf4j.LoggerFactory.getLogger(DateTimeUtilsManualTest.class);
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/packages/PackagesUnitTest.java b/core-java-modules/core-java-lang-syntax-2/src/test/java/com/baeldung/core/packages/PackagesUnitTest.java
similarity index 85%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/packages/PackagesUnitTest.java
rename to core-java-modules/core-java-lang-syntax-2/src/test/java/com/baeldung/core/packages/PackagesUnitTest.java
index 212fb7b3c7..b1237e9948 100644
--- a/core-java-modules/core-java-lang/src/test/java/com/baeldung/packages/PackagesUnitTest.java
+++ b/core-java-modules/core-java-lang-syntax-2/src/test/java/com/baeldung/core/packages/PackagesUnitTest.java
@@ -1,12 +1,11 @@
-package com.baeldung.packages;
+package com.baeldung.core.packages;
 
-import static org.junit.Assert.assertEquals;
+import com.baeldung.core.packages.domain.TodoItem;
+import org.junit.Test;
 
 import java.time.LocalDate;
 
-import org.junit.Test;
-
-import com.baeldung.packages.domain.TodoItem;
+import static org.junit.Assert.assertEquals;
 
 public class PackagesUnitTest {
 
diff --git a/core-java-modules/core-java-lang-syntax/README.md b/core-java-modules/core-java-lang-syntax/README.md
index 6f3120ec2c..25f5c63dbc 100644
--- a/core-java-modules/core-java-lang-syntax/README.md
+++ b/core-java-modules/core-java-lang-syntax/README.md
@@ -3,20 +3,14 @@
 This module contains articles about Java syntax
 
 ### Relevant Articles: 
-- [The Basics of Java Generics](http://www.baeldung.com/java-generics)
-- [Java Primitive Conversions](http://www.baeldung.com/java-primitive-conversions)
-- [Java Double Brace Initialization](http://www.baeldung.com/java-double-brace-initialization)
-- [Guide to the Diamond Operator in Java](http://www.baeldung.com/java-diamond-operator)
-- [The Java continue and break Keywords](http://www.baeldung.com/java-continue-and-break)
-- [A Guide to Creating Objects in Java](http://www.baeldung.com/java-initialization)
-- [A Guide to Java Loops](http://www.baeldung.com/java-loops)
-- [Varargs in Java](http://www.baeldung.com/java-varargs)
-- [A Guide to Java Enums](http://www.baeldung.com/a-guide-to-java-enums)
-- [Infinite Loops in Java](http://www.baeldung.com/infinite-loops-java)
-- [Quick Guide to java.lang.System](http://www.baeldung.com/java-lang-system)
+- [The Basics of Java Generics](https://www.baeldung.com/java-generics)
+- [Java Primitive Conversions](https://www.baeldung.com/java-primitive-conversions)
+- [The Java continue and break Keywords](https://www.baeldung.com/java-continue-and-break)
+- [A Guide to Creating Objects in Java](https://www.baeldung.com/java-initialization)
+- [A Guide to Java Loops](https://www.baeldung.com/java-loops)
+- [Varargs in Java](https://www.baeldung.com/java-varargs)
+- [A Guide to Java Enums](https://www.baeldung.com/a-guide-to-java-enums)
+- [Infinite Loops in Java](https://www.baeldung.com/infinite-loops-java)
 - [Java Switch Statement](https://www.baeldung.com/java-switch)
-- [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)
 - [[More -->]](/core-java-modules/core-java-lang-syntax-2)
diff --git a/core-java-modules/core-java-lang-syntax/pom.xml b/core-java-modules/core-java-lang-syntax/pom.xml
index 46fa8d1206..f4549b689d 100644
--- a/core-java-modules/core-java-lang-syntax/pom.xml
+++ b/core-java-modules/core-java-lang-syntax/pom.xml
@@ -1,7 +1,6 @@
 <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-syntax</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-syntax</name>
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/generics/Generics.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/generics/Generics.java
index 1c4082c58b..b8d4aa3263 100644
--- a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/generics/Generics.java
+++ b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/generics/Generics.java
@@ -35,4 +35,11 @@ public class Generics {
         return list;
     }
 
+    public <T> List<T> genericMethod(List<T> list) {
+        return list.stream().collect(Collectors.toList());
+    }
+    
+    public List<Object> withErasure(List<Object> list) {
+        return list.stream().collect(Collectors.toList());
+    }
 }
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/loops/WhenUsingLoops.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/loops/LoopsUnitTest.java
similarity index 98%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/loops/WhenUsingLoops.java
rename to core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/loops/LoopsUnitTest.java
index f82f9ddaa7..5a8b116a2c 100644
--- a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/loops/WhenUsingLoops.java
+++ b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/loops/LoopsUnitTest.java
@@ -12,7 +12,7 @@ import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class WhenUsingLoops {
+public class LoopsUnitTest {
 
     private LoopsInJava loops = new LoopsInJava();
     private static List<String> list = new ArrayList<>();
diff --git a/core-java-modules/core-java-lang/README.md b/core-java-modules/core-java-lang/README.md
index 4b211177d9..9b485d80e9 100644
--- a/core-java-modules/core-java-lang/README.md
+++ b/core-java-modules/core-java-lang/README.md
@@ -3,32 +3,14 @@
 This module contains articles about core features in the Java language
 
 ### Relevant Articles: 
-
 - [Generate equals() and hashCode() with Eclipse](https://www.baeldung.com/java-eclipse-equals-and-hashcode)
 - [Iterating Over Enum Values in Java](https://www.baeldung.com/java-enum-iteration)
-- [Java Double Brace Initialization](https://www.baeldung.com/java-double-brace-initialization)
-- [Guide to the Diamond Operator in Java](https://www.baeldung.com/java-diamond-operator)
 - [Comparator and Comparable in Java](https://www.baeldung.com/java-comparator-comparable)
-- [The Java continue and break Keywords](https://www.baeldung.com/java-continue-and-break)
-- [Nested Classes in Java](https://www.baeldung.com/java-nested-classes)
-- [A Guide to Inner Interfaces in Java](https://www.baeldung.com/java-inner-interfaces)
 - [Recursion In Java](https://www.baeldung.com/java-recursion)
 - [A Guide to the finalize Method in Java](https://www.baeldung.com/java-finalize)
-- [Infinite Loops in Java](https://www.baeldung.com/infinite-loops-java)
 - [Quick Guide to java.lang.System](https://www.baeldung.com/java-lang-system)
 - [Using Java Assertions](https://www.baeldung.com/java-assert)
-- [Static and Dynamic Binding in Java](https://www.baeldung.com/java-static-dynamic-binding)
 - [Synthetic Constructs in Java](https://www.baeldung.com/java-synthetic)
-- [How to Separate Double into Integer and Decimal Parts](https://www.baeldung.com/java-separate-double-into-integer-decimal-parts)
 - [Retrieving a Class Name in Java](https://www.baeldung.com/java-class-name)
-- [Java Compound Operators](https://www.baeldung.com/java-compound-operators)
-- [Guide to Java Packages](https://www.baeldung.com/java-packages)
-- [The Java Native Keyword and Methods](https://www.baeldung.com/java-native)
-- [If-Else Statement in Java](https://www.baeldung.com/java-if-else)
-- [Control Structures in Java](https://www.baeldung.com/java-control-structures)
-- [Java Interfaces](https://www.baeldung.com/java-interfaces)
 - [Attaching Values to Java Enum](https://www.baeldung.com/java-enum-values)
-- [Variable Scope in Java](https://www.baeldung.com/java-variable-scope)
-- [Java Classes and Objects](https://www.baeldung.com/java-classes-objects)
-- [A Guide to Java Enums](https://www.baeldung.com/a-guide-to-java-enums)
 - [[More --> ]](/core-java-modules/core-java-lang-2)
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang/pom.xml b/core-java-modules/core-java-lang/pom.xml
index 1a2b86f872..10b0526177 100644
--- a/core-java-modules/core-java-lang/pom.xml
+++ b/core-java-modules/core-java-lang/pom.xml
@@ -1,7 +1,6 @@
 <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</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang</name>
@@ -14,44 +13,6 @@
         <relativePath>../../parent-java</relativePath>
     </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <!-- web -->
-        <!-- marshalling -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
-        <!-- logging -->
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
-        <!-- 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</finalName>
         <resources>
@@ -62,10 +23,4 @@
         </resources>
     </build>
 
-    <properties>
-        <gson.version>2.8.2</gson.version>
-        <!-- 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/system/ChatWindow.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/system/ChatWindow.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/ChatWindow.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/system/ChatWindow.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/DateTimeService.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/system/DateTimeService.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/DateTimeService.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/system/DateTimeService.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/EnvironmentVariables.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/system/EnvironmentVariables.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/EnvironmentVariables.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/system/EnvironmentVariables.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemErrDemo.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/system/SystemErrDemo.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemErrDemo.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/system/SystemErrDemo.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemExitDemo.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/system/SystemExitDemo.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemExitDemo.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/system/SystemExitDemo.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemOutDemo.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/system/SystemOutDemo.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/SystemOutDemo.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/system/SystemOutDemo.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/UserCredentials.java b/core-java-modules/core-java-lang/src/main/java/com/baeldung/system/UserCredentials.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/system/UserCredentials.java
rename to core-java-modules/core-java-lang/src/main/java/com/baeldung/system/UserCredentials.java
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/java/enumiteration/DaysOfWeekEnum.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/iteration/DaysOfWeekEnum.java
similarity index 92%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/java/enumiteration/DaysOfWeekEnum.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/iteration/DaysOfWeekEnum.java
index 89e718adf3..f25ddfa6dd 100644
--- a/core-java-modules/core-java-lang/src/test/java/com/baeldung/java/enumiteration/DaysOfWeekEnum.java
+++ b/core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/iteration/DaysOfWeekEnum.java
@@ -1,4 +1,4 @@
-package com.baeldung.java.enumiteration;
+package com.baeldung.enums.iteration;
 
 import java.util.stream.Stream;
 
diff --git a/core-java-modules/core-java-lang/src/test/java/com/baeldung/java/enumiteration/EnumIterationExamples.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/iteration/EnumIterationExamples.java
similarity index 97%
rename from core-java-modules/core-java-lang/src/test/java/com/baeldung/java/enumiteration/EnumIterationExamples.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/iteration/EnumIterationExamples.java
index 110943e39f..9b058aef83 100644
--- a/core-java-modules/core-java-lang/src/test/java/com/baeldung/java/enumiteration/EnumIterationExamples.java
+++ b/core-java-modules/core-java-lang/src/test/java/com/baeldung/enums/iteration/EnumIterationExamples.java
@@ -1,4 +1,4 @@
-package com.baeldung.java.enumiteration;
+package com.baeldung.enums.iteration;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/DateTimeServiceUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/system/DateTimeServiceUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/DateTimeServiceUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/system/DateTimeServiceUnitTest.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/EnvironmentVariablesUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/system/EnvironmentVariablesUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/EnvironmentVariablesUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/system/EnvironmentVariablesUnitTest.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemArrayCopyUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/system/SystemArrayCopyUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemArrayCopyUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/system/SystemArrayCopyUnitTest.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemNanoUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/system/SystemNanoUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemNanoUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/system/SystemNanoUnitTest.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemPropertiesUnitTest.java b/core-java-modules/core-java-lang/src/test/java/com/baeldung/system/SystemPropertiesUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/system/SystemPropertiesUnitTest.java
rename to core-java-modules/core-java-lang/src/test/java/com/baeldung/system/SystemPropertiesUnitTest.java
diff --git a/core-java-modules/core-java-networking/pom.xml b/core-java-modules/core-java-networking/pom.xml
index b5071bf7df..cd84d2a27c 100644
--- a/core-java-modules/core-java-networking/pom.xml
+++ b/core-java-modules/core-java-networking/pom.xml
@@ -14,11 +14,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
diff --git a/core-java-modules/core-java-nio/README.md b/core-java-modules/core-java-nio/README.md
index efa58671b5..727bd2546c 100644
--- a/core-java-modules/core-java-nio/README.md
+++ b/core-java-modules/core-java-nio/README.md
@@ -5,3 +5,4 @@ This module contains articles about core Java non-blocking input and output (IO)
 ## Relevant Articles:
 
 - [Determine File Creation Date in Java](https://www.baeldung.com/java-file-creation-date)
+- [Find the Number of Lines in a File Using Jav](https://www.baeldung.com/java-file-number-of-lines)
diff --git a/core-java-modules/core-java-optional/pom.xml b/core-java-modules/core-java-optional/pom.xml
index d5ccd43e55..38d7565282 100644
--- a/core-java-modules/core-java-optional/pom.xml
+++ b/core-java-modules/core-java-optional/pom.xml
@@ -44,25 +44,7 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                </configuration>
-            </plugin>
-        </plugins>
-
-    </build>
-
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <hibernate.core.version>5.4.0.Final</hibernate.core.version>
         <jmh-core.version>1.19</jmh-core.version>
         <jmh-generator.version>1.19</jmh-generator.version>
diff --git a/core-java-modules/core-java-os/pom.xml b/core-java-modules/core-java-os/pom.xml
index 16391e968d..f09b62ebf2 100644
--- a/core-java-modules/core-java-os/pom.xml
+++ b/core-java-modules/core-java-os/pom.xml
@@ -64,7 +64,7 @@
         </resources>
 
         <plugins>
-         <plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
diff --git a/core-java-modules/core-java-perf/pom.xml b/core-java-modules/core-java-perf/pom.xml
index b9c9d30ac0..a6e20f198d 100644
--- a/core-java-modules/core-java-perf/pom.xml
+++ b/core-java-modules/core-java-perf/pom.xml
@@ -1,7 +1,6 @@
 <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-perf</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-perf</name>
@@ -14,13 +13,4 @@
         <relativePath>../../parent-java</relativePath>
     </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-       
-    </dependencies>
-
 </project>
diff --git a/core-java-modules/core-java-security-manager/pom.xml b/core-java-modules/core-java-security-manager/pom.xml
index 51d5e7d78f..f5be1639da 100644
--- a/core-java-modules/core-java-security-manager/pom.xml
+++ b/core-java-modules/core-java-security-manager/pom.xml
@@ -10,25 +10,5 @@
         <artifactId>core-java-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
-  
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                </configuration>
-            </plugin>
-        </plugins>
 
-    </build>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
 </project>
diff --git a/core-java-modules/core-java-security/README.md b/core-java-modules/core-java-security/README.md
index 48fd071396..7386d04e8e 100644
--- a/core-java-modules/core-java-security/README.md
+++ b/core-java-modules/core-java-security/README.md
@@ -14,3 +14,5 @@ This module contains articles about core Java Security
 - [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)
 - [An Introduction to Java SASL](https://www.baeldung.com/java-sasl)
+- [A Guide to Java GSS API](https://www.baeldung.com/java-gss)
+
diff --git a/core-java-modules/core-java-security/pom.xml b/core-java-modules/core-java-security/pom.xml
index d3efb26fe8..e882fd823e 100644
--- a/core-java-modules/core-java-security/pom.xml
+++ b/core-java-modules/core-java-security/pom.xml
@@ -1,7 +1,6 @@
 <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-security</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-security</name>
@@ -15,11 +14,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>
diff --git a/core-java-modules/core-java-streams/pom.xml b/core-java-modules/core-java-streams/pom.xml
index 4ff8e8aaba..96d97f3759 100644
--- a/core-java-modules/core-java-streams/pom.xml
+++ b/core-java-modules/core-java-streams/pom.xml
@@ -1,7 +1,6 @@
 <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-streams</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-streams</name>
@@ -15,17 +14,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>
@@ -48,7 +36,5 @@
     <properties>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <!-- plugins -->
-        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
     </properties>
 </project>
diff --git a/core-java-modules/core-java-string-apis/README.md b/core-java-modules/core-java-string-apis/README.md
new file mode 100644
index 0000000000..fc36ba8640
--- /dev/null
+++ b/core-java-modules/core-java-string-apis/README.md
@@ -0,0 +1,12 @@
+## Java String APIs
+
+This module contains articles about string APIs.
+
+### Relevant Articles:
+- [Java 8 StringJoiner](https://www.baeldung.com/java-string-joiner)
+- [Quick Guide to the Java StringTokenizer](https://www.baeldung.com/java-stringtokenizer)
+- [Guide to java.util.Formatter](https://www.baeldung.com/java-string-formatter)
+- [Guide to StreamTokenizer](https://www.baeldung.com/java-streamtokenizer)
+- [CharSequence vs. String in Java](https://www.baeldung.com/java-char-sequence-string)
+- [StringBuilder and StringBuffer in Java](https://www.baeldung.com/java-string-builder-string-buffer)
+- [Generate a Secure Random Password in Java](https://www.baeldung.com/java-generate-secure-password)
diff --git a/core-java-modules/core-java-string-apis/pom.xml b/core-java-modules/core-java-string-apis/pom.xml
new file mode 100644
index 0000000000..7d9d888fa1
--- /dev/null
+++ b/core-java-modules/core-java-string-apis/pom.xml
@@ -0,0 +1,55 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-string-apis</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>core-java-string-apis</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-generator.version}</version>
+        </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>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-string-apis</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+        <passay.version>1.3.1</passay.version>
+        <commons-text.version>1.4</commons-text.version>
+    </properties>
+
+</project>
diff --git a/java-strings-2/src/main/java/com/baeldung/string/password/RandomPasswordGenerator.java b/core-java-modules/core-java-string-apis/src/main/java/com/baeldung/password/RandomPasswordGenerator.java
similarity index 99%
rename from java-strings-2/src/main/java/com/baeldung/string/password/RandomPasswordGenerator.java
rename to core-java-modules/core-java-string-apis/src/main/java/com/baeldung/password/RandomPasswordGenerator.java
index 46af4d7c51..d49b13c9c9 100644
--- a/java-strings-2/src/main/java/com/baeldung/string/password/RandomPasswordGenerator.java
+++ b/core-java-modules/core-java-string-apis/src/main/java/com/baeldung/password/RandomPasswordGenerator.java
@@ -1,4 +1,11 @@
-package com.baeldung.string.password;
+package com.baeldung.password;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.text.RandomStringGenerator;
+import org.passay.CharacterRule;
+import org.passay.EnglishCharacterData;
+import org.passay.CharacterData;
+import org.passay.PasswordGenerator;
 
 import java.security.SecureRandom;
 import java.util.Collections;
@@ -8,13 +15,6 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.text.RandomStringGenerator;
-import org.passay.CharacterData;
-import org.passay.CharacterRule;
-import org.passay.EnglishCharacterData;
-import org.passay.PasswordGenerator;
-
 public class RandomPasswordGenerator {
 
     /**
diff --git a/java-strings-2/src/main/java/com/baeldung/string/streamtokenizer/StreamTokenizerDemo.java b/core-java-modules/core-java-string-apis/src/main/java/com/baeldung/streamtokenizer/StreamTokenizerDemo.java
similarity index 98%
rename from java-strings-2/src/main/java/com/baeldung/string/streamtokenizer/StreamTokenizerDemo.java
rename to core-java-modules/core-java-string-apis/src/main/java/com/baeldung/streamtokenizer/StreamTokenizerDemo.java
index 3bb0ff5b77..5ab506f259 100644
--- a/java-strings-2/src/main/java/com/baeldung/string/streamtokenizer/StreamTokenizerDemo.java
+++ b/core-java-modules/core-java-string-apis/src/main/java/com/baeldung/streamtokenizer/StreamTokenizerDemo.java
@@ -1,4 +1,4 @@
-package com.baeldung.string.streamtokenizer;
+package com.baeldung.streamtokenizer;
 
 import java.io.*;
 import java.util.ArrayList;
diff --git a/java-strings-ops/src/test/java/com/baeldung/string/StringBufferStringBuilder.java b/core-java-modules/core-java-string-apis/src/main/java/com/baeldung/stringbuilderstringbuffer/StringBuilderStringBuffer.java
similarity index 89%
rename from java-strings-ops/src/test/java/com/baeldung/string/StringBufferStringBuilder.java
rename to core-java-modules/core-java-string-apis/src/main/java/com/baeldung/stringbuilderstringbuffer/StringBuilderStringBuffer.java
index 72af4a9aee..50c139e2d3 100644
--- a/java-strings-ops/src/test/java/com/baeldung/string/StringBufferStringBuilder.java
+++ b/core-java-modules/core-java-string-apis/src/main/java/com/baeldung/stringbuilderstringbuffer/StringBuilderStringBuffer.java
@@ -1,4 +1,4 @@
-package com.baeldung.string;
+package com.baeldung.stringbuilderstringbuffer;
 
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
@@ -8,12 +8,12 @@ import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-public class StringBufferStringBuilder {
+public class StringBuilderStringBuffer {
 
     public static void main(String[] args) throws RunnerException {
 
         Options opt = new OptionsBuilder()
-            .include(StringBufferStringBuilder.class.getSimpleName())
+            .include(StringBuilderStringBuffer.class.getSimpleName())
             .build();
 
         new Runner(opt).run();
diff --git a/java-strings/src/main/java/com/baeldung/stringtokenizer/MyTokenizer.java b/core-java-modules/core-java-string-apis/src/main/java/com/baeldung/stringtokenizer/MyTokenizer.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/stringtokenizer/MyTokenizer.java
rename to core-java-modules/core-java-string-apis/src/main/java/com/baeldung/stringtokenizer/MyTokenizer.java
diff --git a/java-strings-ops/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/charsequence/CharSequenceVsStringUnitTest.java
similarity index 97%
rename from java-strings-ops/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java
rename to core-java-modules/core-java-string-apis/src/test/java/com/baeldung/charsequence/CharSequenceVsStringUnitTest.java
index 916a3c79ff..aa15345bcb 100644
--- a/java-strings-ops/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java
+++ b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/charsequence/CharSequenceVsStringUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.string;
+package com.baeldung.charsequence;
 
 import org.junit.Test;
 
diff --git a/java-strings-2/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/formatter/StringFormatterExampleUnitTest.java
similarity index 96%
rename from java-strings-2/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java
rename to core-java-modules/core-java-string-apis/src/test/java/com/baeldung/formatter/StringFormatterExampleUnitTest.java
index 648fdaf65a..549c889028 100644
--- a/java-strings-2/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java
+++ b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/formatter/StringFormatterExampleUnitTest.java
@@ -1,12 +1,12 @@
-package com.baeldung.string.formatter;
+package com.baeldung.formatter;
+
+import org.junit.Test;
 
 import java.util.Calendar;
 import java.util.Formatter;
 import java.util.GregorianCalendar;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 public class StringFormatterExampleUnitTest {
 
diff --git a/java-strings-2/src/test/java/com/baeldung/string/password/StringPasswordUnitTest.java b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/password/StringPasswordUnitTest.java
similarity index 98%
rename from java-strings-2/src/test/java/com/baeldung/string/password/StringPasswordUnitTest.java
rename to core-java-modules/core-java-string-apis/src/test/java/com/baeldung/password/StringPasswordUnitTest.java
index bfd4b0fe8e..7fb55ad1cb 100644
--- a/java-strings-2/src/test/java/com/baeldung/string/password/StringPasswordUnitTest.java
+++ b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/password/StringPasswordUnitTest.java
@@ -1,9 +1,9 @@
-package com.baeldung.string.password;
-
-import static org.junit.Assert.assertTrue;
+package com.baeldung.password;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertTrue;
+
 /**
  * Examples of passwords conforming to various specifications, using different libraries.
  * 
diff --git a/java-strings-2/src/test/java/com/baeldung/string/streamtokenizer/StreamTokenizerDemoUnitTest.java b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/streamtokenizer/StreamTokenizerDemoUnitTest.java
similarity index 96%
rename from java-strings-2/src/test/java/com/baeldung/string/streamtokenizer/StreamTokenizerDemoUnitTest.java
rename to core-java-modules/core-java-string-apis/src/test/java/com/baeldung/streamtokenizer/StreamTokenizerDemoUnitTest.java
index 01091ec629..29214167be 100644
--- a/java-strings-2/src/test/java/com/baeldung/string/streamtokenizer/StreamTokenizerDemoUnitTest.java
+++ b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/streamtokenizer/StreamTokenizerDemoUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.string.streamtokenizer;
+package com.baeldung.streamtokenizer;
 
 import org.junit.Test;
 
diff --git a/java-strings/src/test/java/com/baeldung/stringjoiner/StringJoinerUnitTest.java b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/stringjoiner/StringJoinerUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/stringjoiner/StringJoinerUnitTest.java
rename to core-java-modules/core-java-string-apis/src/test/java/com/baeldung/stringjoiner/StringJoinerUnitTest.java
index a72f811336..89f91acd6e 100644
--- a/java-strings/src/test/java/com/baeldung/stringjoiner/StringJoinerUnitTest.java
+++ b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/stringjoiner/StringJoinerUnitTest.java
@@ -1,6 +1,6 @@
 package com.baeldung.stringjoiner;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 public class StringJoinerUnitTest {
     private final String DELIMITER_COMMA = ",";
diff --git a/java-strings/src/test/java/com/baeldung/stringtokenizer/TokenizerUnitTest.java b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/stringtokenizer/TokenizerUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/stringtokenizer/TokenizerUnitTest.java
rename to core-java-modules/core-java-string-apis/src/test/java/com/baeldung/stringtokenizer/TokenizerUnitTest.java
diff --git a/core-java-modules/core-java-string-apis/src/test/resources/data.csv b/core-java-modules/core-java-string-apis/src/test/resources/data.csv
new file mode 100644
index 0000000000..ec4ac10443
--- /dev/null
+++ b/core-java-modules/core-java-string-apis/src/test/resources/data.csv
@@ -0,0 +1,3 @@
+1|IND|India
+2|MY|Malaysia
+3|AU|Australia
diff --git a/java-strings-2/src/main/resources/stream-tokenizer-example.txt b/core-java-modules/core-java-string-apis/src/test/resources/stream-tokenizer-example.txt
similarity index 100%
rename from java-strings-2/src/main/resources/stream-tokenizer-example.txt
rename to core-java-modules/core-java-string-apis/src/test/resources/stream-tokenizer-example.txt
diff --git a/core-java-modules/core-java-string-conversions-2/README.md b/core-java-modules/core-java-string-conversions-2/README.md
new file mode 100644
index 0000000000..b4da1b8bad
--- /dev/null
+++ b/core-java-modules/core-java-string-conversions-2/README.md
@@ -0,0 +1,9 @@
+## Java String Conversions
+
+This module contains articles about string conversions from/to another type.
+
+### Relevant Articles:
+- [Java String Conversions](https://www.baeldung.com/java-string-conversions)
+- [Convert String to Byte Array and Reverse in Java](https://www.baeldung.com/java-string-to-byte-array)
+- [Convert Char Array to String](https://www.baeldung.com/java-char-array-to-string)
+- More articles: [[<-- prev]](/core-java-string-conversions)
diff --git a/core-java-modules/core-java-string-conversions-2/pom.xml b/core-java-modules/core-java-string-conversions-2/pom.xml
new file mode 100644
index 0000000000..396d836e6b
--- /dev/null
+++ b/core-java-modules/core-java-string-conversions-2/pom.xml
@@ -0,0 +1,47 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-string-conversions-2</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>core-java-string-conversions-2</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.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>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-string-conversions-2</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+    </build>
+
+</project>
diff --git a/java-strings-ops/src/main/java/com/baeldung/datetime/UseLocalDateTime.java b/core-java-modules/core-java-string-conversions-2/src/main/java/com/baeldung/stringconversions/UseLocalDateTime.java
similarity index 84%
rename from java-strings-ops/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
rename to core-java-modules/core-java-string-conversions-2/src/main/java/com/baeldung/stringconversions/UseLocalDateTime.java
index 7f39ac2f91..7b43c3b588 100644
--- a/java-strings-ops/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
+++ b/core-java-modules/core-java-string-conversions-2/src/main/java/com/baeldung/stringconversions/UseLocalDateTime.java
@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.baeldung.stringconversions;
 
 import java.time.LocalDateTime;
 
diff --git a/java-strings-3/src/test/java/com/baeldung/string/charArrayToString/CharArrayToStringConversionUnitTest.java b/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/chararraytostring/CharArrayToStringConversionUnitTest.java
similarity index 97%
rename from java-strings-3/src/test/java/com/baeldung/string/charArrayToString/CharArrayToStringConversionUnitTest.java
rename to core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/chararraytostring/CharArrayToStringConversionUnitTest.java
index 1030185c3e..dc68632f0b 100644
--- a/java-strings-3/src/test/java/com/baeldung/string/charArrayToString/CharArrayToStringConversionUnitTest.java
+++ b/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/chararraytostring/CharArrayToStringConversionUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.string.charArrayToString;
+package com.baeldung.chararraytostring;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/java-strings-ops/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java b/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringconversions/StringConversionUnitTest.java
similarity index 97%
rename from java-strings-ops/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java
rename to core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringconversions/StringConversionUnitTest.java
index fbbbb21ccd..d896b92b5c 100644
--- a/java-strings-ops/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java
+++ b/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringconversions/StringConversionUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.java.conversion;
+package com.baeldung.stringconversions;
 
 import static org.junit.Assert.assertEquals;
 
@@ -13,8 +13,6 @@ import java.util.GregorianCalendar;
 
 import org.junit.Test;
 
-import com.baeldung.datetime.UseLocalDateTime;
-
 public class StringConversionUnitTest {
 
     @Test
diff --git a/java-strings-ops/src/test/java/com/baeldung/string/conversion/ByteArrayToStringUnitTest.java b/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringtobytearray/ByteArrayToStringUnitTest.java
similarity index 98%
rename from java-strings-ops/src/test/java/com/baeldung/string/conversion/ByteArrayToStringUnitTest.java
rename to core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringtobytearray/ByteArrayToStringUnitTest.java
index a9f8a04c8d..e5efffd8f7 100644
--- a/java-strings-ops/src/test/java/com/baeldung/string/conversion/ByteArrayToStringUnitTest.java
+++ b/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringtobytearray/ByteArrayToStringUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.string.conversion;
+package com.baeldung.stringtobytearray;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/java-strings-ops/src/test/java/com/baeldung/string/conversion/StringToByteArrayUnitTest.java b/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringtobytearray/StringToByteArrayUnitTest.java
similarity index 99%
rename from java-strings-ops/src/test/java/com/baeldung/string/conversion/StringToByteArrayUnitTest.java
rename to core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringtobytearray/StringToByteArrayUnitTest.java
index 5377b4b28d..961c99bbde 100644
--- a/java-strings-ops/src/test/java/com/baeldung/string/conversion/StringToByteArrayUnitTest.java
+++ b/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringtobytearray/StringToByteArrayUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.string.conversion;
+package com.baeldung.stringtobytearray;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/core-java-modules/core-java-string-conversions/README.md b/core-java-modules/core-java-string-conversions/README.md
new file mode 100644
index 0000000000..849660e482
--- /dev/null
+++ b/core-java-modules/core-java-string-conversions/README.md
@@ -0,0 +1,16 @@
+## Java String Conversions
+
+This module contains articles about string conversions from/to another type.
+
+### Relevant Articles:
+- [Converting String to Stream of chars](https://www.baeldung.com/java-string-to-stream)
+- [Converting Strings to Enums in Java](https://www.baeldung.com/java-string-to-enum)
+- [Convert a String to Title Case](https://www.baeldung.com/java-string-title-case)
+- [Convert java.util.Date to String](https://www.baeldung.com/java-util-date-to-string)
+- [Converting a Stack Trace to a String in Java](https://www.baeldung.com/java-stacktrace-to-string)
+- [Image to Base64 String Conversion](https://www.baeldung.com/java-base64-image-string)
+- [Convert a Comma Separated String to a List in Java](https://www.baeldung.com/java-string-with-separator-to-list)
+- [Converting Java String to Double](https://www.baeldung.com/java-string-to-double)
+- [Convert Char to String in Java](https://www.baeldung.com/java-convert-char-to-string)
+- [Convert String to int or Integer in Java](https://www.baeldung.com/java-convert-string-to-int-or-integer)
+- More articles: [[next -->]](/core-java-string-conversions-2)
\ No newline at end of file
diff --git a/core-java-modules/core-java-string-conversions/pom.xml b/core-java-modules/core-java-string-conversions/pom.xml
new file mode 100644
index 0000000000..9c968b7f1c
--- /dev/null
+++ b/core-java-modules/core-java-string-conversions/pom.xml
@@ -0,0 +1,67 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-string-conversions</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>core-java-string-conversions</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.ibm.icu</groupId>
+            <artifactId>icu4j</artifactId>
+            <version>${icu4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.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.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>${org.hamcrest.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-string-conversions</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+        <icu4j.version>61.1</icu4j.version>
+        <assertj.version>3.6.1</assertj.version>
+    </properties>
+
+</project>
diff --git a/java-strings/src/main/java/com/baeldung/enums/PizzaStatusEnum.java b/core-java-modules/core-java-string-conversions/src/main/java/com/baeldung/stringtoenum/PizzaStatusEnum.java
similarity index 95%
rename from java-strings/src/main/java/com/baeldung/enums/PizzaStatusEnum.java
rename to core-java-modules/core-java-string-conversions/src/main/java/com/baeldung/stringtoenum/PizzaStatusEnum.java
index a84829c38d..02646ef997 100644
--- a/java-strings/src/main/java/com/baeldung/enums/PizzaStatusEnum.java
+++ b/core-java-modules/core-java-string-conversions/src/main/java/com/baeldung/stringtoenum/PizzaStatusEnum.java
@@ -1,4 +1,4 @@
-package com.baeldung.enums;
+package com.baeldung.stringtoenum;
 
 public enum PizzaStatusEnum {
     ORDERED(5) {
diff --git a/java-strings/src/main/java/com/baeldung/string/TitleCaseConverter.java b/core-java-modules/core-java-string-conversions/src/main/java/com/baeldung/titlecase/TitleCaseConverter.java
similarity index 98%
rename from java-strings/src/main/java/com/baeldung/string/TitleCaseConverter.java
rename to core-java-modules/core-java-string-conversions/src/main/java/com/baeldung/titlecase/TitleCaseConverter.java
index 81043f6dac..1c35e1a2d6 100644
--- a/java-strings/src/main/java/com/baeldung/string/TitleCaseConverter.java
+++ b/core-java-modules/core-java-string-conversions/src/main/java/com/baeldung/titlecase/TitleCaseConverter.java
@@ -1,12 +1,11 @@
-package com.baeldung.string;
-
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.text.WordUtils;
+package com.baeldung.titlecase;
 
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.BreakIterator;
+import org.apache.commons.lang3.text.WordUtils;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
 
 public class TitleCaseConverter {
 
diff --git a/java-strings-ops/src/test/java/com/baeldung/CharToStringUnitTest.java b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/chartostring/CharToStringUnitTest.java
similarity index 97%
rename from java-strings-ops/src/test/java/com/baeldung/CharToStringUnitTest.java
rename to core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/chartostring/CharToStringUnitTest.java
index 78742e356d..db7c8a16ec 100644
--- a/java-strings-ops/src/test/java/com/baeldung/CharToStringUnitTest.java
+++ b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/chartostring/CharToStringUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.chartostring;
 
 import org.junit.Test;
 
diff --git a/java-strings-2/src/test/java/com/baeldung/string/formatter/DateToStringFormatterUnitTest.java b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/datetostring/DateToStringFormatterUnitTest.java
similarity index 98%
rename from java-strings-2/src/test/java/com/baeldung/string/formatter/DateToStringFormatterUnitTest.java
rename to core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/datetostring/DateToStringFormatterUnitTest.java
index d760510c73..221900fb0e 100644
--- a/java-strings-2/src/test/java/com/baeldung/string/formatter/DateToStringFormatterUnitTest.java
+++ b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/datetostring/DateToStringFormatterUnitTest.java
@@ -1,6 +1,7 @@
-package com.baeldung.string.formatter;
+package com.baeldung.datetostring;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -13,8 +14,7 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 public class DateToStringFormatterUnitTest {
 
diff --git a/java-strings-2/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/filetobase64conversion/FileToBase64StringConversionUnitTest.java
similarity index 96%
rename from java-strings-2/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
rename to core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/filetobase64conversion/FileToBase64StringConversionUnitTest.java
index eef21a98c9..9b165069d6 100644
--- a/java-strings-2/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
+++ b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/filetobase64conversion/FileToBase64StringConversionUnitTest.java
@@ -1,13 +1,13 @@
-package com.baeldung.fileToBase64StringConversion;
+package com.baeldung.filetobase64conversion;
 
-import static org.junit.Assert.assertTrue;
+import org.apache.commons.io.FileUtils;
+import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Base64;
 
-import org.apache.commons.io.FileUtils;
-import org.junit.Test;
+import static org.junit.Assert.assertTrue;
 
 public class FileToBase64StringConversionUnitTest {
 
diff --git a/java-strings-3/src/test/java/com/baeldung/string/todouble/StringToDoubleConversionUnitTest.java b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtodouble/StringToDoubleConversionUnitTest.java
similarity index 97%
rename from java-strings-3/src/test/java/com/baeldung/string/todouble/StringToDoubleConversionUnitTest.java
rename to core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtodouble/StringToDoubleConversionUnitTest.java
index 2c87af53f8..e29b55d52a 100644
--- a/java-strings-3/src/test/java/com/baeldung/string/todouble/StringToDoubleConversionUnitTest.java
+++ b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtodouble/StringToDoubleConversionUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.string.todouble;
+package com.baeldung.stringtodouble;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/java-strings/src/test/java/com/baeldung/enums/PizzaUnitTest.java b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtoenum/StringToEnumUnitTest.java
similarity index 92%
rename from java-strings/src/test/java/com/baeldung/enums/PizzaUnitTest.java
rename to core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtoenum/StringToEnumUnitTest.java
index 3e52a89bad..f6b3bf2aa6 100644
--- a/java-strings/src/test/java/com/baeldung/enums/PizzaUnitTest.java
+++ b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtoenum/StringToEnumUnitTest.java
@@ -1,10 +1,10 @@
-package com.baeldung.enums;
+package com.baeldung.stringtoenum;
 
 import static junit.framework.TestCase.assertTrue;
 
 import org.junit.Test;
 
-public class PizzaUnitTest {
+public class StringToEnumUnitTest {
     
     @Test
     public void whenConvertedIntoEnum_thenGetsConvertedCorrectly() {
diff --git a/java-strings/src/test/java/com/baeldung/StringToIntOrIntegerUnitTest.java b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtoint/StringToIntOrIntegerUnitTest.java
similarity index 97%
rename from java-strings/src/test/java/com/baeldung/StringToIntOrIntegerUnitTest.java
rename to core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtoint/StringToIntOrIntegerUnitTest.java
index a7ad0bf114..106f1fc974 100644
--- a/java-strings/src/test/java/com/baeldung/StringToIntOrIntegerUnitTest.java
+++ b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtoint/StringToIntOrIntegerUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.stringtoint;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/java-strings-2/src/test/java/com/baeldung/ConvertStringToListUnitTest.java b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtolist/ConvertStringToListUnitTest.java
similarity index 96%
rename from java-strings-2/src/test/java/com/baeldung/ConvertStringToListUnitTest.java
rename to core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtolist/ConvertStringToListUnitTest.java
index 47357a99cc..b9e0cede31 100644
--- a/java-strings-2/src/test/java/com/baeldung/ConvertStringToListUnitTest.java
+++ b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtolist/ConvertStringToListUnitTest.java
@@ -1,135 +1,134 @@
-package com.baeldung;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
-import com.google.common.base.Function;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
-
-public class ConvertStringToListUnitTest {
-
-    private final String countries = "Russia,Germany,England,France,Italy";
-    private final String ranks = "1,2,3,4,5, 6,7";
-    private final String emptyStrings = ",,,,,";
-    private final List<String> expectedCountriesList = Arrays.asList("Russia", "Germany", "England", "France", "Italy");
-    private final List<Integer> expectedRanksList = Arrays.asList(1, 2, 3, 4, 5, 6, 7);
-    private final List<String> expectedEmptyStringsList = Arrays.asList("", "", "", "", "", "");
-
-    @Test
-    public void givenString_thenGetListOfStringByJava() {
-        List<String> convertedCountriesList = Arrays.asList(countries.split(",", -1));
-
-        assertEquals(expectedCountriesList, convertedCountriesList);
-    }
-
-    @Test
-    public void givenString_thenGetListOfStringByApache() {
-        List<String> convertedCountriesList = Arrays.asList(StringUtils.splitPreserveAllTokens(countries, ","));
-
-        assertEquals(expectedCountriesList, convertedCountriesList);
-    }
-
-    @Test
-    public void givenString_thenGetListOfStringByGuava() {
-        List<String> convertedCountriesList = Splitter.on(",")
-            .trimResults()
-            .splitToList(countries);
-
-        assertEquals(expectedCountriesList, convertedCountriesList);
-    }
-
-    @Test
-    public void givenString_thenGetListOfStringByJava8() {
-        List<String> convertedCountriesList = Stream.of(countries.split(",", -1))
-            .collect(Collectors.toList());
-
-        assertEquals(expectedCountriesList, convertedCountriesList);
-    }
-
-    @Test
-    public void givenString_thenGetListOfIntegerByJava() {
-        String[] convertedRankArray = ranks.split(",");
-        List<Integer> convertedRankList = new ArrayList<Integer>();
-        for (String number : convertedRankArray) {
-            convertedRankList.add(Integer.parseInt(number.trim()));
-        }
-
-        assertEquals(expectedRanksList, convertedRankList);
-    }
-
-    @Test
-    public void givenString_thenGetListOfIntegerByGuava() {
-        List<Integer> convertedRankList = Lists.transform(Splitter.on(",")
-            .trimResults()
-            .splitToList(ranks), new Function<String, Integer>() {
-                @Override
-                public Integer apply(String input) {
-                    return Integer.parseInt(input.trim());
-                }
-            });
-
-        assertEquals(expectedRanksList, convertedRankList);
-    }
-
-    @Test
-    public void givenString_thenGetListOfIntegerByJava8() {
-        List<Integer> convertedRankList = Stream.of(ranks.split(","))
-            .map(String::trim)
-            .map(Integer::parseInt)
-            .collect(Collectors.toList());
-
-        assertEquals(expectedRanksList, convertedRankList);
-    }
-
-    @Test
-    public void givenString_thenGetListOfIntegerByApache() {
-        String[] convertedRankArray = StringUtils.split(ranks, ",");
-        List<Integer> convertedRankList = new ArrayList<Integer>();
-        for (String number : convertedRankArray) {
-            convertedRankList.add(Integer.parseInt(number.trim()));
-        }
-
-        assertEquals(expectedRanksList, convertedRankList);
-    }
-
-    @Test
-    public void givenEmptyStrings_thenGetListOfStringByJava() {
-        List<String> convertedEmptyStringsList = Arrays.asList(emptyStrings.split(",", -1));
-
-        assertEquals(expectedEmptyStringsList, convertedEmptyStringsList);
-    }
-
-    @Test
-    public void givenEmptyStrings_thenGetListOfStringByApache() {
-        List<String> convertedEmptyStringsList = Arrays.asList(StringUtils.splitPreserveAllTokens(emptyStrings, ","));
-
-        assertEquals(expectedEmptyStringsList, convertedEmptyStringsList);
-    }
-
-    @Test
-    public void givenEmptyStrings_thenGetListOfStringByGuava() {
-        List<String> convertedEmptyStringsList = Splitter.on(",")
-            .trimResults()
-            .splitToList(emptyStrings);
-
-        assertEquals(expectedEmptyStringsList, convertedEmptyStringsList);
-    }
-
-    @Test
-    public void givenEmptyStrings_thenGetListOfStringByJava8() {
-        List<String> convertedEmptyStringsList = Stream.of(emptyStrings.split(",", -1))
-            .collect(Collectors.toList());
-
-        assertEquals(expectedEmptyStringsList, convertedEmptyStringsList);
-    }
-
-}
+package com.baeldung.stringtolist;
+
+import com.google.common.base.Function;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.Assert.assertEquals;
+
+public class ConvertStringToListUnitTest {
+
+    private final String countries = "Russia,Germany,England,France,Italy";
+    private final String ranks = "1,2,3,4,5, 6,7";
+    private final String emptyStrings = ",,,,,";
+    private final List<String> expectedCountriesList = Arrays.asList("Russia", "Germany", "England", "France", "Italy");
+    private final List<Integer> expectedRanksList = Arrays.asList(1, 2, 3, 4, 5, 6, 7);
+    private final List<String> expectedEmptyStringsList = Arrays.asList("", "", "", "", "", "");
+
+    @Test
+    public void givenString_thenGetListOfStringByJava() {
+        List<String> convertedCountriesList = Arrays.asList(countries.split(",", -1));
+
+        assertEquals(expectedCountriesList, convertedCountriesList);
+    }
+
+    @Test
+    public void givenString_thenGetListOfStringByApache() {
+        List<String> convertedCountriesList = Arrays.asList(StringUtils.splitPreserveAllTokens(countries, ","));
+
+        assertEquals(expectedCountriesList, convertedCountriesList);
+    }
+
+    @Test
+    public void givenString_thenGetListOfStringByGuava() {
+        List<String> convertedCountriesList = Splitter.on(",")
+            .trimResults()
+            .splitToList(countries);
+
+        assertEquals(expectedCountriesList, convertedCountriesList);
+    }
+
+    @Test
+    public void givenString_thenGetListOfStringByJava8() {
+        List<String> convertedCountriesList = Stream.of(countries.split(",", -1))
+            .collect(Collectors.toList());
+
+        assertEquals(expectedCountriesList, convertedCountriesList);
+    }
+
+    @Test
+    public void givenString_thenGetListOfIntegerByJava() {
+        String[] convertedRankArray = ranks.split(",");
+        List<Integer> convertedRankList = new ArrayList<Integer>();
+        for (String number : convertedRankArray) {
+            convertedRankList.add(Integer.parseInt(number.trim()));
+        }
+
+        assertEquals(expectedRanksList, convertedRankList);
+    }
+
+    @Test
+    public void givenString_thenGetListOfIntegerByGuava() {
+        List<Integer> convertedRankList = Lists.transform(Splitter.on(",")
+            .trimResults()
+            .splitToList(ranks), new Function<String, Integer>() {
+                @Override
+                public Integer apply(String input) {
+                    return Integer.parseInt(input.trim());
+                }
+            });
+
+        assertEquals(expectedRanksList, convertedRankList);
+    }
+
+    @Test
+    public void givenString_thenGetListOfIntegerByJava8() {
+        List<Integer> convertedRankList = Stream.of(ranks.split(","))
+            .map(String::trim)
+            .map(Integer::parseInt)
+            .collect(Collectors.toList());
+
+        assertEquals(expectedRanksList, convertedRankList);
+    }
+
+    @Test
+    public void givenString_thenGetListOfIntegerByApache() {
+        String[] convertedRankArray = StringUtils.split(ranks, ",");
+        List<Integer> convertedRankList = new ArrayList<Integer>();
+        for (String number : convertedRankArray) {
+            convertedRankList.add(Integer.parseInt(number.trim()));
+        }
+
+        assertEquals(expectedRanksList, convertedRankList);
+    }
+
+    @Test
+    public void givenEmptyStrings_thenGetListOfStringByJava() {
+        List<String> convertedEmptyStringsList = Arrays.asList(emptyStrings.split(",", -1));
+
+        assertEquals(expectedEmptyStringsList, convertedEmptyStringsList);
+    }
+
+    @Test
+    public void givenEmptyStrings_thenGetListOfStringByApache() {
+        List<String> convertedEmptyStringsList = Arrays.asList(StringUtils.splitPreserveAllTokens(emptyStrings, ","));
+
+        assertEquals(expectedEmptyStringsList, convertedEmptyStringsList);
+    }
+
+    @Test
+    public void givenEmptyStrings_thenGetListOfStringByGuava() {
+        List<String> convertedEmptyStringsList = Splitter.on(",")
+            .trimResults()
+            .splitToList(emptyStrings);
+
+        assertEquals(expectedEmptyStringsList, convertedEmptyStringsList);
+    }
+
+    @Test
+    public void givenEmptyStrings_thenGetListOfStringByJava8() {
+        List<String> convertedEmptyStringsList = Stream.of(emptyStrings.split(",", -1))
+            .collect(Collectors.toList());
+
+        assertEquals(expectedEmptyStringsList, convertedEmptyStringsList);
+    }
+
+}
diff --git a/java-strings/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtostream/StringToCharStreamUnitTest.java
similarity index 98%
rename from java-strings/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java
rename to core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtostream/StringToCharStreamUnitTest.java
index 1b02e5d291..cd5727dcf8 100644
--- a/java-strings/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java
+++ b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtostream/StringToCharStreamUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.string;
+package com.baeldung.stringtostream;
 
 import org.junit.Test;
 
diff --git a/java-strings/src/test/java/com/baeldung/string/TitleCaseConverterUnitTest.java b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/titlecase/TitleCaseConverterUnitTest.java
similarity index 99%
rename from java-strings/src/test/java/com/baeldung/string/TitleCaseConverterUnitTest.java
rename to core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/titlecase/TitleCaseConverterUnitTest.java
index 2272565cd3..73694d2c1c 100644
--- a/java-strings/src/test/java/com/baeldung/string/TitleCaseConverterUnitTest.java
+++ b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/titlecase/TitleCaseConverterUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.string;
+package com.baeldung.titlecase;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/java-strings-2/src/test/resources/test_image.jpg b/core-java-modules/core-java-string-conversions/src/test/resources/test_image.jpg
similarity index 100%
rename from java-strings-2/src/test/resources/test_image.jpg
rename to core-java-modules/core-java-string-conversions/src/test/resources/test_image.jpg
diff --git a/core-java-modules/core-java-sun/pom.xml b/core-java-modules/core-java-sun/pom.xml
index ab5f945114..7774d1f9b3 100644
--- a/core-java-modules/core-java-sun/pom.xml
+++ b/core-java-modules/core-java-sun/pom.xml
@@ -1,7 +1,6 @@
 <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-sun</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-sun</name>
@@ -15,76 +14,6 @@
     </parent>
 
     <dependencies>
-        <!-- utils -->
-        <dependency>
-            <groupId>net.sourceforge.collections</groupId>
-            <artifactId>collections-generic</artifactId>
-            <version>${collections-generic.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>${commons-collections4.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
-            <version>${commons-math3.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.decimal4j</groupId>
-            <artifactId>decimal4j</artifactId>
-            <version>${decimal4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>${bouncycastle.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.unix4j</groupId>
-            <artifactId>unix4j-command</artifactId>
-            <version>${unix4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.grep4j</groupId>
-            <artifactId>grep4j</artifactId>
-            <version>${grep4j.version}</version>
-        </dependency>
-        <!-- web -->
-        <!-- marshalling -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <!-- logging -->
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>
@@ -92,62 +21,6 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.jayway.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${avaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>${commons-codec.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.javamoney</groupId>
-            <artifactId>moneta</artifactId>
-            <version>${moneta.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.owasp.esapi</groupId>
-            <artifactId>esapi</artifactId>
-            <version>${esapi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.messaging.mq</groupId>
-            <artifactId>fscontext</artifactId>
-            <version>${fscontext.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.codepoetics</groupId>
-            <artifactId>protonpack</artifactId>
-            <version>${protonpack.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>one.util</groupId>
-            <artifactId>streamex</artifactId>
-            <version>${streamex.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.vavr</groupId>
-            <artifactId>vavr</artifactId>
-            <version>${vavr.version}</version>
-        </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>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring-web.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.sun</groupId>
             <artifactId>tools</artifactId>
@@ -204,32 +77,6 @@
             <id>integration</id>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/*ManualTest.java</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/*IntegrationTest.java</include>
-                                        <include>**/*IntTest.java</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <test.mime>json</test.mime>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
@@ -261,29 +108,11 @@
     </profiles>
 
     <properties>
-
-        <!-- util -->
-        <guava.version>23.0</guava.version>
-        <bouncycastle.version>1.55</bouncycastle.version>
-        <commons-codec.version>1.10</commons-codec.version>
-        <commons-math3.version>3.6.1</commons-math3.version>
-        <decimal4j.version>1.0.3</decimal4j.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
-        <collections-generic.version>4.01</collections-generic.version>
-        <unix4j.version>0.4</unix4j.version>
-        <grep4j.version>1.8.7</grep4j.version>
-        <fscontext.version>4.6-b01</fscontext.version>
-        <protonpack.version>1.13</protonpack.version>
-        <streamex.version>0.6.5</streamex.version>
-        <vavr.version>0.9.0</vavr.version>
-        <spring-web.version>4.3.4.RELEASE</spring-web.version>
-
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
         <avaitility.version>1.7.0</avaitility.version>
 
         <!-- maven plugins -->
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <sun-tools.version>1.8.0</sun-tools.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
     </properties>
diff --git a/core-java-modules/core-java-text/pom.xml b/core-java-modules/core-java-text/pom.xml
index f831ec5f40..43b0df6309 100644
--- a/core-java-modules/core-java-text/pom.xml
+++ b/core-java-modules/core-java-text/pom.xml
@@ -1,7 +1,6 @@
 <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-text</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>core-java-text</name>
@@ -14,9 +13,6 @@
         <relativePath>../../parent-java</relativePath>
     </parent>
 
-    <dependencies>
-    </dependencies>
-
     <build>
         <finalName>core-java-text</finalName>
         <resources>
@@ -27,6 +23,4 @@
         </resources>
     </build>
 
-    <properties>
-    </properties>
 </project>
diff --git a/core-java-modules/core-java/pom.xml b/core-java-modules/core-java/pom.xml
index f04e63eb7c..800649c163 100644
--- a/core-java-modules/core-java/pom.xml
+++ b/core-java-modules/core-java/pom.xml
@@ -14,16 +14,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.unix4j</groupId>
             <artifactId>unix4j-command</artifactId>
@@ -41,11 +31,6 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
         <!-- logging -->
         <dependency>
             <groupId>log4j</groupId>
@@ -63,19 +48,11 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!-- test scoped -->
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj-core.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.javamoney</groupId>
             <artifactId>moneta</artifactId>
             <version>${javamoney.moneta.version}</version>
         </dependency>
-
         <dependency>
             <groupId>com.sun.messaging.mq</groupId>
             <artifactId>fscontext</artifactId>
@@ -111,7 +88,31 @@
             <artifactId>h2</artifactId>
             <version>${h2.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.owasp.esapi</groupId>
+            <artifactId>esapi</artifactId>
+            <version>${esapi.version}</version>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- instrumentation -->
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>${javaassist.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>tools</artifactId>
+            <version>${sun.tools.version}</version>
+            <scope>system</scope>
+            <systemPath>${java.home}/../lib/tools.jar</systemPath>
+        </dependency>
     </dependencies>
 
     <build>
@@ -432,40 +433,27 @@
     </profiles>
 
     <properties>
-        
-        <!-- marshalling -->
-        <gson.version>2.8.2</gson.version>
-
         <!-- util -->
-        <commons-math3.version>3.6.1</commons-math3.version>
-        <decimal4j.version>1.0.3</decimal4j.version>
         <unix4j.version>0.4</unix4j.version>
         <grep4j.version>1.8.7</grep4j.version>
-        <fscontext.version>4.6-b01</fscontext.version>
-        <protonpack.version>1.13</protonpack.version>
-        <streamex.version>0.6.5</streamex.version>
-        <vavr.version>0.9.0</vavr.version>
-
+      
+        <javamoney.moneta.version>1.1</javamoney.moneta.version>
+        <jmh-core.version>1.19</jmh-core.version>
+        <esapi.version>2.1.0.1</esapi.version>
+        <icu4j.version>61.1</icu4j.version>
+      
         <!-- testing -->
         <assertj-core.version>3.10.0</assertj-core.version>
 
         <!-- maven plugins -->
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
-        
-        <javamoney.moneta.version>1.1</javamoney.moneta.version>
-
-        <jmh-core.version>1.19</jmh-core.version>
-       
-        <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
         <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
         <onejar-maven-plugin.version>1.4.4</onejar-maven-plugin.version>
         <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
         <spring-boot-maven-plugin.version>2.0.3.RELEASE</spring-boot-maven-plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
-        <icu4j.version>61.1</icu4j.version>
-
-        
 
+        <!-- instrumentation -->
+        <javaassist.version>3.21.0-GA</javaassist.version>
     </properties>
 </project>
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/encoding/CharacterEncodingExamples.java b/core-java-modules/core-java/src/main/java/com/baeldung/encoding/CharacterEncodingExamples.java
index bdd92e37f6..1ed5f9e62a 100644
--- a/core-java-modules/core-java/src/main/java/com/baeldung/encoding/CharacterEncodingExamples.java
+++ b/core-java-modules/core-java/src/main/java/com/baeldung/encoding/CharacterEncodingExamples.java
@@ -1,10 +1,15 @@
 package com.baeldung.encoding;
 
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
 
 public class CharacterEncodingExamples {
 
@@ -29,4 +34,12 @@ public class CharacterEncodingExamples {
         }
         return buffer.toString();
     }
+
+    static String decodeText(String input, Charset charset, CodingErrorAction codingErrorAction) throws IOException {
+        CharsetDecoder charsetDecoder = charset.newDecoder();
+        charsetDecoder.onMalformedInput(codingErrorAction);
+        return new BufferedReader(
+          new InputStreamReader(
+            new ByteArrayInputStream(input.getBytes()), charsetDecoder)).readLine();
+    }
 }
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/encoding/CharacterEncodingExamplesUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/encoding/CharacterEncodingExamplesUnitTest.java
index 95b3605d95..fe3867a3c3 100644
--- a/core-java-modules/core-java/src/test/java/com/baeldung/encoding/CharacterEncodingExamplesUnitTest.java
+++ b/core-java-modules/core-java/src/test/java/com/baeldung/encoding/CharacterEncodingExamplesUnitTest.java
@@ -1,9 +1,24 @@
 package com.baeldung.encoding;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.MalformedInputException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 
 public class CharacterEncodingExamplesUnitTest {
 
@@ -58,4 +73,52 @@ public class CharacterEncodingExamplesUnitTest {
           "0 0 10001010 10011110 ");
     }
 
+    @Test
+    public void givenUTF8String_whenDecodeByUS_ASCII_thenIgnoreMalformedInputSequence() throws IOException {
+        Assertions.assertEquals("The faade pattern is a software design pattern.", CharacterEncodingExamples.decodeText("The façade pattern is a software design pattern.", StandardCharsets.US_ASCII, CodingErrorAction.IGNORE));
+    }
+
+    @Test
+    public void givenUTF8String_whenDecodeByUS_ASCII_thenReplaceMalformedInputSequence() throws IOException {
+        Assertions.assertEquals(
+          "The fa��ade pattern is a software design pattern.",
+          CharacterEncodingExamples.decodeText(
+            "The façade pattern is a software design pattern.",
+            StandardCharsets.US_ASCII,
+            CodingErrorAction.REPLACE));
+    }
+
+    @Test
+    public void givenUTF8String_whenDecodeByUS_ASCII_thenReportMalformedInputSequence() {
+        Assertions.assertThrows(
+          MalformedInputException.class,
+          () -> CharacterEncodingExamples.decodeText(
+            "The façade pattern is a software design pattern.",
+            StandardCharsets.US_ASCII,
+            CodingErrorAction.REPORT));
+    }
+
+    @Test
+    public void givenTextFile_whenLoopOverAllCandidateEncodings_thenProduceSuitableCandidateEncodings() {
+        Path path = Paths.get("src/test/resources/encoding.txt");
+        List<Charset> allCandidateCharSets = Arrays.asList(
+          StandardCharsets.US_ASCII, StandardCharsets.UTF_8, StandardCharsets.ISO_8859_1);
+
+        List<Charset> suitableCharsets = new ArrayList<>();
+        allCandidateCharSets.forEach(charset -> {
+            try {
+                CharsetDecoder charsetDecoder = charset.newDecoder().onMalformedInput(CodingErrorAction.REPORT);
+                Reader reader = new InputStreamReader(Files.newInputStream(path), charsetDecoder);
+                BufferedReader bufferedReader = new BufferedReader(reader);
+                bufferedReader.readLine();
+                suitableCharsets.add(charset);
+            } catch (MalformedInputException ignored) {
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        });
+
+        Assertions.assertEquals(suitableCharsets, Arrays.asList(StandardCharsets.UTF_8, StandardCharsets.ISO_8859_1));
+    }
+
 }
diff --git a/core-java-modules/pre-jpms/pom.xml b/core-java-modules/pre-jpms/pom.xml
index 380d94fbf1..f37daed0a5 100644
--- a/core-java-modules/pre-jpms/pom.xml
+++ b/core-java-modules/pre-jpms/pom.xml
@@ -69,7 +69,4 @@
 		</plugins>
 	</build>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
 </project>
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrder.kt b/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrder.kt
index 1384cd9937..3a8a4b9857 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrder.kt
+++ b/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrder.kt
@@ -1,6 +1,6 @@
 package com.baeldung.builder
 
-class FoodOrder(
+class FoodOrder private constructor(
   val bread: String?,
   val condiments: String?,
   val meat: String?,
diff --git a/couchbase/README.md b/couchbase/README.md
index c4c7df97da..913c413132 100644
--- a/couchbase/README.md
+++ b/couchbase/README.md
@@ -1,4 +1,6 @@
-## Couchbase SDK Tutorial Project
+## Couchbase
+
+This module contains articles about Couchbase
 
 ### Relevant Articles:
 - [Introduction to Couchbase SDK for Java](https://www.baeldung.com/java-couchbase-sdk)
diff --git a/custom-pmd/README.md b/custom-pmd/README.md
index 065a1128f3..0c42106fe8 100644
--- a/custom-pmd/README.md
+++ b/custom-pmd/README.md
@@ -1 +1,7 @@
 ## Custom PMD Rules
+
+This module contains articles about PMD
+
+### Relevant Articles:
+
+- [Introduction To PMD](https://www.baeldung.com/pmd)
\ No newline at end of file
diff --git a/dagger/README.md b/dagger/README.md
index 81dc161ca1..d942622d0a 100644
--- a/dagger/README.md
+++ b/dagger/README.md
@@ -1,3 +1,7 @@
+## Dagger
+
+This module contains articles about Dagger
+
 ### Relevant articles:
 
 - [Introduction to Dagger 2](https://www.baeldung.com/dagger-2)
diff --git a/data-structures/README.md b/data-structures/README.md
index 5ea9657173..b7f15c2eb8 100644
--- a/data-structures/README.md
+++ b/data-structures/README.md
@@ -1,3 +1,7 @@
+## Data Structures
+
+This module contains articles about data structures in Java
+
 ## Relevant articles:
 
 - [The Trie Data Structure in Java](https://www.baeldung.com/trie-java)
diff --git a/ddd/README.md b/ddd/README.md
index 6b68fe2205..daeb663e3b 100644
--- a/ddd/README.md
+++ b/ddd/README.md
@@ -1,3 +1,7 @@
+## Domain-driven Design (DDD)
+
+This module contains articles about Domain-driven Design (DDD)
+
 ### Relevant articles
 
 - [Persisting DDD Aggregates](https://www.baeldung.com/spring-persisting-ddd-aggregates)
diff --git a/ddd/pom.xml b/ddd/pom.xml
index 4ac65ea841..c249007ba4 100644
--- a/ddd/pom.xml
+++ b/ddd/pom.xml
@@ -3,7 +3,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.ddd</groupId>
     <artifactId>ddd</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>ddd</name>
     <packaging>jar</packaging>
     <description>DDD series examples</description>
@@ -35,7 +34,6 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-launcher</artifactId>
-            <version>${junit-platform.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -85,8 +83,6 @@
 
     <properties>
         <joda-money.version>1.0.1</joda-money.version>
-        <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
-        <spring-boot.version>2.0.6.RELEASE</spring-boot.version>
     </properties>
 	
 </project>
\ No newline at end of file
diff --git a/deeplearning4j/README.md b/deeplearning4j/README.md
index eb1e19daa1..47c2d8167d 100644
--- a/deeplearning4j/README.md
+++ b/deeplearning4j/README.md
@@ -1,5 +1,7 @@
-### Sample deeplearning4j Project
-This is a sample project for the [deeplearning4j](https://deeplearning4j.org) library.
+## Deeplearning4j 
+
+This module contains articles about Deeplearning4j.
 
 ### Relevant Articles:
 - [A Guide to Deeplearning4j](https://www.baeldung.com/deeplearning4j)
+- [Logistic Regression in Java](https://www.baeldung.com/java-logistic-regression)
diff --git a/deeplearning4j/pom.xml b/deeplearning4j/pom.xml
index 181dbc871c..a8663865e0 100644
--- a/deeplearning4j/pom.xml
+++ b/deeplearning4j/pom.xml
@@ -14,6 +14,11 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>org.nd4j</groupId>
+            <artifactId>nd4j-api</artifactId>
+            <version>${dl4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.nd4j</groupId>
             <artifactId>nd4j-native-platform</artifactId>
@@ -24,10 +29,26 @@
             <artifactId>deeplearning4j-core</artifactId>
             <version>${dl4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.deeplearning4j</groupId>
+            <artifactId>deeplearning4j-nn</artifactId>
+            <version>${dl4j.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.datavec/datavec-api -->
+        <dependency>
+            <groupId>org.datavec</groupId>
+            <artifactId>datavec-api</artifactId>
+            <version>${dl4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.3.5</version>
+        </dependency>
     </dependencies>
 
     <properties>
-        <dl4j.version>0.9.1</dl4j.version>
+        <dl4j.version>0.9.1</dl4j.version> <!-- Latest non beta version -->
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/deeplearning4j/src/main/java/com/baeldung/deeplearning4j/IrisClassifier.java b/deeplearning4j/src/main/java/com/baeldung/deeplearning4j/IrisClassifier.java
index bf341209e1..dcc81eda6e 100644
--- a/deeplearning4j/src/main/java/com/baeldung/deeplearning4j/IrisClassifier.java
+++ b/deeplearning4j/src/main/java/com/baeldung/deeplearning4j/IrisClassifier.java
@@ -3,9 +3,9 @@ package com.baeldung.deeplearning4j;
 import org.datavec.api.records.reader.RecordReader;
 import org.datavec.api.records.reader.impl.csv.CSVRecordReader;
 import org.datavec.api.split.FileSplit;
-import org.datavec.api.util.ClassPathResource;
 import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator;
 import org.deeplearning4j.eval.Evaluation;
+import org.deeplearning4j.nn.conf.BackpropType;
 import org.deeplearning4j.nn.conf.MultiLayerConfiguration;
 import org.deeplearning4j.nn.conf.NeuralNetConfiguration;
 import org.deeplearning4j.nn.conf.layers.DenseLayer;
@@ -19,6 +19,7 @@ import org.nd4j.linalg.dataset.SplitTestAndTrain;
 import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;
 import org.nd4j.linalg.dataset.api.preprocessor.DataNormalization;
 import org.nd4j.linalg.dataset.api.preprocessor.NormalizerStandardize;
+import org.nd4j.linalg.io.ClassPathResource;
 import org.nd4j.linalg.lossfunctions.LossFunctions;
 
 import java.io.IOException;
@@ -52,8 +53,8 @@ public class IrisClassifier {
                 .iterations(1000)
                 .activation(Activation.TANH)
                 .weightInit(WeightInit.XAVIER)
-                .learningRate(0.1)
-                .regularization(true).l2(0.0001)
+                .regularization(true)
+                .learningRate(0.1).l2(0.0001)
                 .list()
                 .layer(0, new DenseLayer.Builder().nIn(FEATURES_COUNT).nOut(3)
                         .build())
@@ -62,14 +63,14 @@ public class IrisClassifier {
                 .layer(2, new OutputLayer.Builder(LossFunctions.LossFunction.NEGATIVELOGLIKELIHOOD)
                         .activation(Activation.SOFTMAX)
                         .nIn(3).nOut(CLASSES_COUNT).build())
-                .backprop(true).pretrain(false)
+                .backpropType(BackpropType.Standard).pretrain(false)
                 .build();
 
         MultiLayerNetwork model = new MultiLayerNetwork(configuration);
         model.init();
         model.fit(trainingData);
 
-        INDArray output = model.output(testData.getFeatureMatrix());
+        INDArray output = model.output(testData.getFeatures());
 
         Evaluation eval = new Evaluation(CLASSES_COUNT);
         eval.eval(testData.getLabels(), output);
diff --git a/ml/src/main/java/com/baeldung/logreg/MnistClassifier.java b/deeplearning4j/src/main/java/com/baeldung/logreg/MnistClassifier.java
similarity index 93%
rename from ml/src/main/java/com/baeldung/logreg/MnistClassifier.java
rename to deeplearning4j/src/main/java/com/baeldung/logreg/MnistClassifier.java
index 1246de973f..c8580b9c27 100644
--- a/ml/src/main/java/com/baeldung/logreg/MnistClassifier.java
+++ b/deeplearning4j/src/main/java/com/baeldung/logreg/MnistClassifier.java
@@ -10,6 +10,7 @@ import org.datavec.api.split.FileSplit;
 import org.datavec.image.loader.NativeImageLoader;
 import org.datavec.image.recordreader.ImageRecordReader;
 import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator;
+import org.deeplearning4j.eval.Evaluation;
 import org.deeplearning4j.nn.conf.MultiLayerConfiguration;
 import org.deeplearning4j.nn.conf.NeuralNetConfiguration;
 import org.deeplearning4j.nn.conf.inputs.InputType;
@@ -21,15 +22,12 @@ import org.deeplearning4j.nn.multilayer.MultiLayerNetwork;
 import org.deeplearning4j.nn.weights.WeightInit;
 import org.deeplearning4j.optimize.listeners.ScoreIterationListener;
 import org.deeplearning4j.util.ModelSerializer;
-import org.nd4j.evaluation.classification.Evaluation;
 import org.nd4j.linalg.activations.Activation;
 import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;
 import org.nd4j.linalg.dataset.api.preprocessor.DataNormalization;
 import org.nd4j.linalg.dataset.api.preprocessor.ImagePreProcessingScaler;
 import org.nd4j.linalg.learning.config.Nesterovs;
 import org.nd4j.linalg.lossfunctions.LossFunctions;
-import org.nd4j.linalg.schedule.MapSchedule;
-import org.nd4j.linalg.schedule.ScheduleType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,7 +42,7 @@ import org.slf4j.LoggerFactory;
 
 public class MnistClassifier {
     private static final Logger logger = LoggerFactory.getLogger(MnistClassifier.class);
-    private static final String basePath = System.getProperty("java.io.tmpdir") + "mnist" + File.separator;
+    private static final String basePath = System.getProperty("java.io.tmpdir") + File.separator + "mnist" + File.separator;
     private static final File modelPath = new File(basePath + "mnist-model.zip");
     private static final String dataUrl = "http://github.com/myleott/mnist_png/raw/master/mnist_png.tar.gz";
 
@@ -71,8 +69,7 @@ public class MnistClassifier {
             String localFilePath = basePath + "mnist_png.tar.gz";
             File file = new File(localFilePath);
             if (!file.exists()) {
-                file.getParentFile()
-                    .mkdirs();
+                file.getParentFile().mkdirs();
                 Utils.downloadAndSave(dataUrl, file);
                 Utils.extractTarArchive(file, basePath);
             }
@@ -135,15 +132,15 @@ public class MnistClassifier {
             .build();
         final MultiLayerConfiguration config = new NeuralNetConfiguration.Builder().seed(seed)
             .l2(0.0005) // ridge regression value
-            .updater(new Nesterovs(new MapSchedule(ScheduleType.ITERATION, learningRateSchedule)))
+            .updater(new Nesterovs()) //TODO new MapSchedule(ScheduleType.ITERATION, learningRateSchedule)
             .weightInit(WeightInit.XAVIER)
             .list()
-            .layer(layer1)
-            .layer(layer2)
-            .layer(layer3)
-            .layer(layer2)
-            .layer(layer4)
-            .layer(layer5)
+            .layer(0, layer1)
+            .layer(1, layer2)
+            .layer(2, layer3)
+            .layer(3, layer2)
+            .layer(4, layer4)
+            .layer(5, layer5)
             .setInputType(InputType.convolutionalFlat(height, width, channels))
             .build();
 
@@ -165,4 +162,4 @@ public class MnistClassifier {
         ModelSerializer.writeModel(model, modelPath, true);
         logger.info("The MINIST model has been saved in {}", modelPath.getPath());
     }
-}
\ No newline at end of file
+}
diff --git a/ml/src/main/java/com/baeldung/logreg/MnistPrediction.java b/deeplearning4j/src/main/java/com/baeldung/logreg/MnistPrediction.java
similarity index 100%
rename from ml/src/main/java/com/baeldung/logreg/MnistPrediction.java
rename to deeplearning4j/src/main/java/com/baeldung/logreg/MnistPrediction.java
diff --git a/ml/src/main/java/com/baeldung/logreg/Utils.java b/deeplearning4j/src/main/java/com/baeldung/logreg/Utils.java
similarity index 100%
rename from ml/src/main/java/com/baeldung/logreg/Utils.java
rename to deeplearning4j/src/main/java/com/baeldung/logreg/Utils.java
diff --git a/disruptor/README.md b/disruptor/README.md
index 8f977d090a..7d2fca4672 100644
--- a/disruptor/README.md
+++ b/disruptor/README.md
@@ -1,3 +1,7 @@
-## Relevant articles:
+## Disruptor
+
+This module contains articles about LMAX Disruptor
+
+### Relevant articles:
 
 - [Concurrency with LMAX Disruptor – An Introduction](https://www.baeldung.com/lmax-disruptor-concurrency)
diff --git a/disruptor/pom.xml b/disruptor/pom.xml
index e1d78e7ed6..213331f25c 100644
--- a/disruptor/pom.xml
+++ b/disruptor/pom.xml
@@ -1,7 +1,6 @@
 <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>disruptor</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>disruptor</name>
@@ -116,10 +115,7 @@
     <properties>
         <!-- util -->
         <disruptor.version>3.3.6</disruptor.version>
-        <!-- testing -->
-        <testng.version>6.10</testng.version>
-        <assertj.version>3.6.1</assertj.version>
-        
+        <!-- testing -->        
         <maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
         <onejar-maven-plugin.version>1.4.4</onejar-maven-plugin.version>
diff --git a/dozer/README.md b/dozer/README.md
index 2e610b836a..e87e889ce3 100644
--- a/dozer/README.md
+++ b/dozer/README.md
@@ -1,2 +1,7 @@
+## Dozer
+
+This module contains articles about Dozer
+
 ### Relevant Articles:
+
 - [A Guide to Mapping With Dozer](https://www.baeldung.com/dozer)
diff --git a/dozer/pom.xml b/dozer/pom.xml
index 8234eb4c79..c781962d83 100644
--- a/dozer/pom.xml
+++ b/dozer/pom.xml
@@ -1,7 +1,6 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
     <artifactId>dozer</artifactId>
     <version>1.0</version>
     <name>dozer</name>
diff --git a/drools/README.MD b/drools/README.MD
index 1ff3dfba20..bcec0cc2f0 100644
--- a/drools/README.MD
+++ b/drools/README.MD
@@ -1,4 +1,9 @@
+## Drools
+
+This module contains articles about Drools
+
 ### Relevant Articles:
+
 - [Introduction to Drools](https://www.baeldung.com/drools)
 - [Drools Using Rules from Excel Files](https://www.baeldung.com/drools-excel)
 - [An Example of Backward Chaining in Drools](https://www.baeldung.com/drools-backward-chaining)
diff --git a/dubbo/README.md b/dubbo/README.md
index 566efe28f5..3ccca4960a 100644
--- a/dubbo/README.md
+++ b/dubbo/README.md
@@ -1,4 +1,8 @@
-## Relevant articles:
+## Dubbo
+
+This module contains articles about Dubbo
+
+### Relevant articles:
 
 - [Introduction to Dubbo](https://www.baeldung.com/dubbo)
 
diff --git a/dubbo/pom.xml b/dubbo/pom.xml
index 9fe228bf89..947175b6a0 100644
--- a/dubbo/pom.xml
+++ b/dubbo/pom.xml
@@ -32,7 +32,6 @@
         <dubbo.version>2.5.7</dubbo.version>
         <zookeeper.version>3.4.11</zookeeper.version>
         <zkclient.version>0.10</zkclient.version>
-        <surefire.version>2.19.1</surefire.version>
     </properties>
 
 </project>
diff --git a/ethereum/README.md b/ethereum/README.md
index 7eccea7135..5bae4bbebd 100644
--- a/ethereum/README.md
+++ b/ethereum/README.md
@@ -1,5 +1,7 @@
 ## Ethereum
 
+This module contains articles about the Ethereum blockchain
+
 ### Relevant Articles:
 - [Introduction to EthereumJ](https://www.baeldung.com/ethereumj)
 - [Creating and Deploying Smart Contracts with Solidity](https://www.baeldung.com/smart-contracts-ethereum-solidity)
diff --git a/ethereum/pom.xml b/ethereum/pom.xml
index 80e1c04676..f4850df844 100644
--- a/ethereum/pom.xml
+++ b/ethereum/pom.xml
@@ -3,7 +3,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.ethereum</groupId>
     <artifactId>ethereum</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>ethereum</name>
 
     <parent>
@@ -207,8 +206,6 @@
     </repositories>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tomcat.version>8.5.4</tomcat.version>
         <ethereumj-core.version>1.5.0-RELEASE</ethereumj-core.version>
         <web3j.core.version>3.3.1</web3j.core.version>
         <spring.boot.version>1.5.6.RELEASE</spring.boot.version>
diff --git a/feign/README.md b/feign/README.md
index 5aa0e3f56f..03051671d5 100644
--- a/feign/README.md
+++ b/feign/README.md
@@ -1,10 +1,8 @@
-## Feign Hypermedia Client ##
+## Feign
 
-This is the implementation of a [spring-hypermedia-api][1] client using Feign.
-
-[1]: https://github.com/eugenp/spring-hypermedia-api
+This module contains articles about Feign
 
 ### Relevant Articles:
 
 - [Intro to Feign](https://www.baeldung.com/intro-to-feign)
-- [Introduction to SLF4J](https://www.baeldung.com/slf4j-with-log4j2-logback)
+
diff --git a/flyway-cdi-extension/README.md b/flyway-cdi-extension/README.md
index 3e03d5aee8..2f4e8cdb7a 100644
--- a/flyway-cdi-extension/README.md
+++ b/flyway-cdi-extension/README.md
@@ -1,3 +1,7 @@
+## Flyway CDI Extension
+
+This module contains articles about context and dependency injection (CDI) with Flyway
+
 ### Relevant articles
 
 - [CDI Portable Extension and Flyway](https://www.baeldung.com/cdi-portable-extension)
diff --git a/flyway-cdi-extension/pom.xml b/flyway-cdi-extension/pom.xml
index e8b327e35f..49bd6bd9fd 100644
--- a/flyway-cdi-extension/pom.xml
+++ b/flyway-cdi-extension/pom.xml
@@ -3,7 +3,6 @@
          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>flyway-cdi-extension</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>flyway-cdi-extension</name>
@@ -51,8 +50,6 @@
     </dependencies>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
 		<cdi-api.version>2.0.SP1</cdi-api.version>
 		<weld-se-core.version>3.0.5.Final</weld-se-core.version>
 		<flyway-core.version>5.1.4</flyway-core.version>
diff --git a/geotools/README.md b/geotools/README.md
index 98f1e2c283..5529386070 100644
--- a/geotools/README.md
+++ b/geotools/README.md
@@ -1,3 +1,7 @@
+## GeoTools
+
+This module contains articles about GeoTools
+
 ### Relevant Articles
 
 [Introduction to GeoTools](https://www.baeldung.com/geo-tools)
diff --git a/google-cloud/README.md b/google-cloud/README.md
index c6c49b88bf..5458fb1a93 100644
--- a/google-cloud/README.md
+++ b/google-cloud/README.md
@@ -1,16 +1,16 @@
-## Google Cloud Tutorial Project
+## Google Cloud
+
+This module contains articles about Google Cloud
 
 ### Relevant Article:
+
 - [Intro to Google Cloud Storage With Java](https://www.baeldung.com/java-google-cloud-storage)
 
 ### Overview
+
 This Maven project contains the Java code for the article linked above.
 
 ### Package Organization
+
 Java classes for the intro tutorial are in the org.baeldung.google.cloud package. Please note that Google Cloud requires
 a user account and credentials, as explained in the tutorial.
-
-
-### Running the tests
-
-```
diff --git a/google-web-toolkit/README.md b/google-web-toolkit/README.md
index d2a8b324ec..df9158cddc 100644
--- a/google-web-toolkit/README.md
+++ b/google-web-toolkit/README.md
@@ -1,2 +1,7 @@
+## Google Web Toolkit
+
+This module contains articles about Google Web Toolkit (GWT)
+
 ### Relevant Articles: 
+
 - [Introduction to GWT](https://www.baeldung.com/gwt)
diff --git a/google-web-toolkit/pom.xml b/google-web-toolkit/pom.xml
index 0723cd3be2..8a7cb87701 100644
--- a/google-web-toolkit/pom.xml
+++ b/google-web-toolkit/pom.xml
@@ -5,7 +5,6 @@
 
 	<!-- POM file generated with GWT webAppCreator -->
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.baeldung</groupId>
 	<artifactId>google-web-toolkit</artifactId>
 	<version>1.0-SNAPSHOT</version>
 	<name>google-web-toolkit</name>
diff --git a/gradle-5/README.md b/gradle-5/README.md
new file mode 100644
index 0000000000..73b6b7e12a
--- /dev/null
+++ b/gradle-5/README.md
@@ -0,0 +1,5 @@
+
+### Relevant Articles:
+
+- [Run a Java main Method Using Gradle](https://www.baeldung.com/gradle-run-java-main)
+
diff --git a/gradle/README.md b/gradle/README.md
index 0ad0ff3e45..84a8508e2c 100644
--- a/gradle/README.md
+++ b/gradle/README.md
@@ -1,3 +1,7 @@
+## Gradle
+
+This module contains articles about Gradle
+
 ## Relevant articles:
 - [Introduction to Gradle](https://www.baeldung.com/gradle)
 - [Writing Custom Gradle Plugins](https://www.baeldung.com/gradle-create-plugin)
diff --git a/grails/README.md b/grails/README.md
index b93ac5de2e..ec9bb2a504 100644
--- a/grails/README.md
+++ b/grails/README.md
@@ -1,3 +1,7 @@
+## Grails
+
+This module contains articles about Grails
+
 ### Relevant articles
 
 - [Build an MVC Web Application with Grails](https://www.baeldung.com/grails-mvc-application)
diff --git a/graphql/graphql-java/README.md b/graphql/graphql-java/README.md
index 240b62f6b4..e3fd818400 100644
--- a/graphql/graphql-java/README.md
+++ b/graphql/graphql-java/README.md
@@ -1,3 +1,7 @@
+## GraphQL Java
+
+This module contains articles about GraphQL with Java
+
 ## Relevant articles:
 
 - [Introduction to GraphQL](https://www.baeldung.com/graphql)
diff --git a/grpc/README.md b/grpc/README.md
index 17128dd19f..d65dc03e54 100644
--- a/grpc/README.md
+++ b/grpc/README.md
@@ -1,2 +1,6 @@
+## gRPC
+
+This module contains articles about gRPC
+
 ### Relevant Articles:
 - [Introduction to gRPC](https://www.baeldung.com/grpc-introduction)
diff --git a/gson/README.md b/gson/README.md
index 8b882f2d3e..df6ba0f516 100644
--- a/gson/README.md
+++ b/gson/README.md
@@ -1,9 +1,9 @@
-=========
-
-## GSON Cookbooks and Examples
+## GSON
 
+This module contains articles about Gson
 
 ### Relevant Articles: 
+
 - [Gson Deserialization Cookbook](https://www.baeldung.com/gson-deserialization-guide)
 - [Jackson vs Gson](https://www.baeldung.com/jackson-vs-gson)
 - [Exclude Fields from Serialization in Gson](https://www.baeldung.com/gson-exclude-fields-serialization)
diff --git a/gson/pom.xml b/gson/pom.xml
index 9d2cf630d0..4aa6c00458 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -2,7 +2,6 @@
          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>gson</artifactId>
     <version>0.1-SNAPSHOT</version>
     <name>gson</name>
diff --git a/guava-collections-map/README.md b/guava-collections-map/README.md
new file mode 100644
index 0000000000..b3ec5e2157
--- /dev/null
+++ b/guava-collections-map/README.md
@@ -0,0 +1,12 @@
+=========
+
+## Guava Collections Map examples
+
+This module contains articles about map collections in Guava
+
+### Relevant Articles: 
+- [Guava – Maps](https://www.baeldung.com/guava-maps)
+- [Guide to Guava Multimap](https://www.baeldung.com/guava-multimap)
+- [Guide to Guava RangeMap](https://www.baeldung.com/guava-rangemap)
+- [Initialize a HashMap in Java](https://www.baeldung.com/java-initialize-hashmap)
+- [Guide to Guava ClassToInstanceMap](https://www.baeldung.com/guava-class-to-instance-map)
\ No newline at end of file
diff --git a/guava-collections-map/pom.xml b/guava-collections-map/pom.xml
new file mode 100644
index 0000000000..21597d0e28
--- /dev/null
+++ b/guava-collections-map/pom.xml
@@ -0,0 +1,26 @@
+<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.guava</groupId>
+    <artifactId>guava-collections-map</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>guava-collections-map</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <build>
+        <finalName>guava-collections-map</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/guava-collections/src/test/java/org/baeldung/guava/ClassToInstanceMapUnitTest.java b/guava-collections-map/src/test/java/com/baeldung/guava/classtoinstancemap/ClassToInstanceMapUnitTest.java
similarity index 97%
rename from guava-collections/src/test/java/org/baeldung/guava/ClassToInstanceMapUnitTest.java
rename to guava-collections-map/src/test/java/com/baeldung/guava/classtoinstancemap/ClassToInstanceMapUnitTest.java
index 295672d7ad..b9807379eb 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/ClassToInstanceMapUnitTest.java
+++ b/guava-collections-map/src/test/java/com/baeldung/guava/classtoinstancemap/ClassToInstanceMapUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava.classtoinstancemap;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.collect.MutableClassToInstanceMap;
diff --git a/guava-collections/src/test/java/org/baeldung/guava/maps/initialize/GuavaMapInitializeUnitTest.java b/guava-collections-map/src/test/java/com/baeldung/guava/initializemaps/GuavaMapInitializeUnitTest.java
similarity index 95%
rename from guava-collections/src/test/java/org/baeldung/guava/maps/initialize/GuavaMapInitializeUnitTest.java
rename to guava-collections-map/src/test/java/com/baeldung/guava/initializemaps/GuavaMapInitializeUnitTest.java
index 2414afb720..0866496ef5 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/maps/initialize/GuavaMapInitializeUnitTest.java
+++ b/guava-collections-map/src/test/java/com/baeldung/guava/initializemaps/GuavaMapInitializeUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava.maps.initialize;
+package com.baeldung.guava.initializemaps;
 
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.*;
diff --git a/guava-collections/src/test/java/org/baeldung/guava/GuavaCollectionTypesUnitTest.java b/guava-collections-map/src/test/java/com/baeldung/guava/maps/GuavaMapsUnitTest.java
similarity index 51%
rename from guava-collections/src/test/java/org/baeldung/guava/GuavaCollectionTypesUnitTest.java
rename to guava-collections-map/src/test/java/com/baeldung/guava/maps/GuavaMapsUnitTest.java
index ab38afa5c4..4108df8c96 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/GuavaCollectionTypesUnitTest.java
+++ b/guava-collections-map/src/test/java/com/baeldung/guava/maps/GuavaMapsUnitTest.java
@@ -1,115 +1,18 @@
-package org.baeldung.guava;
+package com.baeldung.guava.maps;
 
-import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.junit.Test;
 
 import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.base.Predicates;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ClassToInstanceMap;
-import com.google.common.collect.ContiguousSet;
-import com.google.common.collect.DiscreteDomain;
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-import com.google.common.collect.Multiset;
-import com.google.common.collect.Multisets;
-import com.google.common.collect.MutableClassToInstanceMap;
-import com.google.common.collect.Ordering;
-import com.google.common.collect.Range;
-import com.google.common.collect.RangeSet;
-import com.google.common.collect.Sets;
-import com.google.common.collect.Table;
-import com.google.common.collect.Tables;
-import com.google.common.collect.TreeRangeSet;
+import com.google.common.collect.*;
 
-public class GuavaCollectionTypesUnitTest {
-
-    @Test
-    public void whenCreateList_thenCreated() {
-        final List<String> names = Lists.newArrayList("John", "Adam", "Jane");
-
-        names.add("Tom");
-        assertEquals(4, names.size());
-
-        names.remove("Adam");
-        assertThat(names, contains("John", "Jane", "Tom"));
-    }
-
-    @Test
-    public void whenReverseList_thenReversed() {
-        final List<String> names = Lists.newArrayList("John", "Adam", "Jane");
-
-        final List<String> reversed = Lists.reverse(names);
-        assertThat(reversed, contains("Jane", "Adam", "John"));
-    }
-
-    @Test
-    public void whenCreateCharacterListFromString_thenCreated() {
-        final List<Character> chars = Lists.charactersOf("John");
-
-        assertEquals(4, chars.size());
-        assertThat(chars, contains('J', 'o', 'h', 'n'));
-    }
-
-    @Test
-    public void whenPartitionList_thenPartitioned() {
-        final List<String> names = Lists.newArrayList("John", "Jane", "Adam", "Tom", "Viki", "Tyler");
-        final List<List<String>> result = Lists.partition(names, 2);
-
-        assertEquals(3, result.size());
-        assertThat(result.get(0), contains("John", "Jane"));
-        assertThat(result.get(1), contains("Adam", "Tom"));
-        assertThat(result.get(2), contains("Viki", "Tyler"));
-    }
-
-    @Test
-    public void whenRemoveDuplicatesFromList_thenRemoved() {
-        final List<Character> chars = Lists.newArrayList('h', 'e', 'l', 'l', 'o');
-        assertEquals(5, chars.size());
-
-        final List<Character> result = ImmutableSet.copyOf(chars).asList();
-        assertThat(result, contains('h', 'e', 'l', 'o'));
-    }
-
-    @Test
-    public void whenRemoveNullFromList_thenRemoved() {
-        final List<String> names = Lists.newArrayList("John", null, "Adam", null, "Jane");
-        Iterables.removeIf(names, Predicates.isNull());
-
-        assertEquals(3, names.size());
-        assertThat(names, contains("John", "Adam", "Jane"));
-    }
-
-    @Test
-    public void whenCreateImmutableList_thenCreated() {
-        final List<String> names = Lists.newArrayList("John", "Adam", "Jane");
-
-        names.add("Tom");
-        assertEquals(4, names.size());
-
-        final ImmutableList<String> immutable = ImmutableList.copyOf(names);
-        assertThat(immutable, contains("John", "Adam", "Jane", "Tom"));
-    }
+public class GuavaMapsUnitTest {
 
     @Test
     public void whenCreateImmutableMap_thenCreated() {
diff --git a/guava-collections/src/test/java/org/baeldung/guava/GuavaMultiMapUnitTest.java b/guava-collections-map/src/test/java/com/baeldung/guava/multimap/GuavaMultiMapUnitTest.java
similarity index 97%
rename from guava-collections/src/test/java/org/baeldung/guava/GuavaMultiMapUnitTest.java
rename to guava-collections-map/src/test/java/com/baeldung/guava/multimap/GuavaMultiMapUnitTest.java
index f51dcadefc..06e85e41e5 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/GuavaMultiMapUnitTest.java
+++ b/guava-collections-map/src/test/java/com/baeldung/guava/multimap/GuavaMultiMapUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava.multimap;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
diff --git a/guava-collections/src/test/java/org/baeldung/guava/GuavaRangeMapUnitTest.java b/guava-collections-map/src/test/java/com/baeldung/guava/rangemap/GuavaRangeMapUnitTest.java
similarity index 99%
rename from guava-collections/src/test/java/org/baeldung/guava/GuavaRangeMapUnitTest.java
rename to guava-collections-map/src/test/java/com/baeldung/guava/rangemap/GuavaRangeMapUnitTest.java
index c0c5efea23..f221a2dcf8 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/GuavaRangeMapUnitTest.java
+++ b/guava-collections-map/src/test/java/com/baeldung/guava/rangemap/GuavaRangeMapUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava.rangemap;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
diff --git a/guava-collections-set/README.md b/guava-collections-set/README.md
index e24552aae8..2e8e1ecdd0 100644
--- a/guava-collections-set/README.md
+++ b/guava-collections-set/README.md
@@ -1,4 +1,6 @@
-# Guava
+## Guava Collections Set
+
+This module contains articles about Google Guava sets
 
 ## Relevant Articles:
 
diff --git a/guava-collections-set/pom.xml b/guava-collections-set/pom.xml
index 46dcae492d..640a28c4c1 100644
--- a/guava-collections-set/pom.xml
+++ b/guava-collections-set/pom.xml
@@ -1,7 +1,6 @@
 <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>guava-collections-set</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>guava-collections-set</name>
@@ -28,8 +27,6 @@
     </build>
 
     <properties>
-        <!-- util -->
-        <guava.version>27.1-jre</guava.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
     </properties>
diff --git a/guava-collections/README.md b/guava-collections/README.md
index 95397f0ff0..51731d7db7 100644
--- a/guava-collections/README.md
+++ b/guava-collections/README.md
@@ -1,20 +1,16 @@
-=========
-
-## Guava and Hamcrest Cookbooks and Examples
+## Guava Collections 
 
+This module contains articles about Google Guava collections
 
 ### Relevant Articles: 
+
 - [Guava Collections Cookbook](https://www.baeldung.com/guava-collections)
 - [Guava Ordering Cookbook](https://www.baeldung.com/guava-order)
+- [Guide to Guava’s Ordering](https://www.baeldung.com/guava-ordering)
 - [Hamcrest Collections Cookbook](https://www.baeldung.com/hamcrest-collections-arrays)
 - [Partition a List in Java](https://www.baeldung.com/java-list-split)
 - [Filtering and Transforming Collections in Guava](https://www.baeldung.com/guava-filter-and-transform-a-collection)
 - [Guava – Join and Split Collections](https://www.baeldung.com/guava-joiner-and-splitter-tutorial)
 - [Guava – Lists](https://www.baeldung.com/guava-lists)
-- [Guava – Maps](https://www.baeldung.com/guava-maps)
-- [Guide to Guava Multimap](https://www.baeldung.com/guava-multimap)
-- [Guide to Guava RangeMap](https://www.baeldung.com/guava-rangemap)
 - [Guide to Guava MinMaxPriorityQueue and EvictingQueue](https://www.baeldung.com/guava-minmax-priority-queue-and-evicting-queue)
-- [Initialize a HashMap in Java](https://www.baeldung.com/java-initialize-hashmap)
 - [Guide to Guava Table](https://www.baeldung.com/guava-table)
-- [Guide to Guava ClassToInstanceMap](https://www.baeldung.com/guava-class-to-instance-map)
diff --git a/guava-collections/pom.xml b/guava-collections/pom.xml
index ecda3c9595..9dfcceaab8 100644
--- a/guava-collections/pom.xml
+++ b/guava-collections/pom.xml
@@ -1,7 +1,6 @@
 <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>guava-collections</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>guava-collections</name>
@@ -43,7 +42,7 @@
     </dependencies>
 
     <build>
-        <finalName>guava</finalName>
+        <finalName>guava-collections</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -54,7 +53,6 @@
 
     <properties>
         <!-- util -->
-        <guava.version>24.0-jre</guava.version>
         <commons-collections4.version>4.1</commons-collections4.version>
 
         <!-- testing -->
diff --git a/guava-collections/src/test/java/org/baeldung/guava/GuavaCollectionsExamplesUnitTest.java b/guava-collections/src/test/java/com/baeldung/guava/collections/GuavaCollectionsExamplesUnitTest.java
similarity index 99%
rename from guava-collections/src/test/java/org/baeldung/guava/GuavaCollectionsExamplesUnitTest.java
rename to guava-collections/src/test/java/com/baeldung/guava/collections/GuavaCollectionsExamplesUnitTest.java
index 7b5cef6055..86e8dea21c 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/GuavaCollectionsExamplesUnitTest.java
+++ b/guava-collections/src/test/java/com/baeldung/guava/collections/GuavaCollectionsExamplesUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava.collections;
 
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
diff --git a/guava-collections/src/test/java/org/baeldung/guava/GuavaFilterTransformCollectionsUnitTest.java b/guava-collections/src/test/java/com/baeldung/guava/filtertransform/GuavaFilterTransformCollectionsUnitTest.java
similarity index 99%
rename from guava-collections/src/test/java/org/baeldung/guava/GuavaFilterTransformCollectionsUnitTest.java
rename to guava-collections/src/test/java/com/baeldung/guava/filtertransform/GuavaFilterTransformCollectionsUnitTest.java
index 8562193665..447149f002 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/GuavaFilterTransformCollectionsUnitTest.java
+++ b/guava-collections/src/test/java/com/baeldung/guava/filtertransform/GuavaFilterTransformCollectionsUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava.filtertransform;
 
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
diff --git a/guava-collections/src/test/java/org/baeldung/guava/GuavaStringUnitTest.java b/guava-collections/src/test/java/com/baeldung/guava/joinsplit/GuavaStringUnitTest.java
similarity index 99%
rename from guava-collections/src/test/java/org/baeldung/guava/GuavaStringUnitTest.java
rename to guava-collections/src/test/java/com/baeldung/guava/joinsplit/GuavaStringUnitTest.java
index a08efd7c31..73c4c3291e 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/GuavaStringUnitTest.java
+++ b/guava-collections/src/test/java/com/baeldung/guava/joinsplit/GuavaStringUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava.joinsplit;
 
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
diff --git a/guava-collections/src/test/java/com/baeldung/guava/lists/GuavaListsUnitTest.java b/guava-collections/src/test/java/com/baeldung/guava/lists/GuavaListsUnitTest.java
new file mode 100644
index 0000000000..2f414dcdb1
--- /dev/null
+++ b/guava-collections/src/test/java/com/baeldung/guava/lists/GuavaListsUnitTest.java
@@ -0,0 +1,82 @@
+package com.baeldung.guava.lists;
+
+import com.google.common.base.Predicates;
+import com.google.common.collect.*;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.contains;
+
+public class GuavaListsUnitTest {
+
+    @Test
+    public void whenCreateList_thenCreated() {
+        final List<String> names = Lists.newArrayList("John", "Adam", "Jane");
+
+        names.add("Tom");
+        assertEquals(4, names.size());
+
+        names.remove("Adam");
+        assertThat(names, contains("John", "Jane", "Tom"));
+    }
+
+    @Test
+    public void whenReverseList_thenReversed() {
+        final List<String> names = Lists.newArrayList("John", "Adam", "Jane");
+
+        final List<String> reversed = Lists.reverse(names);
+        assertThat(reversed, contains("Jane", "Adam", "John"));
+    }
+
+    @Test
+    public void whenCreateCharacterListFromString_thenCreated() {
+        final List<Character> chars = Lists.charactersOf("John");
+
+        assertEquals(4, chars.size());
+        assertThat(chars, contains('J', 'o', 'h', 'n'));
+    }
+
+    @Test
+    public void whenPartitionList_thenPartitioned() {
+        final List<String> names = Lists.newArrayList("John", "Jane", "Adam", "Tom", "Viki", "Tyler");
+        final List<List<String>> result = Lists.partition(names, 2);
+
+        assertEquals(3, result.size());
+        assertThat(result.get(0), contains("John", "Jane"));
+        assertThat(result.get(1), contains("Adam", "Tom"));
+        assertThat(result.get(2), contains("Viki", "Tyler"));
+    }
+
+    @Test
+    public void whenRemoveDuplicatesFromList_thenRemoved() {
+        final List<Character> chars = Lists.newArrayList('h', 'e', 'l', 'l', 'o');
+        assertEquals(5, chars.size());
+
+        final List<Character> result = ImmutableSet.copyOf(chars).asList();
+        assertThat(result, contains('h', 'e', 'l', 'o'));
+    }
+
+    @Test
+    public void whenRemoveNullFromList_thenRemoved() {
+        final List<String> names = Lists.newArrayList("John", null, "Adam", null, "Jane");
+        Iterables.removeIf(names, Predicates.isNull());
+
+        assertEquals(3, names.size());
+        assertThat(names, contains("John", "Adam", "Jane"));
+    }
+
+    @Test
+    public void whenCreateImmutableList_thenCreated() {
+        final List<String> names = Lists.newArrayList("John", "Adam", "Jane");
+
+        names.add("Tom");
+        assertEquals(4, names.size());
+
+        final ImmutableList<String> immutable = ImmutableList.copyOf(names);
+        assertThat(immutable, contains("John", "Adam", "Jane", "Tom"));
+    }
+
+}
diff --git a/guava-collections/src/test/java/org/baeldung/guava/GuavaOrderingExamplesUnitTest.java b/guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingExamplesUnitTest.java
similarity index 99%
rename from guava-collections/src/test/java/org/baeldung/guava/GuavaOrderingExamplesUnitTest.java
rename to guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingExamplesUnitTest.java
index b8be06deb4..46ceccd7ba 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/GuavaOrderingExamplesUnitTest.java
+++ b/guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingExamplesUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava.ordering;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
diff --git a/guava-collections/src/test/java/org/baeldung/guava/GuavaOrderingUnitTest.java b/guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingUnitTest.java
similarity index 98%
rename from guava-collections/src/test/java/org/baeldung/guava/GuavaOrderingUnitTest.java
rename to guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingUnitTest.java
index dd250898fd..73d464bde5 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/GuavaOrderingUnitTest.java
+++ b/guava-collections/src/test/java/com/baeldung/guava/ordering/GuavaOrderingUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava.ordering;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Ordering;
diff --git a/guava-collections/src/test/java/org/baeldung/java/CollectionApachePartitionUnitTest.java b/guava-collections/src/test/java/com/baeldung/guava/partition/CollectionApachePartitionUnitTest.java
similarity index 97%
rename from guava-collections/src/test/java/org/baeldung/java/CollectionApachePartitionUnitTest.java
rename to guava-collections/src/test/java/com/baeldung/guava/partition/CollectionApachePartitionUnitTest.java
index 1071d4a5fb..1cb566dd6b 100644
--- a/guava-collections/src/test/java/org/baeldung/java/CollectionApachePartitionUnitTest.java
+++ b/guava-collections/src/test/java/com/baeldung/guava/partition/CollectionApachePartitionUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java;
+package com.baeldung.guava.partition;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
diff --git a/guava-collections/src/test/java/org/baeldung/java/CollectionGuavaPartitionUnitTest.java b/guava-collections/src/test/java/com/baeldung/guava/partition/CollectionGuavaPartitionUnitTest.java
similarity index 98%
rename from guava-collections/src/test/java/org/baeldung/java/CollectionGuavaPartitionUnitTest.java
rename to guava-collections/src/test/java/com/baeldung/guava/partition/CollectionGuavaPartitionUnitTest.java
index c4ddb35da2..8eb259b490 100644
--- a/guava-collections/src/test/java/org/baeldung/java/CollectionGuavaPartitionUnitTest.java
+++ b/guava-collections/src/test/java/com/baeldung/guava/partition/CollectionGuavaPartitionUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java;
+package com.baeldung.guava.partition;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
diff --git a/guava-collections/src/test/java/org/baeldung/java/CollectionJavaPartitionUnitTest.java b/guava-collections/src/test/java/com/baeldung/guava/partition/CollectionJavaPartitionUnitTest.java
similarity index 98%
rename from guava-collections/src/test/java/org/baeldung/java/CollectionJavaPartitionUnitTest.java
rename to guava-collections/src/test/java/com/baeldung/guava/partition/CollectionJavaPartitionUnitTest.java
index 63583987ea..d62ca275c1 100644
--- a/guava-collections/src/test/java/org/baeldung/java/CollectionJavaPartitionUnitTest.java
+++ b/guava-collections/src/test/java/com/baeldung/guava/partition/CollectionJavaPartitionUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java;
+package com.baeldung.guava.partition;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
diff --git a/guava-collections/src/test/java/org/baeldung/guava/EvictingQueueUnitTest.java b/guava-collections/src/test/java/com/baeldung/guava/queues/EvictingQueueUnitTest.java
similarity index 95%
rename from guava-collections/src/test/java/org/baeldung/guava/EvictingQueueUnitTest.java
rename to guava-collections/src/test/java/com/baeldung/guava/queues/EvictingQueueUnitTest.java
index e4d29d2e92..b9abef8d1f 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/EvictingQueueUnitTest.java
+++ b/guava-collections/src/test/java/com/baeldung/guava/queues/EvictingQueueUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava.queues;
 
 
 import com.google.common.collect.EvictingQueue;
diff --git a/guava-collections/src/test/java/org/baeldung/guava/MinMaxPriorityQueueUnitTest.java b/guava-collections/src/test/java/com/baeldung/guava/queues/MinMaxPriorityQueueUnitTest.java
similarity index 97%
rename from guava-collections/src/test/java/org/baeldung/guava/MinMaxPriorityQueueUnitTest.java
rename to guava-collections/src/test/java/com/baeldung/guava/queues/MinMaxPriorityQueueUnitTest.java
index 1c4df03c86..95446e0d44 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/MinMaxPriorityQueueUnitTest.java
+++ b/guava-collections/src/test/java/com/baeldung/guava/queues/MinMaxPriorityQueueUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava.queues;
 
 
 import com.google.common.collect.MinMaxPriorityQueue;
diff --git a/guava-collections/src/test/java/org/baeldung/guava/GuavaTableUnitTest.java b/guava-collections/src/test/java/com/baeldung/guava/table/GuavaTableUnitTest.java
similarity index 99%
rename from guava-collections/src/test/java/org/baeldung/guava/GuavaTableUnitTest.java
rename to guava-collections/src/test/java/com/baeldung/guava/table/GuavaTableUnitTest.java
index 28e132074e..e9a9560afd 100644
--- a/guava-collections/src/test/java/org/baeldung/guava/GuavaTableUnitTest.java
+++ b/guava-collections/src/test/java/com/baeldung/guava/table/GuavaTableUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava.table;
 
 import static org.assertj.core.api.Assertions.*;
 import java.util.List;
diff --git a/guava-collections/src/test/java/org/baeldung/hamcrest/HamcrestExamplesUnitTest.java b/guava-collections/src/test/java/com/baeldung/hamcrest/HamcrestExamplesUnitTest.java
similarity index 99%
rename from guava-collections/src/test/java/org/baeldung/hamcrest/HamcrestExamplesUnitTest.java
rename to guava-collections/src/test/java/com/baeldung/hamcrest/HamcrestExamplesUnitTest.java
index 82b6b8c87c..820f065957 100644
--- a/guava-collections/src/test/java/org/baeldung/hamcrest/HamcrestExamplesUnitTest.java
+++ b/guava-collections/src/test/java/com/baeldung/hamcrest/HamcrestExamplesUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.hamcrest;
+package com.baeldung.hamcrest;
 
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
diff --git a/guava-io/README.md b/guava-io/README.md
index 0737accbed..81188295e7 100644
--- a/guava-io/README.md
+++ b/guava-io/README.md
@@ -1,3 +1,7 @@
+## Guava IO
+
+This module contains articles about input/output (IO) with Google Guava
+
 ### Relevant Articles: 
 
 - [Using Guava CountingOutputStream](https://www.baeldung.com/guava-counting-outputstream)
diff --git a/guava-io/pom.xml b/guava-io/pom.xml
index 2a66baba80..aaaf7edd4e 100644
--- a/guava-io/pom.xml
+++ b/guava-io/pom.xml
@@ -1,7 +1,6 @@
 <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>guava-io</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>guava-io</name>
diff --git a/guava-modules/README.md b/guava-modules/README.md
index 79e45a89e7..898b8b7d9f 100644
--- a/guava-modules/README.md
+++ b/guava-modules/README.md
@@ -1,3 +1,4 @@
-
 ## Guava Modules
 
+This module contains other modules about Google Guava
+
diff --git a/guava/README.md b/guava/README.md
index a9694daf0b..c67a3604ea 100644
--- a/guava/README.md
+++ b/guava/README.md
@@ -1,9 +1,9 @@
+## Guava
 
-## Guava Examples
+This module contains articles a Google Guava
 
 ### Relevant Articles: 
 - [Guava Functional Cookbook](https://www.baeldung.com/guava-functions-predicates)
-- [Guide to Guava’s Ordering](https://www.baeldung.com/guava-ordering)
 - [Guide to Guava’s PreConditions](https://www.baeldung.com/guava-preconditions)
 - [Introduction to Guava CacheLoader](https://www.baeldung.com/guava-cacheloader)
 - [Introduction to Guava Memoizer](https://www.baeldung.com/guava-memoizer)
diff --git a/guava/pom.xml b/guava/pom.xml
index 3a19901a02..4ca9918455 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -1,7 +1,6 @@
 <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>guava</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>guava</name>
@@ -26,8 +25,6 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-
-
     </dependencies>
 
     <build>
@@ -41,9 +38,6 @@
     </build>
 
     <properties>
-        <!-- util -->
-        <guava.version>24.0-jre</guava.version>
-
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
     </properties>
diff --git a/guice/README.md b/guice/README.md
index cc3a8755c0..712639dfce 100644
--- a/guice/README.md
+++ b/guice/README.md
@@ -1,5 +1,8 @@
-## Google Guice Tutorials Project
+## Google Guice
+
+This module contains articles about Google Guice
 
 ### Relevant Articles
+
 - [Guide to Google Guice](https://www.baeldung.com/guice)
 - [Guice vs Spring – Dependency Injection](https://www.baeldung.com/guice-spring-dependency-injection)
diff --git a/hazelcast/README.md b/hazelcast/README.md
index 8ba6dc122b..a37009ef7e 100644
--- a/hazelcast/README.md
+++ b/hazelcast/README.md
@@ -1,3 +1,7 @@
+## Hazelcast
+
+This module contains articles about Hazelcast
+
 ### Relevant Articles:
 - [Guide to Hazelcast with Java](https://www.baeldung.com/java-hazelcast)
 - [Introduction to Hazelcast Jet](https://www.baeldung.com/hazelcast-jet)
diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml
index 705792ad05..9e0b0671d0 100644
--- a/hazelcast/pom.xml
+++ b/hazelcast/pom.xml
@@ -1,7 +1,6 @@
 <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>hazelcast</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>hazelcast</name>
diff --git a/helidon/README.md b/helidon/README.md
index a092faf9f2..fa5bade4fe 100644
--- a/helidon/README.md
+++ b/helidon/README.md
@@ -1,3 +1,7 @@
+## Helidon
+
+This module contains articles about Helidon
+
 ### Relevant articles
 
 - [Microservices with Oracle Helidon](https://www.baeldung.com/microservices-oracle-helidon)
diff --git a/httpclient-simple/pom.xml b/httpclient-simple/pom.xml
index b2b0f98dd1..183c4438de 100644
--- a/httpclient-simple/pom.xml
+++ b/httpclient-simple/pom.xml
@@ -1,7 +1,6 @@
 <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>httpclient-simple</artifactId>
     <version>0.1-SNAPSHOT</version>
     <name>httpclient-simple</name>
diff --git a/httpclient-simple/src/test/java/com/baeldung/client/RestClientLiveManualTest.java b/httpclient-simple/src/test/java/com/baeldung/client/RestClientLiveManualTest.java
index a485641b34..d133bc376c 100644
--- a/httpclient-simple/src/test/java/com/baeldung/client/RestClientLiveManualTest.java
+++ b/httpclient-simple/src/test/java/com/baeldung/client/RestClientLiveManualTest.java
@@ -6,9 +6,9 @@ import static org.junit.Assert.assertThat;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
-import java.security.cert.X509Certificate;
 
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLPeerUnverifiedException;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.ClientProtocolException;
@@ -46,7 +46,7 @@ public class RestClientLiveManualTest {
     // old httpClient will throw UnsupportedOperationException
     @Ignore
     @Test
-    public final void givenAcceptingAllCertificates_whenHttpsUrlIsConsumed_thenOk_1() throws GeneralSecurityException {
+    public final void givenAcceptingAllCertificates_whenHttpsUrlIsConsumed_thenOk() throws GeneralSecurityException {
         final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
         final CloseableHttpClient httpClient = (CloseableHttpClient) requestFactory.getHttpClient();
 
@@ -92,7 +92,7 @@ public class RestClientLiveManualTest {
     }
 
     @Test
-    public final void givenAcceptingAllCertificatesUsing4_4_whenHttpsUrlIsConsumedUsingRestTemplate_thenCorrect() throws ClientProtocolException, IOException {
+    public final void givenAcceptingAllCertificatesUsing4_4_whenUsingRestTemplate_thenCorrect() throws ClientProtocolException, IOException {
         final CloseableHttpClient httpClient = HttpClients.custom().setSSLHostnameVerifier(new NoopHostnameVerifier()).build();
         final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
         requestFactory.setHttpClient(httpClient);
@@ -101,4 +101,12 @@ public class RestClientLiveManualTest {
         assertThat(response.getStatusCode().value(), equalTo(200));
     }
 
+    @Test(expected = SSLPeerUnverifiedException.class)
+    public void whenHttpsUrlIsConsumed_thenException() throws ClientProtocolException, IOException {
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        String urlOverHttps = "https://localhost:8082/httpclient-simple";
+        HttpGet getMethod = new HttpGet(urlOverHttps);
+        HttpResponse response = httpClient.execute(getMethod);
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+    }
 }
diff --git a/httpclient/README.md b/httpclient/README.md
index 6bce5567ec..678b195965 100644
--- a/httpclient/README.md
+++ b/httpclient/README.md
@@ -1,9 +1,10 @@
-=========
-## HttpClient 4.x Cookbooks and Examples
+## HttpClient 4.x
+
+This module contains articles about HttpClient 4.x
 
 ###The Course
-The "REST With Spring" Classes: http://bit.ly/restwithspring
 
+The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
 
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
index 8cd483cfc6..6316ee4eed 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
@@ -1,7 +1,6 @@
 <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>httpclient</artifactId>
     <version>0.1-SNAPSHOT</version>
     <name>httpclient</name>
@@ -48,11 +47,6 @@
             <artifactId>httpmime</artifactId>
             <version>${httpclient.version}</version>
         </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>${commons-codec.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpasyncclient</artifactId>
@@ -82,51 +76,12 @@
         </resources>
     </build>
 
-    <profiles>
-        <profile>
-            <id>live</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/*ManualTest.java</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/*LiveTest.java</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <test.mime>json</test.mime>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <properties>
         <!-- util -->
-        <guava.version>19.0</guava.version>
-        <commons-codec.version>1.10</commons-codec.version>
         <httpasyncclient.version>4.1.4</httpasyncclient.version>
         <!-- testing -->
         <wiremock.version>2.5.1</wiremock.version>
         <httpclient.version>4.5.8</httpclient.version> <!-- 4.3.6 --> <!-- 4.4-beta1 -->
-        <!-- maven plugins -->
-        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/hystrix/pom.xml b/hystrix/pom.xml
index e08af2c40f..4aeb47f095 100644
--- a/hystrix/pom.xml
+++ b/hystrix/pom.xml
@@ -41,23 +41,11 @@
             <artifactId>hystrix-metrics-event-stream</artifactId>
             <version>${hystrix-metrics-event-stream.version}</version>
         </dependency>
-        <!--<dependency> <groupId>com.netflix.hystrix</groupId> <artifactId>hystrix-dashboard</artifactId> <version>${hystrix-dashboard.version}</version> </dependency> -->
         <dependency>
             <groupId>com.netflix.rxjava</groupId>
             <artifactId>rxjava-core</artifactId>
             <version>${rxjava-core.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <version>${hamcrest-all.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <properties>
@@ -65,9 +53,7 @@
         <hystrix-core.version>1.5.8</hystrix-core.version>
         <rxjava-core.version>0.20.7</rxjava-core.version>
         <!-- maven plugins -->
-        <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
         <hystrix-metrics-event-stream.version>1.5.8</hystrix-metrics-event-stream.version>
-        <hystrix-dashboard.version>1.5.8</hystrix-dashboard.version>
     </properties>
 
 </project>
diff --git a/jackson-simple/README.md b/jackson-simple/README.md
index 302fcb5b05..9d24a20e4a 100644
--- a/jackson-simple/README.md
+++ b/jackson-simple/README.md
@@ -2,7 +2,8 @@
 
 This module contains articles about Jackson that are also part of the Jackson Ebook.
 
-###The Course
+### The Course
+
 The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java b/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java
index 2745e4f767..a339ddf2c5 100644
--- a/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java
+++ b/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java
@@ -1,20 +1,29 @@
 package com.baeldung.jackson.objectmapper;
 
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
 import com.baeldung.jackson.objectmapper.dto.Car;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
-
-import java.util.List;
-import java.util.Map;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 
 public class JavaReadWriteJsonExampleUnitTest {
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
     final String EXAMPLE_JSON = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }";
     final String LOCAL_JSON = "[{ \"color\" : \"Black\", \"type\" : \"BMW\" }, { \"color\" : \"Red\", \"type\" : \"BMW\" }]";
 
@@ -27,6 +36,19 @@ public class JavaReadWriteJsonExampleUnitTest {
         assertThat(carAsString, containsString("renault"));
     }
 
+    @Test
+    public void whenWriteToFile_thanCorrect() throws Exception {
+        File resultFile = folder.newFile("car.json");
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        Car car = new Car("yellow", "renault");
+        objectMapper.writeValue(resultFile, car);
+
+        Car fromFile = objectMapper.readValue(resultFile, Car.class);
+        assertEquals(car.getType(), fromFile.getType());
+        assertEquals(car.getColor(), fromFile.getColor());
+    }
+
     @Test
     public void whenReadJsonToJava_thanCorrect() throws Exception {
         final ObjectMapper objectMapper = new ObjectMapper();
@@ -66,4 +88,26 @@ public class JavaReadWriteJsonExampleUnitTest {
             assertNotNull(key);
         }
     }
+
+    @Test
+    public void wheReadFromFile_thanCorrect() throws Exception {
+        File resource = new File("src/test/resources/json_car.json");
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        Car fromFile = objectMapper.readValue(resource, Car.class);
+
+        assertEquals("BMW", fromFile.getType());
+        assertEquals("Black", fromFile.getColor());
+    }
+
+    @Test
+    public void wheReadFromUrl_thanCorrect() throws Exception {
+        URL resource = new URL("file:src/test/resources/json_car.json");
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        Car fromFile = objectMapper.readValue(resource, Car.class);
+
+        assertEquals("BMW", fromFile.getType());
+        assertEquals("Black", fromFile.getColor());
+    }
 }
diff --git a/jackson-simple/src/test/resources/json_car.json b/jackson-simple/src/test/resources/json_car.json
new file mode 100644
index 0000000000..2f6b35b523
--- /dev/null
+++ b/jackson-simple/src/test/resources/json_car.json
@@ -0,0 +1,4 @@
+{
+  "color": "Black",
+  "type": "BMW"
+}
\ No newline at end of file
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/ProductJsonAnySetter.java b/jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/Product.java
similarity index 95%
rename from jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/ProductJsonAnySetter.java
rename to jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/Product.java
index 13c21e37af..9c997886e5 100644
--- a/jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/ProductJsonAnySetter.java
+++ b/jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/Product.java
@@ -5,7 +5,7 @@ import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 
-public class ProductJsonAnySetter {
+public class Product {
 
     private String name;
     private String category;
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/City.java b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/City.java
new file mode 100644
index 0000000000..2bbef534c3
--- /dev/null
+++ b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/City.java
@@ -0,0 +1,15 @@
+package com.baeldung.jackson.deserialization.enums;
+
+public class City {
+
+    private Distance distance;
+
+    public Distance getDistance() {
+        return distance;
+    }
+
+    public void setDistance(Distance distance) {
+        this.distance = distance;
+    }
+    
+}
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/Distance.java b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/Distance.java
new file mode 100644
index 0000000000..2c96b6eb80
--- /dev/null
+++ b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/Distance.java
@@ -0,0 +1,31 @@
+package com.baeldung.jackson.deserialization.enums;
+
+public enum Distance {
+
+    KILOMETER("km", 1000), MILE("miles", 1609.34), METER("meters", 1), INCH("inches", 0.0254), CENTIMETER("cm", 0.01), MILLIMETER("mm", 0.001);
+
+    private String unit;
+    private double meters;
+
+    private Distance(String unit, double meters) {
+        this.unit = unit;
+        this.meters = meters;
+    }
+
+    public void setMeters(double meters) {
+        this.meters = meters;
+    }
+    
+    public double getMeters() {
+        return meters;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+}
+
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/City.java b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/City.java
new file mode 100644
index 0000000000..36ef7e244a
--- /dev/null
+++ b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/City.java
@@ -0,0 +1,15 @@
+package com.baeldung.jackson.deserialization.enums.customdeserializer;
+
+public class City {
+
+    private Distance distance;
+
+    public Distance getDistance() {
+        return distance;
+    }
+
+    public void setDistance(Distance distance) {
+        this.distance = distance;
+    }
+    
+}
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/CustomEnumDeserializer.java b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/CustomEnumDeserializer.java
new file mode 100644
index 0000000000..bae0c0df34
--- /dev/null
+++ b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/CustomEnumDeserializer.java
@@ -0,0 +1,42 @@
+package com.baeldung.jackson.deserialization.enums.customdeserializer;
+
+import java.io.IOException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+public class CustomEnumDeserializer extends StdDeserializer<Distance> {
+
+    private static final long serialVersionUID = -1166032307856492833L;
+
+    public CustomEnumDeserializer() {
+        this(null);
+    }
+
+    public CustomEnumDeserializer(Class<?> c) {
+        super(c);
+    }
+
+    @Override
+    public Distance deserialize(JsonParser jsonParser, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+
+        JsonNode node = jsonParser.getCodec().readTree(jsonParser);
+
+        String unit = node.get("unit").asText();
+        double meters = node.get("meters").asDouble();
+
+        for (Distance distance : Distance.values()) {
+           
+            if (distance.getUnit().equals(unit) && 
+                Double.compare(distance.getMeters(), meters) == 0) {
+                
+                return distance;
+            }
+        }
+
+        return null;
+    }
+
+}
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/Distance.java b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/Distance.java
new file mode 100644
index 0000000000..9cb3a0c391
--- /dev/null
+++ b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/Distance.java
@@ -0,0 +1,33 @@
+package com.baeldung.jackson.deserialization.enums.customdeserializer;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+@JsonDeserialize(using = CustomEnumDeserializer.class)
+public enum Distance {
+
+    KILOMETER("km", 1000), MILE("miles", 1609.34), METER("meters", 1), INCH("inches", 0.0254), CENTIMETER("cm", 0.01), MILLIMETER("mm", 0.001);
+
+    private String unit;
+    private double meters;
+
+    private Distance(String unit, double meters) {
+        this.unit = unit;
+        this.meters = meters;
+    }
+
+    public double getMeters() {
+        return meters;
+    }
+
+    public void setMeters(double meters) {
+        this.meters = meters;
+    }
+    
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+}
\ No newline at end of file
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsoncreator/City.java b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsoncreator/City.java
new file mode 100644
index 0000000000..6a478dd263
--- /dev/null
+++ b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsoncreator/City.java
@@ -0,0 +1,15 @@
+package com.baeldung.jackson.deserialization.enums.jsoncreator;
+
+public class City {
+
+    private Distance distance;
+
+    public Distance getDistance() {
+        return distance;
+    }
+
+    public void setDistance(Distance distance) {
+        this.distance = distance;
+    }
+    
+}
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsoncreator/Distance.java b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsoncreator/Distance.java
new file mode 100644
index 0000000000..18235fb5c6
--- /dev/null
+++ b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsoncreator/Distance.java
@@ -0,0 +1,48 @@
+package com.baeldung.jackson.deserialization.enums.jsoncreator;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public enum Distance {
+
+    KILOMETER("km", 1000), MILE("miles", 1609.34), METER("meters", 1), INCH("inches", 0.0254), CENTIMETER("cm", 0.01), MILLIMETER("mm", 0.001);
+
+    private String unit;
+    private double meters;
+
+    private Distance(String unit, double meters) {
+        this.unit = unit;
+        this.meters = meters;
+    }
+
+    public void setMeters(double meters) {
+        this.meters = meters;
+    }
+    
+    public double getMeters() {
+        return meters;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    @JsonCreator
+    public static Distance forValues(@JsonProperty("unit") String unit, @JsonProperty("meters") double meters) {
+
+        for (Distance distance : Distance.values()) {
+            if (distance.unit.equals(unit) && Double.compare(distance.meters, meters) == 0) {
+
+                return distance;
+            }
+        }
+
+        return null;
+
+    }
+}
+
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonproperty/City.java b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonproperty/City.java
new file mode 100644
index 0000000000..7f763f97c4
--- /dev/null
+++ b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonproperty/City.java
@@ -0,0 +1,15 @@
+package com.baeldung.jackson.deserialization.enums.jsonproperty;
+
+public class City {
+    
+    private Distance distance;
+
+    public Distance getDistance() {
+        return distance;
+    }
+
+    public void setDistance(Distance distance) {
+        this.distance = distance;
+    }
+    
+}
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonproperty/Distance.java b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonproperty/Distance.java
new file mode 100644
index 0000000000..e671a9ae5b
--- /dev/null
+++ b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonproperty/Distance.java
@@ -0,0 +1,51 @@
+package com.baeldung.jackson.deserialization.enums.jsonproperty;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public enum Distance {
+
+    @JsonProperty("distance-in-km")
+    KILOMETER("km", 1000), 
+    
+    @JsonProperty("distance-in-miles")
+    MILE("miles", 1609.34),
+    
+    @JsonProperty("distance-in-meters")
+    METER("meters", 1), 
+    
+    @JsonProperty("distance-in-inches")
+    INCH("inches", 0.0254), 
+    
+    @JsonProperty("distance-in-cm")
+    CENTIMETER("cm", 0.01), 
+    
+    @JsonProperty("distance-in-mm")
+    MILLIMETER("mm", 0.001);
+
+    private String unit;
+    private double meters;
+
+    private Distance(String unit, double meters) {
+        this.unit = unit;
+        this.meters = meters;
+    }
+
+    public void setMeters(double meters) {
+        this.meters = meters;
+    }
+    
+    public double getMeters() {
+        return meters;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+}
+
+
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonvalue/City.java b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonvalue/City.java
new file mode 100644
index 0000000000..014668ea8c
--- /dev/null
+++ b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonvalue/City.java
@@ -0,0 +1,15 @@
+package com.baeldung.jackson.deserialization.enums.jsonvalue;
+
+public class City {
+    
+    private Distance distance;
+
+    public Distance getDistance() {
+        return distance;
+    }
+
+    public void setDistance(Distance distance) {
+        this.distance = distance;
+    }
+    
+}
diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonvalue/Distance.java b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonvalue/Distance.java
new file mode 100644
index 0000000000..44bb5f20c3
--- /dev/null
+++ b/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonvalue/Distance.java
@@ -0,0 +1,35 @@
+package com.baeldung.jackson.deserialization.enums.jsonvalue;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum Distance {
+
+    KILOMETER("km", 1000), MILE("miles", 1609.34), METER("meters", 1), INCH("inches", 0.0254), CENTIMETER("cm", 0.01), MILLIMETER("mm", 0.001);
+
+    private String unit;
+    private double meters;
+
+    private Distance(String unit, double meters) {
+        this.unit = unit;
+        this.meters = meters;
+    }
+
+    public void setMeters(double meters) {
+        this.meters = meters;
+    }
+    
+    @JsonValue
+    public double getMeters() {
+        return meters;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+}
+
diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/dynamicobject/DynamicObjectDeserializationUnitTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/dynamicobject/DynamicObjectDeserializationUnitTest.java
index d49677c1a2..c9536bc35a 100644
--- a/jackson/src/test/java/com/baeldung/jackson/deserialization/dynamicobject/DynamicObjectDeserializationUnitTest.java
+++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/dynamicobject/DynamicObjectDeserializationUnitTest.java
@@ -59,7 +59,7 @@ public class DynamicObjectDeserializationUnitTest {
         String json = readResource("/deserialize-dynamic-object/flat.json");
 
         // when
-        ProductJsonAnySetter product = objectMapper.readValue(json, ProductJsonAnySetter.class);
+        Product product = objectMapper.readValue(json, Product.class);
 
         // then
         assertThat(product.getName()).isEqualTo("Pear yPhone 72");
diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/DefaultEnumDeserializationUnitTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/DefaultEnumDeserializationUnitTest.java
new file mode 100644
index 0000000000..c7ce96e013
--- /dev/null
+++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/DefaultEnumDeserializationUnitTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.jackson.deserialization.enums;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import org.junit.Test;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class DefaultEnumDeserializationUnitTest {
+
+    @Test
+    public void givenEnum_whenDeserializingJson_thenCorrectRepresentation() throws JsonParseException, IOException {
+        String json = "{\"distance\":\"KILOMETER\"}";
+        City city = new ObjectMapper().readValue(json, City.class);
+        
+        assertEquals(Distance.KILOMETER, city.getDistance());
+    }
+
+}
diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/customdeserializer/EnumCustomDeserializationUnitTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/customdeserializer/EnumCustomDeserializationUnitTest.java
new file mode 100644
index 0000000000..e8dbfa8df8
--- /dev/null
+++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/customdeserializer/EnumCustomDeserializationUnitTest.java
@@ -0,0 +1,18 @@
+package com.baeldung.jackson.deserialization.enums.customdeserializer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import org.junit.Test;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class EnumCustomDeserializationUnitTest {
+
+    @Test
+    public void givenEnumWithCustomDeserializer_whenDeserializingJson_thenCorrectRepresentation() throws JsonParseException, IOException {
+        String json = "{\"distance\": {\"unit\":\"miles\",\"meters\":1609.34}}";
+
+        City city = new ObjectMapper().readValue(json, City.class);
+        assertEquals(Distance.MILE, city.getDistance());
+    }
+}
diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java
new file mode 100644
index 0000000000..d778cbe26b
--- /dev/null
+++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.jackson.deserialization.enums.jsoncreator;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import org.junit.Test;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class EnumDeserializationUsingJsonCreatorUnitTest {
+
+    @Test
+    public void givenEnumWithJsonCreator_whenDeserializingJson_thenCorrectRepresentation() throws JsonParseException, IOException {
+        String json = "{\"distance\": {\"unit\":\"miles\",\"meters\":1609.34}}";
+
+        City city = new ObjectMapper().readValue(json, City.class);
+        assertEquals(Distance.MILE, city.getDistance());
+    }
+    
+}
diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java
new file mode 100644
index 0000000000..134f4a29cc
--- /dev/null
+++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java
@@ -0,0 +1,20 @@
+package com.baeldung.jackson.deserialization.enums.jsonproperty;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import org.junit.Test;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class EnumDeserializationUsingJsonPropertyUnitTest {
+
+    @Test
+    public void givenEnumWithJsonProperty_whenDeserializingJson_thenCorrectRepresentation() throws JsonParseException, IOException {
+        String json =  "{\"distance\": \"distance-in-km\"}";
+        
+        City city = new ObjectMapper().readValue(json, City.class);
+        assertEquals(Distance.KILOMETER, city.getDistance());
+
+    }
+
+}
diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java
new file mode 100644
index 0000000000..85afcb9a69
--- /dev/null
+++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.jackson.deserialization.enums.jsonvalue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import org.junit.Test;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class EnumDeserializationUsingJsonValueUnitTest {
+
+    @Test
+    public void givenEnumWithJsonValue_whenDeserializingJson_thenCorrectRepresentation() throws JsonParseException, IOException {
+        String json =  "{\"distance\": \"0.0254\"}";
+        
+        City city = new ObjectMapper().readValue(json, City.class);
+        assertEquals(Distance.INCH, city.getDistance());
+    }
+    
+}
diff --git a/jackson/src/test/java/com/baeldung/jackson/enums/JacksonEnumSerializationUnitTest.java b/jackson/src/test/java/com/baeldung/jackson/enums/JacksonEnumSerializationUnitTest.java
index 45c0ba1382..d4fb2401ed 100644
--- a/jackson/src/test/java/com/baeldung/jackson/enums/JacksonEnumSerializationUnitTest.java
+++ b/jackson/src/test/java/com/baeldung/jackson/enums/JacksonEnumSerializationUnitTest.java
@@ -2,11 +2,8 @@ package com.baeldung.jackson.enums;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
-
 import java.io.IOException;
-
 import org.junit.Test;
-
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -18,5 +15,5 @@ public class JacksonEnumSerializationUnitTest {
 
         assertThat(dtoAsString, containsString("1609.34"));
     }
-
+    
 }
diff --git a/java-blockchain/pom.xml b/java-blockchain/pom.xml
index 2f9e011aa7..4c5d0f31d5 100644
--- a/java-blockchain/pom.xml
+++ b/java-blockchain/pom.xml
@@ -7,12 +7,14 @@
     <version>0.1.0-SNAPSHOT</version>
     <name>java-blockchain</name>
     <packaging>jar</packaging>
+
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../parent-java</relativePath>
     </parent>
+
     <build>
         <finalName>java-blockchain</finalName>
         <resources>
@@ -33,8 +35,10 @@
             </plugin>
         </plugins>
     </build>
+
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
+
 </project>
\ No newline at end of file
diff --git a/java-dates-2/.gitignore b/java-dates-2/.gitignore
deleted file mode 100644
index 6471aabbcf..0000000000
--- a/java-dates-2/.gitignore
+++ /dev/null
@@ -1,29 +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
-
-#jenv
-.java-version
\ No newline at end of file
diff --git a/java-dates-2/README.md b/java-dates-2/README.md
deleted file mode 100644
index b2f8319e58..0000000000
--- a/java-dates-2/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## 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 3a215f9094..d4657a3057 100644
--- a/java-dates/README.md
+++ b/java-dates/README.md
@@ -3,30 +3,22 @@
 ## Java Dates Cookbooks and Examples
 
 ### Relevant Articles: 
-- [TemporalAdjuster in Java](https://www.baeldung.com/java-temporal-adjuster)
-- [Handling Daylight Savings Time in Java](https://www.baeldung.com/java-daylight-savings)
-- [Period and Duration in Java](https://www.baeldung.com/java-period-duration)
-- [Difference Between Two Dates in Java](https://www.baeldung.com/java-date-difference)
-- [RegEx for matching Date Pattern in Java](https://www.baeldung.com/java-date-regular-expressions)
-- [Migrating to the New Java 8 Date Time API](https://www.baeldung.com/migrating-to-java-8-date-time-api)
-- [Introduction to the Java 8 Date/Time API](https://www.baeldung.com/java-8-date-time-intro)
-- [Get the Current Date, Time and Timestamp in Java 8](https://www.baeldung.com/current-date-time-and-timestamp-in-java-8)
-- [Get Date Without Time in Java](https://www.baeldung.com/java-date-without-time)
-- [How to Get All Dates Between Two Dates?](https://www.baeldung.com/java-between-dates)
-- [Convert Date to LocalDate or LocalDateTime and Back](https://www.baeldung.com/java-date-to-localdate-and-localdatetime)
-- [Display All Time Zones With GMT And UTC in Java](https://www.baeldung.com/java-time-zones)
-- [Extracting Year, Month and Day from Date in Java](https://www.baeldung.com/java-year-month-day)
-- [Guide to java.util.GregorianCalendar](https://www.baeldung.com/java-gregorian-calendar)
-- [Measure Elapsed Time in Java](https://www.baeldung.com/java-measure-elapsed-time)
-- [How to Get the Start and the End of a Day using Java](https://www.baeldung.com/java-day-start-end)
-- [Calculate Age in Java](https://www.baeldung.com/java-get-age)
-- [Increment Date in Java](https://www.baeldung.com/java-increment-date)
-- [Add Hours To a Date In Java](https://www.baeldung.com/java-add-hours-date)
-- [Guide to DateTimeFormatter](https://www.baeldung.com/java-datetimeformatter)
-- [Format ZonedDateTime to String](https://www.baeldung.com/java-format-zoned-datetime-string)
-- [Convert Between java.time.Instant and java.sql.Timestamp](https://www.baeldung.com/java-time-instant-to-java-sql-timestamp)
-- [Convert between String and Timestamp](https://www.baeldung.com/java-string-to-timestamp)
-- [A Guide to SimpleDateFormat](https://www.baeldung.com/java-simple-date-format)
+- [TemporalAdjuster in Java](http://www.baeldung.com/java-temporal-adjuster)
+- [Handling Daylight Savings Time in Java](http://www.baeldung.com/java-daylight-savings)
+- [Period and Duration in Java](http://www.baeldung.com/java-period-duration)
+- [Difference Between Two Dates in Java](http://www.baeldung.com/java-date-difference)
+- [Migrating to the New Java 8 Date Time API](http://www.baeldung.com/migrating-to-java-8-date-time-api)
+- [Introduction to the Java 8 Date/Time API](http://www.baeldung.com/java-8-date-time-intro)
+- [Get the Current Date, Time and Timestamp in Java 8](http://www.baeldung.com/current-date-time-and-timestamp-in-java-8)
+- [Get Date Without Time in Java](http://www.baeldung.com/java-date-without-time)
+- [How to Get All Dates Between Two Dates?](http://www.baeldung.com/java-between-dates)
+- [Extracting Year, Month and Day from Date in Java](http://www.baeldung.com/java-year-month-day)
+- [Guide to java.util.GregorianCalendar](http://www.baeldung.com/java-gregorian-calendar)
+- [Measure Elapsed Time in Java](http://www.baeldung.com/java-measure-elapsed-time)
+- [How to Get the Start and the End of a Day using Java](http://www.baeldung.com/java-day-start-end)
+- [Calculate Age in Java](http://www.baeldung.com/java-get-age)
+- [Increment Date in Java](http://www.baeldung.com/java-increment-date)
+- [Add Hours To a Date In Java](http://www.baeldung.com/java-add-hours-date)
 - [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](https://www.baeldung.com/joda-time)
diff --git a/java-dates/pom.xml b/java-dates/pom.xml
index 3fddf3f0f8..761ebd71a6 100644
--- a/java-dates/pom.xml
+++ b/java-dates/pom.xml
@@ -25,12 +25,6 @@
             <artifactId>log4j</artifactId>
             <version>${log4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>
diff --git a/java-dates-2/src/main/java/com/baeldung/date/comparison/DateTimeComparisonUtils.java b/java-dates/src/main/java/com/baeldung/date/comparison/DateTimeComparisonUtils.java
similarity index 100%
rename from java-dates-2/src/main/java/com/baeldung/date/comparison/DateTimeComparisonUtils.java
rename to java-dates/src/main/java/com/baeldung/date/comparison/DateTimeComparisonUtils.java
diff --git a/java-dates-2/src/main/java/com/baeldung/date/comparison/LegacyDateComparisonUtils.java b/java-dates/src/main/java/com/baeldung/date/comparison/LegacyDateComparisonUtils.java
similarity index 100%
rename from java-dates-2/src/main/java/com/baeldung/date/comparison/LegacyDateComparisonUtils.java
rename to java-dates/src/main/java/com/baeldung/date/comparison/LegacyDateComparisonUtils.java
diff --git a/java-dates/src/main/java/com/baeldung/datetime/UseDateTimeFormatter.java b/java-dates/src/main/java/com/baeldung/datetime/UseDateTimeFormatter.java
new file mode 100644
index 0000000000..13a2ba6a1a
--- /dev/null
+++ b/java-dates/src/main/java/com/baeldung/datetime/UseDateTimeFormatter.java
@@ -0,0 +1,21 @@
+package com.baeldung.datetime;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
+import java.util.Locale;
+
+public class UseDateTimeFormatter {
+    public String formatAsIsoDate(LocalDateTime localDateTime) {
+        return localDateTime.format(DateTimeFormatter.ISO_DATE);
+    }
+
+    public String formatCustom(LocalDateTime localDateTime, String pattern) {
+        return localDateTime.format(DateTimeFormatter.ofPattern(pattern));
+    }
+
+    public String formatWithStyleAndLocale(LocalDateTime localDateTime, FormatStyle formatStyle, Locale locale) {
+        return localDateTime.format(DateTimeFormatter.ofLocalizedDateTime(formatStyle)
+            .withLocale(locale));
+    }
+}
diff --git a/java-dates/src/main/java/com/baeldung/datetime/UseLocalDate.java b/java-dates/src/main/java/com/baeldung/datetime/UseLocalDate.java
index b380c04fc2..ec8dfa2fc4 100644
--- a/java-dates/src/main/java/com/baeldung/datetime/UseLocalDate.java
+++ b/java-dates/src/main/java/com/baeldung/datetime/UseLocalDate.java
@@ -36,10 +36,15 @@ class UseLocalDate {
     }
 
     LocalDate getFirstDayOfMonth() {
-        LocalDate firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
+        LocalDate firstDayOfMonth = LocalDate.now()
+            .with(TemporalAdjusters.firstDayOfMonth());
         return firstDayOfMonth;
     }
 
+    boolean isLeapYear(LocalDate localDate) {
+        return localDate.isLeapYear();
+    }
+
     LocalDateTime getStartOfDay(LocalDate localDate) {
         LocalDateTime startofDay = localDate.atStartOfDay();
         return startofDay;
diff --git a/java-dates/src/main/java/com/baeldung/datetime/UseLocalDateTime.java b/java-dates/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
index b2ff11ba16..267a9412eb 100644
--- a/java-dates/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
+++ b/java-dates/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
@@ -2,6 +2,7 @@ package com.baeldung.datetime;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.ZoneOffset;
 import java.time.temporal.ChronoField;
 
 public class UseLocalDateTime {
@@ -21,4 +22,7 @@ public class UseLocalDateTime {
         return endOfDate;
     }
 
+    LocalDateTime ofEpochSecond(int epochSecond, ZoneOffset zoneOffset) {
+        return LocalDateTime.ofEpochSecond(epochSecond, 0, zoneOffset);
+    }
 }
diff --git a/java-dates/src/main/java/com/baeldung/datetime/UseLocalTime.java b/java-dates/src/main/java/com/baeldung/datetime/UseLocalTime.java
index 8d166c413f..876516e365 100644
--- a/java-dates/src/main/java/com/baeldung/datetime/UseLocalTime.java
+++ b/java-dates/src/main/java/com/baeldung/datetime/UseLocalTime.java
@@ -9,6 +9,10 @@ public class UseLocalTime {
         return LocalTime.of(hour, min, seconds);
     }
 
+    LocalTime getLocalTimeUsingFactoryOfMethod(int hour, int min) {
+        return LocalTime.of(hour, min);
+    }
+
     LocalTime getLocalTimeUsingParseMethod(String timeRepresentation) {
         return LocalTime.parse(timeRepresentation);
     }
diff --git a/java-dates/src/main/java/com/baeldung/datetime/UseOffsetDateTime.java b/java-dates/src/main/java/com/baeldung/datetime/UseOffsetDateTime.java
new file mode 100644
index 0000000000..ed8499d6e0
--- /dev/null
+++ b/java-dates/src/main/java/com/baeldung/datetime/UseOffsetDateTime.java
@@ -0,0 +1,11 @@
+package com.baeldung.datetime;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+
+public class UseOffsetDateTime {
+    public OffsetDateTime offsetOfLocalDateTimeAndOffset(LocalDateTime localDateTime, ZoneOffset offset) {
+        return OffsetDateTime.of(localDateTime, offset);
+    }
+}
diff --git a/java-dates/src/main/java/com/baeldung/datetime/UseZonedDateTime.java b/java-dates/src/main/java/com/baeldung/datetime/UseZonedDateTime.java
index 505bfa741f..a8948e5ce1 100644
--- a/java-dates/src/main/java/com/baeldung/datetime/UseZonedDateTime.java
+++ b/java-dates/src/main/java/com/baeldung/datetime/UseZonedDateTime.java
@@ -12,31 +12,35 @@ class UseZonedDateTime {
         return ZonedDateTime.of(localDateTime, zoneId);
     }
 
+    ZonedDateTime getZonedDateTimeUsingParseMethod(String parsableString) {
+        return ZonedDateTime.parse(parsableString);
+    }
+
     ZonedDateTime getStartOfDay(LocalDate localDate, ZoneId zone) {
-        ZonedDateTime startofDay = localDate.atStartOfDay()
+        ZonedDateTime startOfDay = localDate.atStartOfDay()
             .atZone(zone);
-        return startofDay;
+        return startOfDay;
     }
 
     ZonedDateTime getStartOfDayShorthand(LocalDate localDate, ZoneId zone) {
-        ZonedDateTime startofDay = localDate.atStartOfDay(zone);
-        return startofDay;
+        ZonedDateTime startOfDay = localDate.atStartOfDay(zone);
+        return startOfDay;
     }
 
     ZonedDateTime getStartOfDayFromZonedDateTime(ZonedDateTime zonedDateTime) {
-        ZonedDateTime startofDay = zonedDateTime.toLocalDateTime()
+        ZonedDateTime startOfDay = zonedDateTime.toLocalDateTime()
             .toLocalDate()
             .atStartOfDay(zonedDateTime.getZone());
-        return startofDay;
+        return startOfDay;
     }
 
     ZonedDateTime getStartOfDayAtMinTime(ZonedDateTime zonedDateTime) {
-        ZonedDateTime startofDay = zonedDateTime.with(ChronoField.HOUR_OF_DAY, 0);
-        return startofDay;
+        ZonedDateTime startOfDay = zonedDateTime.with(ChronoField.HOUR_OF_DAY, 0);
+        return startOfDay;
     }
 
     ZonedDateTime getStartOfDayAtMidnightTime(ZonedDateTime zonedDateTime) {
-        ZonedDateTime startofDay = zonedDateTime.with(ChronoField.NANO_OF_DAY, 0);
-        return startofDay;
+        ZonedDateTime startOfDay = zonedDateTime.with(ChronoField.NANO_OF_DAY, 0);
+        return startOfDay;
     }
 }
diff --git a/java-dates/src/test/java/com/baeldung/date/DateDiffUnitTest.java b/java-dates/src/test/java/com/baeldung/date/DateDiffUnitTest.java
index a35699e469..226556d4bb 100644
--- a/java-dates/src/test/java/com/baeldung/date/DateDiffUnitTest.java
+++ b/java-dates/src/test/java/com/baeldung/date/DateDiffUnitTest.java
@@ -1,6 +1,6 @@
 package com.baeldung.date;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -16,7 +16,7 @@ import java.util.Locale;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
 
 public class DateDiffUnitTest {
 
@@ -31,14 +31,14 @@ public class DateDiffUnitTest {
 
         assertEquals(diff, 6);
     }
-    
+
     @Test
     public void givenTwoDatesInJava8_whenDifferentiating_thenWeGetSix() {
         LocalDate now = LocalDate.now();
         LocalDate sixDaysBehind = now.minusDays(6);
 
         Period period = Period.between(now, sixDaysBehind);
-        int diff = period.getDays();
+        int diff = Math.abs(period.getDays());
 
         assertEquals(diff, 6);
     }
@@ -68,7 +68,8 @@ public class DateDiffUnitTest {
     public void givenTwoZonedDateTimesInJava8_whenDifferentiating_thenWeGetSix() {
         LocalDateTime ldt = LocalDateTime.now();
         ZonedDateTime now = ldt.atZone(ZoneId.of("America/Montreal"));
-        ZonedDateTime sixDaysBehind = now.withZoneSameInstant(ZoneId.of("Asia/Singapore")).minusDays(6);
+        ZonedDateTime sixDaysBehind = now.withZoneSameInstant(ZoneId.of("Asia/Singapore"))
+            .minusDays(6);
         long diff = ChronoUnit.DAYS.between(sixDaysBehind, now);
         assertEquals(diff, 6);
     }
diff --git a/java-dates-2/src/test/java/com/baeldung/date/comparison/DateTimeComparisonUtilsUnitTest.java b/java-dates/src/test/java/com/baeldung/date/comparison/DateTimeComparisonUtilsUnitTest.java
similarity index 100%
rename from java-dates-2/src/test/java/com/baeldung/date/comparison/DateTimeComparisonUtilsUnitTest.java
rename to java-dates/src/test/java/com/baeldung/date/comparison/DateTimeComparisonUtilsUnitTest.java
diff --git a/java-dates-2/src/test/java/com/baeldung/date/comparison/Java8DateTimeApiGeneralComparisonsUnitTest.java b/java-dates/src/test/java/com/baeldung/date/comparison/Java8DateTimeApiGeneralComparisonsUnitTest.java
similarity index 85%
rename from java-dates-2/src/test/java/com/baeldung/date/comparison/Java8DateTimeApiGeneralComparisonsUnitTest.java
rename to java-dates/src/test/java/com/baeldung/date/comparison/Java8DateTimeApiGeneralComparisonsUnitTest.java
index ff51476e7c..af72f9e58a 100644
--- a/java-dates-2/src/test/java/com/baeldung/date/comparison/Java8DateTimeApiGeneralComparisonsUnitTest.java
+++ b/java-dates/src/test/java/com/baeldung/date/comparison/Java8DateTimeApiGeneralComparisonsUnitTest.java
@@ -1,12 +1,16 @@
 package com.baeldung.date.comparison;
 
-import org.junit.Test;
-
-import java.time.*;
-
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+import org.junit.Test;
+
 public class Java8DateTimeApiGeneralComparisonsUnitTest {
 
     @Test
@@ -54,10 +58,8 @@ public class Java8DateTimeApiGeneralComparisonsUnitTest {
 
     @Test
     public void givenZonedDateTimes_whenComparing_thenAssertsPass() {
-        ZonedDateTime timeInNewYork = ZonedDateTime.of(2019, 8, 10, 8, 0, 0, 0,
-          ZoneId.of("America/New_York"));
-        ZonedDateTime timeInBerlin = ZonedDateTime.of(2019, 8, 10, 14, 0, 0, 0,
-          ZoneId.of("Europe/Berlin"));
+        ZonedDateTime timeInNewYork = ZonedDateTime.of(2019, 8, 10, 8, 0, 0, 0, ZoneId.of("America/New_York"));
+        ZonedDateTime timeInBerlin = ZonedDateTime.of(2019, 8, 10, 14, 0, 0, 0, ZoneId.of("Europe/Berlin"));
 
         assertThat(timeInNewYork.isAfter(timeInBerlin), is(false));
         assertThat(timeInNewYork.isBefore(timeInBerlin), is(false));
@@ -80,4 +82,14 @@ public class Java8DateTimeApiGeneralComparisonsUnitTest {
 
         assertThat(firstTime.compareTo(secondTime), is(-1));
     }
+
+    @Test
+    public void givenMinMaxLocalTimes_whenComparing_thenAssertsPass() {
+        LocalTime minTime = LocalTime.MIN;
+        LocalTime time = LocalTime.of(8, 30);
+        LocalTime maxTime = LocalTime.MAX;
+
+        assertThat(minTime.isBefore(time), is(true));
+        assertThat(time.isBefore(maxTime), is(true));
+    }
 }
\ No newline at end of file
diff --git a/java-dates-2/src/test/java/com/baeldung/date/comparison/LegacyDateComparisonUtilsUnitTest.java b/java-dates/src/test/java/com/baeldung/date/comparison/LegacyDateComparisonUtilsUnitTest.java
similarity index 100%
rename from java-dates-2/src/test/java/com/baeldung/date/comparison/LegacyDateComparisonUtilsUnitTest.java
rename to java-dates/src/test/java/com/baeldung/date/comparison/LegacyDateComparisonUtilsUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/dateapi/JavaDurationUnitTest.java b/java-dates/src/test/java/com/baeldung/dateapi/JavaDurationUnitTest.java
index db6b353ba6..be43fb609a 100644
--- a/java-dates/src/test/java/com/baeldung/dateapi/JavaDurationUnitTest.java
+++ b/java-dates/src/test/java/com/baeldung/dateapi/JavaDurationUnitTest.java
@@ -1,16 +1,39 @@
 package com.baeldung.dateapi;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
 import java.time.Duration;
 import java.time.Instant;
+import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
 
 import org.junit.Test;
 
 public class JavaDurationUnitTest {
 
+    @Test
+    public void givenATimePlus30Seconds_whenRequestingDuration_thenExpect30() {
+        LocalTime initialTime = LocalTime.of(6, 30, 0);
+        LocalTime finalTime = initialTime.plus(Duration.ofSeconds(30));
+
+        long seconds = Duration.between(initialTime, finalTime)
+            .getSeconds();
+
+        assertThat(seconds).isEqualTo(30);
+    }
+
+    @Test
+    public void givenATimePlus30Seconds_whenRequestingSecondsBetween_thenExpect30() {
+        LocalTime initialTime = LocalTime.of(6, 30, 0);
+        LocalTime finalTime = initialTime.plus(Duration.ofSeconds(30));
+
+        long seconds = ChronoUnit.SECONDS.between(initialTime, finalTime);
+
+        assertThat(seconds).isEqualTo(30);
+    }
+
     @Test
     public void test2() {
         Instant start = Instant.parse("2017-10-03T10:15:30.00Z");
@@ -29,11 +52,15 @@ public class JavaDurationUnitTest {
         Duration fromMinutes = Duration.ofMinutes(60);
         assertEquals(1, fromMinutes.toHours());
 
-        assertEquals(120, duration.plusSeconds(60).getSeconds());
-        assertEquals(30, duration.minusSeconds(30).getSeconds());
+        assertEquals(120, duration.plusSeconds(60)
+            .getSeconds());
+        assertEquals(30, duration.minusSeconds(30)
+            .getSeconds());
 
-        assertEquals(120, duration.plus(60, ChronoUnit.SECONDS).getSeconds());
-        assertEquals(30, duration.minus(30, ChronoUnit.SECONDS).getSeconds());
+        assertEquals(120, duration.plus(60, ChronoUnit.SECONDS)
+            .getSeconds());
+        assertEquals(30, duration.minus(30, ChronoUnit.SECONDS)
+            .getSeconds());
 
         Duration fromChar1 = Duration.parse("P1DT1H10M10.5S");
         Duration fromChar2 = Duration.parse("PT10M");
diff --git a/java-dates/src/test/java/com/baeldung/dateapi/JavaPeriodUnitTest.java b/java-dates/src/test/java/com/baeldung/dateapi/JavaPeriodUnitTest.java
index 81e9153a51..6dfbbe8c24 100644
--- a/java-dates/src/test/java/com/baeldung/dateapi/JavaPeriodUnitTest.java
+++ b/java-dates/src/test/java/com/baeldung/dateapi/JavaPeriodUnitTest.java
@@ -1,18 +1,41 @@
 package com.baeldung.dateapi;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.temporal.ChronoUnit;
+
 import org.apache.log4j.Logger;
 import org.junit.Test;
 
-import java.time.LocalDate;
-import java.time.Period;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
 public class JavaPeriodUnitTest {
 
     private static final Logger LOG = Logger.getLogger(JavaPeriodUnitTest.class);
 
+    @Test
+    public void givenADatePlus5Days_whenRequestingPeriod_thenExpectFive() {
+        LocalDate initialDate = LocalDate.parse("2007-05-10");
+        LocalDate finalDate = initialDate.plus(Period.ofDays(5));
+
+        int days = Period.between(initialDate, finalDate)
+            .getDays();
+
+        assertThat(days).isEqualTo(5);
+    }
+
+    @Test
+    public void givenADatePlus5Days_whenRequestingDaysBetween_thenExpectFive() {
+        LocalDate initialDate = LocalDate.parse("2007-05-10");
+        LocalDate finalDate = initialDate.plus(Period.ofDays(5));
+
+        long days = ChronoUnit.DAYS.between(initialDate, finalDate);
+
+        assertThat(days).isEqualTo(5);
+    }
+
     @Test
     public void whenTestPeriod_thenOk() {
 
@@ -24,8 +47,10 @@ public class JavaPeriodUnitTest {
         LOG.info(String.format("Years:%d months:%d days:%d", period.getYears(), period.getMonths(), period.getDays()));
 
         assertFalse(period.isNegative());
-        assertEquals(56, period.plusDays(50).getDays());
-        assertEquals(9, period.minusMonths(2).getMonths());
+        assertEquals(56, period.plusDays(50)
+            .getDays());
+        assertEquals(9, period.minusMonths(2)
+            .getMonths());
 
         Period fromUnits = Period.of(3, 10, 10);
         Period fromDays = Period.ofDays(50);
diff --git a/java-dates/src/test/java/com/baeldung/datetime/UseDateTimeFormatterUnitTest.java b/java-dates/src/test/java/com/baeldung/datetime/UseDateTimeFormatterUnitTest.java
new file mode 100644
index 0000000000..797e0b954a
--- /dev/null
+++ b/java-dates/src/test/java/com/baeldung/datetime/UseDateTimeFormatterUnitTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.datetime;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.LocalDateTime;
+import java.time.Month;
+import java.time.format.FormatStyle;
+import java.util.Locale;
+
+import org.junit.Test;
+
+public class UseDateTimeFormatterUnitTest {
+    private final UseDateTimeFormatter subject = new UseDateTimeFormatter();
+    private final LocalDateTime localDateTime = LocalDateTime.of(2015, Month.JANUARY, 25, 6, 30);
+
+    @Test
+    public void givenALocalDate_whenFormattingAsIso_thenPass() {
+        String result = subject.formatAsIsoDate(localDateTime);
+
+        assertThat(result).isEqualTo("2015-01-25");
+    }
+
+    @Test
+    public void givenALocalDate_whenFormattingWithPattern_thenPass() {
+        String result = subject.formatCustom(localDateTime, "yyyy/MM/dd");
+
+        assertThat(result).isEqualTo("2015/01/25");
+    }
+
+    @Test
+    public void givenALocalDate_whenFormattingWithStyleAndLocale_thenPass() {
+        String result = subject.formatWithStyleAndLocale(localDateTime, FormatStyle.MEDIUM, Locale.UK);
+
+        assertThat(result).isEqualTo("25 Jan 2015, 06:30:00");
+    }
+}
\ No newline at end of file
diff --git a/java-dates/src/test/java/com/baeldung/datetime/UseLocalDateTimeUnitTest.java b/java-dates/src/test/java/com/baeldung/datetime/UseLocalDateTimeUnitTest.java
index 5709fc7209..2bbee16e25 100644
--- a/java-dates/src/test/java/com/baeldung/datetime/UseLocalDateTimeUnitTest.java
+++ b/java-dates/src/test/java/com/baeldung/datetime/UseLocalDateTimeUnitTest.java
@@ -7,12 +7,13 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.Month;
+import java.time.ZoneOffset;
 
 import org.junit.Test;
 
 public class UseLocalDateTimeUnitTest {
 
-    UseLocalDateTime useLocalDateTime = new UseLocalDateTime();
+    private UseLocalDateTime useLocalDateTime = new UseLocalDateTime();
 
     @Test
     public void givenString_whenUsingParse_thenLocalDateTime() {
@@ -33,4 +34,28 @@ public class UseLocalDateTimeUnitTest {
         assertThat(endOfDayFromGivenDirectly.toLocalTime()).isEqualTo(LocalTime.MAX);
         assertThat(endOfDayFromGivenDirectly.toString()).isEqualTo("2018-06-23T23:59:59.999999999");
     }
+
+    @Test
+    public void givenLocalDateTimeInFebruary_whenRequestingMonth_thenMonthIsFebruary() {
+        LocalDateTime givenLocalDateTime = LocalDateTime.of(2015, Month.FEBRUARY, 20, 6, 30);
+
+        assertThat(givenLocalDateTime.getMonth()).isEqualTo(Month.FEBRUARY);
+    }
+
+    @Test
+    public void givenLocalDateTime_whenManipulating_thenResultIsAsExpected() {
+        LocalDateTime givenLocalDateTime = LocalDateTime.parse("2015-02-20T06:30:00");
+
+        LocalDateTime manipulatedLocalDateTime = givenLocalDateTime.plusDays(1);
+        manipulatedLocalDateTime = manipulatedLocalDateTime.minusHours(2);
+
+        assertThat(manipulatedLocalDateTime).isEqualTo(LocalDateTime.of(2015, Month.FEBRUARY, 21, 4, 30));
+    }
+
+    @Test
+    public void whenRequestTimeFromEpoch_thenResultIsAsExpected() {
+        LocalDateTime result = useLocalDateTime.ofEpochSecond(1465817690, ZoneOffset.UTC);
+
+        assertThat(result.toString()).isEqualTo("2016-06-13T11:34:50");
+    }
 }
diff --git a/java-dates/src/test/java/com/baeldung/datetime/UseLocalDateUnitTest.java b/java-dates/src/test/java/com/baeldung/datetime/UseLocalDateUnitTest.java
index bb9b60956d..fd22be9260 100644
--- a/java-dates/src/test/java/com/baeldung/datetime/UseLocalDateUnitTest.java
+++ b/java-dates/src/test/java/com/baeldung/datetime/UseLocalDateUnitTest.java
@@ -12,7 +12,7 @@ import org.junit.Test;
 
 public class UseLocalDateUnitTest {
 
-    UseLocalDate useLocalDate = new UseLocalDate();
+    private UseLocalDate useLocalDate = new UseLocalDate();
 
     @Test
     public void givenValues_whenUsingFactoryOf_thenLocalDate() {
@@ -88,4 +88,31 @@ public class UseLocalDateUnitTest {
         assertThat(endOfDayWithMax.toString()).isEqualTo("2018-06-23T23:59:59.999999999");
     }
 
+    @Test
+    public void givenTheYear2000_whenCheckingForLeapYear_thenReturnTrue() {
+        LocalDate given = LocalDate.parse("2000-06-23");
+
+        boolean leapYear = useLocalDate.isLeapYear(given);
+
+        assertThat(leapYear).isEqualTo(true);
+    }
+
+    @Test
+    public void givenTheYear2004_whenCheckingForLeapYear_thenReturnTrue() {
+        LocalDate given = LocalDate.parse("2004-06-23");
+
+        boolean leapYear = useLocalDate.isLeapYear(given);
+
+        assertThat(leapYear).isEqualTo(true);
+    }
+
+    @Test
+    public void givenTheYear2019_whenCheckingForLeapYear_thenReturnFalse() {
+        LocalDate given = LocalDate.parse("2019-06-23");
+
+        boolean leapYear = useLocalDate.isLeapYear(given);
+
+        assertThat(leapYear).isEqualTo(false);
+    }
+
 }
diff --git a/java-dates/src/test/java/com/baeldung/datetime/UseLocalTimeUnitTest.java b/java-dates/src/test/java/com/baeldung/datetime/UseLocalTimeUnitTest.java
index 996e200ae9..afee9126f9 100644
--- a/java-dates/src/test/java/com/baeldung/datetime/UseLocalTimeUnitTest.java
+++ b/java-dates/src/test/java/com/baeldung/datetime/UseLocalTimeUnitTest.java
@@ -7,21 +7,30 @@ import org.junit.Test;
 
 public class UseLocalTimeUnitTest {
 
-    UseLocalTime useLocalTime = new UseLocalTime();
+    private UseLocalTime useLocalTime = new UseLocalTime();
 
     @Test
     public void givenValues_whenUsingFactoryOf_thenLocalTime() {
-        Assert.assertEquals("07:07:07", useLocalTime.getLocalTimeUsingFactoryOfMethod(7, 7, 7).toString());
+        Assert.assertEquals("07:07:07", useLocalTime.getLocalTimeUsingFactoryOfMethod(7, 7, 7)
+            .toString());
+    }
+
+    @Test
+    public void givenValues_whenUsingFactoryOfWithoutSeconds_thenLocalTime() {
+        Assert.assertEquals("07:07", useLocalTime.getLocalTimeUsingFactoryOfMethod(7, 7)
+            .toString());
     }
 
     @Test
     public void givenString_whenUsingParse_thenLocalTime() {
-        Assert.assertEquals("06:30", useLocalTime.getLocalTimeUsingParseMethod("06:30").toString());
+        Assert.assertEquals("06:30", useLocalTime.getLocalTimeUsingParseMethod("06:30")
+            .toString());
     }
 
     @Test
     public void givenTime_whenAddHour_thenLocalTime() {
-        Assert.assertEquals("07:30", useLocalTime.addAnHour(LocalTime.of(6, 30)).toString());
+        Assert.assertEquals("07:30", useLocalTime.addAnHour(LocalTime.of(6, 30))
+            .toString());
     }
 
     @Test
diff --git a/java-dates/src/test/java/com/baeldung/datetime/UseOffsetDateTimeUnitTest.java b/java-dates/src/test/java/com/baeldung/datetime/UseOffsetDateTimeUnitTest.java
new file mode 100644
index 0000000000..5b58dd3848
--- /dev/null
+++ b/java-dates/src/test/java/com/baeldung/datetime/UseOffsetDateTimeUnitTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.datetime;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.LocalDateTime;
+import java.time.Month;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+
+import org.junit.Test;
+
+public class UseOffsetDateTimeUnitTest {
+    private final UseOffsetDateTime subject = new UseOffsetDateTime();
+
+    @Test
+    public void givenAZoneOffSetAndLocalDateTime_whenCombing_thenValidResult() {
+        ZoneOffset offset = ZoneOffset.of("+02:00");
+        LocalDateTime localDateTime = LocalDateTime.of(2015, Month.FEBRUARY, 20, 6, 30);
+
+        OffsetDateTime result = subject.offsetOfLocalDateTimeAndOffset(localDateTime, offset);
+
+        assertThat(result.toString()).isEqualTo("2015-02-20T06:30+02:00");
+    }
+}
\ No newline at end of file
diff --git a/java-dates/src/test/java/com/baeldung/datetime/UseToInstantUnitTest.java b/java-dates/src/test/java/com/baeldung/datetime/UseToInstantUnitTest.java
new file mode 100644
index 0000000000..78d9a647fe
--- /dev/null
+++ b/java-dates/src/test/java/com/baeldung/datetime/UseToInstantUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.datetime;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.LocalDateTime;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import org.junit.Test;
+
+public class UseToInstantUnitTest {
+
+    private UseToInstant subject = new UseToInstant();
+
+    @Test
+    public void givenAGregorianCalenderDate_whenConvertingToLocalDate_thenAsExpected() {
+        GregorianCalendar givenCalender = new GregorianCalendar(2018, Calendar.JULY, 28);
+
+        LocalDateTime localDateTime = subject.convertDateToLocalDate(givenCalender);
+
+        assertThat(localDateTime).isEqualTo("2018-07-28T00:00:00");
+    }
+
+    @Test
+    public void givenADate_whenConvertingToLocalDate_thenAsExpected() {
+        Date givenDate = new Date(1465817690000L);
+
+        LocalDateTime localDateTime = subject.convertDateToLocalDate(givenDate);
+
+        assertThat(localDateTime).isEqualTo("2016-06-13T13:34:50");
+    }
+}
\ No newline at end of file
diff --git a/java-dates/src/test/java/com/baeldung/datetime/UseZonedDateTimeUnitTest.java b/java-dates/src/test/java/com/baeldung/datetime/UseZonedDateTimeUnitTest.java
index f9b4008888..4a39f6056e 100644
--- a/java-dates/src/test/java/com/baeldung/datetime/UseZonedDateTimeUnitTest.java
+++ b/java-dates/src/test/java/com/baeldung/datetime/UseZonedDateTimeUnitTest.java
@@ -7,13 +7,14 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.Set;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 public class UseZonedDateTimeUnitTest {
 
-    UseZonedDateTime zonedDateTime = new UseZonedDateTime();
+    private UseZonedDateTime zonedDateTime = new UseZonedDateTime();
 
     @Test
     public void givenZoneId_thenZonedDateTime() {
@@ -22,6 +23,13 @@ public class UseZonedDateTimeUnitTest {
         Assert.assertEquals(zoneId, ZoneId.from(zonedDatetime));
     }
 
+    @Test
+    public void whenRequestingZones_thenAtLeastOneIsReturned() {
+        Set<String> allZoneIds = ZoneId.getAvailableZoneIds();
+
+        assertThat(allZoneIds.size()).isGreaterThan(1);
+    }
+
     @Test
     public void givenLocalDateOrZoned_whenSettingStartOfDay_thenReturnMidnightInAllCases() {
         LocalDate given = LocalDate.parse("2018-06-23");
@@ -42,4 +50,15 @@ public class UseZonedDateTimeUnitTest {
         assertThat(startOfOfDayWithMethod.toLocalTime()
             .toString()).isEqualTo("00:00");
     }
+
+    @Test
+    public void givenAStringWithTimeZone_whenParsing_thenEqualsExpected() {
+        ZonedDateTime resultFromString = zonedDateTime.getZonedDateTimeUsingParseMethod("2015-05-03T10:15:30+01:00[Europe/Paris]");
+        ZonedDateTime resultFromLocalDateTime = ZonedDateTime.of(2015, 5, 3, 11, 15, 30, 0, ZoneId.of("Europe/Paris"));
+
+        assertThat(resultFromString.getZone()).isEqualTo(ZoneId.of("Europe/Paris"));
+        assertThat(resultFromLocalDateTime.getZone()).isEqualTo(ZoneId.of("Europe/Paris"));
+
+        assertThat(resultFromString).isEqualTo(resultFromLocalDateTime);
+    }
 }
diff --git a/java-ee-8-security-api/pom.xml b/java-ee-8-security-api/pom.xml
index 4d4e2ba3b3..f43f3d7c5f 100644
--- a/java-ee-8-security-api/pom.xml
+++ b/java-ee-8-security-api/pom.xml
@@ -14,6 +14,13 @@
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
+    <modules>
+        <module>app-auth-basic-store-db</module>
+        <module>app-auth-form-store-ldap</module>
+        <module>app-auth-custom-form-store-custom</module>
+        <module>app-auth-custom-no-store</module>
+    </modules>
+
     <dependencies>
     
         <dependency>
@@ -58,17 +65,9 @@
         </plugins>
     </build>
 
-    <modules>
-        <module>app-auth-basic-store-db</module>
-        <module>app-auth-form-store-ldap</module>
-        <module>app-auth-custom-form-store-custom</module>
-        <module>app-auth-custom-no-store</module>
-    </modules>
-
     <properties>
         <defaultHttpPort>9080</defaultHttpPort>
         <defaultHttpsPort>9443</defaultHttpsPort>
-
         <javaee-version>8.0</javaee-version>
         <liberty-maven-plugin.version>2.3</liberty-maven-plugin.version>
         <openliberty-runtime.version>18.0.0.1</openliberty-runtime.version>
diff --git a/java-math/README.md b/java-math/README.md
index 49ff5afde1..d80a07258a 100644
--- a/java-math/README.md
+++ b/java-math/README.md
@@ -14,3 +14,5 @@ This module contains articles about math in Java.
 - [Convert Latitude and Longitude to a 2D Point in Java](https://www.baeldung.com/java-convert-latitude-longitude)
 - [Debugging with Eclipse](https://www.baeldung.com/eclipse-debugging)
 - [Matrix Multiplication in Java](https://www.baeldung.com/java-matrix-multiplication)
+- [Calculating Logarithms in Java](https://www.baeldung.com/java-logarithms)
+- [Finding Greatest Common Divisor in Java](https://www.baeldung.com/java-greatest-common-divisor)
diff --git a/java-numbers-2/README.md b/java-numbers-2/README.md
index 48f9acd32d..e200c4aa03 100644
--- a/java-numbers-2/README.md
+++ b/java-numbers-2/README.md
@@ -13,4 +13,6 @@ This module contains articles about numbers in Java.
 - [Binary Numbers in Java](https://www.baeldung.com/java-binary-numbers)
 - [Finding the Least Common Multiple in Java](https://www.baeldung.com/java-least-common-multiple)
 - [Binary Numbers in Java](https://www.baeldung.com/java-binary-numbers)
+- [Generating Random Numbers in a Range in Java](https://www.baeldung.com/java-generating-random-numbers)
+- [Listing Numbers Within a Range in Java](https://www.baeldung.com/java-listing-numbers-within-a-range)
 - More articles: [[<-- prev]](/../java-numbers)
diff --git a/java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java b/java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java
index 217f1e06de..5e9f5bbcb4 100644
--- a/java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java
+++ b/java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java
@@ -1,8 +1,12 @@
 package com.baeldung.nth.root.calculator;
 
-public class NthRootCalculator
-{
-    public Double calculate(Double base, Double n) {
-        return Math.pow(Math.E, Math.log(base)/n);
+public class NthRootCalculator {
+
+    public double calculateWithRound(double base, double n) {
+        return Math.round(calculate(base, n));
+    }
+
+    public double calculate(double base, double n) {
+        return Math.pow(base, 1.0 / n);
     }
 }
diff --git a/java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java b/java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java
index 3fcd36812f..50190da38c 100644
--- a/java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java
+++ b/java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java
@@ -7,7 +7,7 @@ public class Main {
         NthRootCalculator calculator = new NthRootCalculator();
         Double base = Double.parseDouble(args[0]);
         Double n = Double.parseDouble(args[1]);
-        Double result = calculator.calculate(base, n);
+        Double result = calculator.calculateWithRound(base, n);
         System.out.println("The " + n + " root of " + base + " equals to " + result + ".");
     }
 }
diff --git a/java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java b/java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java
index ab962fc150..35970536ed 100644
--- a/java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java
+++ b/java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java
@@ -1,19 +1,22 @@
 package com.baeldung.nth.root.calculator;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertEquals;
 
 public class NthRootCalculatorUnitTest {
 
     private NthRootCalculator nthRootCalculator = new NthRootCalculator();
 
     @Test
-    public void whenBaseIs125AndNIs3_thenNthRootIs5() {
-       Double result = nthRootCalculator.calculate(125.0, 3.0);
-       assertEquals(result, (Double) 5.0d);
+    public void whenBaseIs125AndNIs3_thenNthIs5() {
+        double nth = nthRootCalculator.calculateWithRound(125,3);
+        assertEquals(5, nth, 0);
+    }
+
+    @Test
+    public void whenBaseIs625AndNIs4_thenNthIs5() {
+        double nth = nthRootCalculator.calculate(625,4);
+        assertEquals(5, nth, 0.00001);
     }
 }
diff --git a/java-numbers/src/test/java/com/baeldung/nth/root/main/MainUnitTest.java b/java-numbers/src/test/java/com/baeldung/nth/root/main/MainUnitTest.java
deleted file mode 100644
index a2fd839ba4..0000000000
--- a/java-numbers/src/test/java/com/baeldung/nth/root/main/MainUnitTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.baeldung.nth.root.main;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import static org.junit.Assert.assertEquals;
-
-public class MainUnitTest {
-    @InjectMocks
-    private Main main;
-
-    private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
-    private final PrintStream originalOut = System.out;
-
-    @Before
-    public void setUpStreams() {
-        System.setOut(new PrintStream(outContent));
-    }
-
-    @After
-    public void restoreStreams() {
-        System.setOut(originalOut);
-    }
-
-    @Test
-    public void givenThatTheBaseIs125_andTheExpIs3_whenMainIsCalled_thenTheCorrectResultIsPrinted() {
-        main.main(new String[]{"125.0", "3.0"});
-        assertEquals("The 3.0 root of 125.0 equals to 5.0.\n", outContent.toString().replaceAll("\r", ""));
-    }
-}
diff --git a/java-streams/README.md b/java-streams/README.md
index 5c231f756f..a57fdec7fa 100644
--- a/java-streams/README.md
+++ b/java-streams/README.md
@@ -18,4 +18,4 @@ This module contains articles about the Stream API in Java.
 - [Counting Matches on a Stream Filter](https://www.baeldung.com/java-stream-filter-count)
 - [Java 8 Streams peek() API](https://www.baeldung.com/java-streams-peek-api)
 - [Working With Maps Using Streams](https://www.baeldung.com/java-maps-streams)
-- More articles: [[next -->]](/../java-streams-2)
+- More articles: [[next -->]](/java-streams-2)
diff --git a/java-strings-2/README.md b/java-strings-2/README.md
index 82f33997c5..ced813163d 100644
--- a/java-strings-2/README.md
+++ b/java-strings-2/README.md
@@ -8,15 +8,11 @@ This module contains articles about strings in Java.
 - [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](https://www.baeldung.com/java-random-string)
-- [Image to Base64 String Conversion](https://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](https://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)
@@ -28,5 +24,4 @@ This module contains articles about strings in Java.
 - [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)
 - [String toLowerCase and toUpperCase Methods in Java](https://www.baeldung.com/java-string-convert-case)
-- [Guide to StreamTokenizer](https://www.baeldung.com/java-streamtokenizer)
 - More articles: [[<-- prev>]](/java-strings) [[next -->]](/java-strings-3)
diff --git a/java-strings-3/README.md b/java-strings-3/README.md
index f0aaddefcb..6276dfc621 100644
--- a/java-strings-3/README.md
+++ b/java-strings-3/README.md
@@ -3,6 +3,7 @@
 This module contains articles about strings in Java.
 
 ### Relevant Articles:
-
-- [Converting Java String to Double](https://www.baeldung.com/java-string-to-double)
+- [Java String equalsIgnoreCase()](https://www.baeldung.com/java-string-equalsignorecase)
+- [Finding the Difference Between Two Strings](https://www.baeldung.com/java-difference-between-two-strings)
+- [Counting Words in a String](https://www.baeldung.com/java-word-counting)
 - More articles: [[<-- prev>]](/java-strings-2) 
diff --git a/java-strings-ops/README.md b/java-strings-ops/README.md
index 31c5f48022..1300cf028e 100644
--- a/java-strings-ops/README.md
+++ b/java-strings-ops/README.md
@@ -3,10 +3,7 @@
 This module contains articles about operations on strings in Java.
 
 ### Relevant Articles:
-- [Convert char to String in Java](https://www.baeldung.com/java-convert-char-to-string)
-- [Convert String to int or Integer in Java](https://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](https://www.baeldung.com/java-palindrome)
+- [Check If a String Is a Palindrome](https://www.baeldung.com/java-palindrome)
 - [Comparing Strings in Java](https://www.baeldung.com/java-compare-strings)
 - [Check If a String Is Numeric in Java](https://www.baeldung.com/java-check-string-number)
 - [Get Substring from String in Java](https://www.baeldung.com/java-substring)
@@ -16,7 +13,4 @@ This module contains articles about operations on strings in Java.
 - [Guide to Java String Pool](https://www.baeldung.com/java-string-pool)
 - [Split a String in Java](https://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](https://www.baeldung.com/java-char-sequence-string)
-- [StringBuilder and StringBuffer in Java](https://www.baeldung.com/java-string-builder-string-buffer)
diff --git a/java-strings-ops/src/main/java/com/baeldung/string/AppendCharAtPositionX.java b/java-strings-ops/src/main/java/com/baeldung/string/AppendCharAtPositionX.java
index bebffe52f1..ad203ab348 100644
--- a/java-strings-ops/src/main/java/com/baeldung/string/AppendCharAtPositionX.java
+++ b/java-strings-ops/src/main/java/com/baeldung/string/AppendCharAtPositionX.java
@@ -8,7 +8,7 @@ package com.baeldung.string;
  *
  */
 public class AppendCharAtPositionX {
-    
+
     public String addCharUsingCharArray(String str, char ch, int position) {
         validate(str, position);
         int len = str.length();
@@ -30,15 +30,14 @@ public class AppendCharAtPositionX {
         sb.insert(position, ch);
         return sb.toString();
     }
-    
+
     private void validate(String str, int position) {
         if (str == null) {
             throw new IllegalArgumentException("Str should not be null");
         }
         int len = str.length();
         if (position < 0 || position > len) {
-            throw new IllegalArgumentException("position[" + position + "] should be " 
-                            + "in the range 0.." + len + " for string " + str);
+            throw new IllegalArgumentException("position[" + position + "] should be " + "in the range 0.." + len + " for string " + str);
         }
     }
 
diff --git a/java-strings-ops/src/main/java/com/baeldung/string/StringHelper.java b/java-strings-ops/src/main/java/com/baeldung/string/StringHelper.java
index a9cc71d36a..dac0d1272e 100644
--- a/java-strings-ops/src/main/java/com/baeldung/string/StringHelper.java
+++ b/java-strings-ops/src/main/java/com/baeldung/string/StringHelper.java
@@ -12,10 +12,15 @@ class StringHelper {
     }
 
     static String removeLastCharOptional(String s) {
-        return Optional.ofNullable(s).filter(str -> str.length() != 0).map(str -> str.substring(0, str.length() - 1)).orElse(s);
+        return Optional.ofNullable(s)
+            .filter(str -> str.length() != 0)
+            .map(str -> str.substring(0, str.length() - 1))
+            .orElse(s);
     }
 
     static String removeLastCharRegexOptional(String s) {
-        return Optional.ofNullable(s).map(str -> str.replaceAll(".$", "")).orElse(s);
+        return Optional.ofNullable(s)
+            .map(str -> str.replaceAll(".$", ""))
+            .orElse(s);
     }
 }
diff --git a/java-strings/src/main/java/com/baeldung/stringisnumeric/Benchmarking.java b/java-strings-ops/src/main/java/com/baeldung/string/isnumeric/Benchmarking.java
similarity index 85%
rename from java-strings/src/main/java/com/baeldung/stringisnumeric/Benchmarking.java
rename to java-strings-ops/src/main/java/com/baeldung/string/isnumeric/Benchmarking.java
index 4ae1f5aa83..c4e2742da6 100644
--- a/java-strings/src/main/java/com/baeldung/stringisnumeric/Benchmarking.java
+++ b/java-strings-ops/src/main/java/com/baeldung/string/isnumeric/Benchmarking.java
@@ -1,4 +1,4 @@
-package com.baeldung.stringisnumeric;
+package com.baeldung.string.isnumeric;
 
 import java.util.concurrent.TimeUnit;
 
@@ -13,13 +13,11 @@ import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-
 public class Benchmarking {
     public static void main(String[] args) throws RunnerException {
-        Options opt = new OptionsBuilder()
-                .include(Benchmarking.class.getSimpleName())
-                .forks(1)
-                .build();
+        Options opt = new OptionsBuilder().include(Benchmarking.class.getSimpleName())
+            .forks(1)
+            .build();
 
         new Runner(opt).run();
     }
@@ -28,45 +26,45 @@ public class Benchmarking {
     public static class ExecutionPlan {
         public String number = Integer.toString(Integer.MAX_VALUE);
         public boolean isNumber = false;
-        public IsNumeric isNumeric= new IsNumeric();
+        public IsNumeric isNumeric = new IsNumeric();
     }
-    
-    @Benchmark 
+
+    @Benchmark
     @BenchmarkMode(Mode.AverageTime)
     @OutputTimeUnit(TimeUnit.NANOSECONDS)
     public void usingCoreJava(ExecutionPlan plan) {
         plan.isNumber = plan.isNumeric.usingCoreJava(plan.number);
     }
-    
-    @Benchmark 
+
+    @Benchmark
     @BenchmarkMode(Mode.AverageTime)
     @OutputTimeUnit(TimeUnit.NANOSECONDS)
     public void usingRegularExpressions(ExecutionPlan plan) {
         plan.isNumber = plan.isNumeric.usingRegularExpressions(plan.number);
     }
-    
-    @Benchmark 
+
+    @Benchmark
     @BenchmarkMode(Mode.AverageTime)
     @OutputTimeUnit(TimeUnit.NANOSECONDS)
     public void usingNumberUtils_isCreatable(ExecutionPlan plan) {
         plan.isNumber = plan.isNumeric.usingNumberUtils_isCreatable(plan.number);
     }
-    
-    @Benchmark 
+
+    @Benchmark
     @BenchmarkMode(Mode.AverageTime)
     @OutputTimeUnit(TimeUnit.NANOSECONDS)
     public void usingNumberUtils_isParsable(ExecutionPlan plan) {
         plan.isNumber = plan.isNumeric.usingNumberUtils_isParsable(plan.number);
     }
-    
-    @Benchmark 
+
+    @Benchmark
     @BenchmarkMode(Mode.AverageTime)
     @OutputTimeUnit(TimeUnit.NANOSECONDS)
     public void usingStringUtils_isNumeric(ExecutionPlan plan) {
         plan.isNumber = plan.isNumeric.usingStringUtils_isNumeric(plan.number);
     }
-    
-    @Benchmark 
+
+    @Benchmark
     @BenchmarkMode(Mode.AverageTime)
     @OutputTimeUnit(TimeUnit.NANOSECONDS)
     public void usingStringUtils_isNumericSpace(ExecutionPlan plan) {
diff --git a/java-strings/src/main/java/com/baeldung/string/checkinputs/CheckIntegerInput.java b/java-strings-ops/src/main/java/com/baeldung/string/isnumeric/CheckIntegerInput.java
similarity index 89%
rename from java-strings/src/main/java/com/baeldung/string/checkinputs/CheckIntegerInput.java
rename to java-strings-ops/src/main/java/com/baeldung/string/isnumeric/CheckIntegerInput.java
index 9462244bbb..2785df0c9b 100644
--- a/java-strings/src/main/java/com/baeldung/string/checkinputs/CheckIntegerInput.java
+++ b/java-strings-ops/src/main/java/com/baeldung/string/isnumeric/CheckIntegerInput.java
@@ -1,14 +1,13 @@
-package com.baeldung.string.checkinputs;
+package com.baeldung.string.isnumeric;
 
 import java.util.Scanner;
 
 public class CheckIntegerInput {
 
     public static void main(String[] args) {
-
         try (Scanner scanner = new Scanner(System.in)) {
             System.out.println("Enter an integer : ");
-            
+
             if (scanner.hasNextInt()) {
                 System.out.println("You entered : " + scanner.nextInt());
             } else {
diff --git a/java-strings/src/main/java/com/baeldung/stringisnumeric/IsNumeric.java b/java-strings-ops/src/main/java/com/baeldung/string/isnumeric/IsNumeric.java
similarity index 88%
rename from java-strings/src/main/java/com/baeldung/stringisnumeric/IsNumeric.java
rename to java-strings-ops/src/main/java/com/baeldung/string/isnumeric/IsNumeric.java
index c438071e42..508cedd168 100644
--- a/java-strings/src/main/java/com/baeldung/stringisnumeric/IsNumeric.java
+++ b/java-strings-ops/src/main/java/com/baeldung/string/isnumeric/IsNumeric.java
@@ -1,4 +1,4 @@
-package com.baeldung.stringisnumeric;
+package com.baeldung.string.isnumeric;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -6,29 +6,29 @@ import org.apache.commons.lang3.math.NumberUtils;
 public class IsNumeric {
     public boolean usingCoreJava(String strNum) {
         try {
-            double d = Double.parseDouble(strNum);
+            Double.parseDouble(strNum);
         } catch (NumberFormatException | NullPointerException nfe) {
             return false;
         }
         return true;
     }
-    
+
     public boolean usingRegularExpressions(String strNum) {
         return strNum.matches("-?\\d+(\\.\\d+)?");
     }
-    
+
     public boolean usingNumberUtils_isCreatable(String strNum) {
         return NumberUtils.isCreatable(strNum);
     }
-    
+
     public boolean usingNumberUtils_isParsable(String strNum) {
         return NumberUtils.isParsable(strNum);
     }
-    
+
     public boolean usingStringUtils_isNumeric(String strNum) {
         return StringUtils.isNumeric(strNum);
     }
-    
+
     public boolean usingStringUtils_isNumericSpace(String strNum) {
         return StringUtils.isNumericSpace(strNum);
     }
diff --git a/java-strings/src/main/java/com/baeldung/stringisnumeric/IsNumericDriver.java b/java-strings-ops/src/main/java/com/baeldung/string/isnumeric/IsNumericDriver.java
similarity index 60%
rename from java-strings/src/main/java/com/baeldung/stringisnumeric/IsNumericDriver.java
rename to java-strings-ops/src/main/java/com/baeldung/string/isnumeric/IsNumericDriver.java
index c0a6edae50..bb3c96c06e 100644
--- a/java-strings/src/main/java/com/baeldung/stringisnumeric/IsNumericDriver.java
+++ b/java-strings-ops/src/main/java/com/baeldung/string/isnumeric/IsNumericDriver.java
@@ -1,34 +1,31 @@
-package com.baeldung.stringisnumeric;
+package com.baeldung.string.isnumeric;
 
 import org.apache.log4j.Logger;
 
 public class IsNumericDriver {
-    private static IsNumeric isNumeric;
     private static Logger LOG = Logger.getLogger(IsNumericDriver.class);
-    static {
-        isNumeric =new IsNumeric();
-        
-    }
-    
+
+    private static IsNumeric isNumeric = new IsNumeric();
+
     public static void main(String[] args) {
         LOG.info("Testing all methods...");
-        
+
         boolean res = isNumeric.usingCoreJava("1001");
         LOG.info("Using Core Java : " + res);
-        
+
         res = isNumeric.usingRegularExpressions("1001");
         LOG.info("Using Regular Expressions : " + res);
-        
-        res =isNumeric.usingNumberUtils_isCreatable("1001");
+
+        res = isNumeric.usingNumberUtils_isCreatable("1001");
         LOG.info("Using NumberUtils.isCreatable : " + res);
-        
-        res =isNumeric.usingNumberUtils_isParsable("1001");
+
+        res = isNumeric.usingNumberUtils_isParsable("1001");
         LOG.info("Using NumberUtils.isParsable : " + res);
-        
-        res =isNumeric.usingStringUtils_isNumeric("1001");
+
+        res = isNumeric.usingStringUtils_isNumeric("1001");
         LOG.info("Using StringUtils.isNumeric : " + res);
-        
-        res =isNumeric.usingStringUtils_isNumericSpace("1001");
+
+        res = isNumeric.usingStringUtils_isNumericSpace("1001");
         LOG.info("Using StringUtils.isNumericSpace : " + res);
     }
 }
diff --git a/java-strings-ops/src/main/java/com/baeldung/string/tostring/Customer.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/Customer.java
index e914a83f0e..7ab3936cb9 100644
--- a/java-strings-ops/src/main/java/com/baeldung/string/tostring/Customer.java
+++ b/java-strings-ops/src/main/java/com/baeldung/string/tostring/Customer.java
@@ -3,17 +3,20 @@ package com.baeldung.string.tostring;
 public class Customer {
     private String firstName;
     private String lastName;
-	
+
     public String getFirstName() {
-	return firstName;
+        return firstName;
     }
+
     public void setFirstName(String firstName) {
-	this.firstName = firstName;
+        this.firstName = firstName;
     }
+
     public String getLastName() {
-	return lastName;
+        return lastName;
     }
+
     public void setLastName(String lastName) {
-	this.lastName = lastName;
+        this.lastName = lastName;
     }
 }
diff --git a/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerArrayToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerArrayToString.java
index 1736657276..391ced61d3 100644
--- a/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerArrayToString.java
+++ b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerArrayToString.java
@@ -4,16 +4,17 @@ import java.util.Arrays;
 
 public class CustomerArrayToString extends Customer {
     private Order[] orders;
- 
+
     public Order[] getOrders() {
         return orders;
     }
+
     public void setOrders(Order[] orders) {
         this.orders = orders;
     }
+
     @Override
     public String toString() {
-	return "Customer [orders=" + Arrays.toString(orders) + ", getFirstName()=" + getFirstName()
-	  + ", getLastName()=" + getLastName() + "]";
-    }    
+        return "Customer [orders=" + Arrays.toString(orders) + ", getFirstName()=" + getFirstName() + ", getLastName()=" + getLastName() + "]";
+    }
 }
diff --git a/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerComplexObjectToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerComplexObjectToString.java
index 9bede1b3fc..ae3d999b12 100644
--- a/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerComplexObjectToString.java
+++ b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerComplexObjectToString.java
@@ -2,7 +2,7 @@ package com.baeldung.string.tostring;
 
 public class CustomerComplexObjectToString extends Customer {
     private Order order;
-  
+
     public Order getOrder() {
         return order;
     }
@@ -13,7 +13,6 @@ public class CustomerComplexObjectToString extends Customer {
 
     @Override
     public String toString() {
-	return "Customer [order=" + order + ", getFirstName()=" + getFirstName()
-	  + ", getLastName()=" + getLastName() + "]";
-    }    
+        return "Customer [order=" + order + ", getFirstName()=" + getFirstName() + ", getLastName()=" + getLastName() + "]";
+    }
 }
\ No newline at end of file
diff --git a/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerPrimitiveToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerPrimitiveToString.java
index 86e08ca447..01fe4c8b09 100644
--- a/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerPrimitiveToString.java
+++ b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerPrimitiveToString.java
@@ -2,18 +2,17 @@ package com.baeldung.string.tostring;
 
 public class CustomerPrimitiveToString extends Customer {
     private long balance;
- 
+
     public long getBalance() {
         return balance;
     }
-	
+
     public void setBalance(long balance) {
         this.balance = balance;
     }
-        
+
     @Override
     public String toString() {
-	return "Customer [balance=" + balance + ", getFirstName()=" + getFirstName()
-	  + ", getLastName()=" + getLastName() + "]";
+        return "Customer [balance=" + balance + ", getFirstName()=" + getFirstName() + ", getLastName()=" + getLastName() + "]";
     }
 }
diff --git a/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerReflectionToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerReflectionToString.java
index 2da1163c63..2a9e3700ec 100644
--- a/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerReflectionToString.java
+++ b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerReflectionToString.java
@@ -4,36 +4,36 @@ import java.util.List;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 
-public class CustomerReflectionToString extends Customer{
+public class CustomerReflectionToString extends Customer {
 
     private Integer score;
     private List<String> orders;
     private StringBuffer fullname;
- 
+
     public Integer getScore() {
         return score;
     }
-    
+
     public void setScore(Integer score) {
         this.score = score;
     }
-    
+
     public List<String> getOrders() {
         return orders;
     }
-    
+
     public void setOrders(List<String> orders) {
         this.orders = orders;
     }
-    
+
     public StringBuffer getFullname() {
         return fullname;
     }
-    
+
     public void setFullname(StringBuffer fullname) {
         this.fullname = fullname;
     }
-    
+
     @Override
     public String toString() {
         return ReflectionToStringBuilder.toString(this);
diff --git a/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerWrapperCollectionToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerWrapperCollectionToString.java
index 6c7b999045..b3ff97dc07 100644
--- a/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerWrapperCollectionToString.java
+++ b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerWrapperCollectionToString.java
@@ -6,34 +6,33 @@ public class CustomerWrapperCollectionToString extends Customer {
     private Integer score;
     private List<String> orders;
     private StringBuffer fullname;
- 
+
     public Integer getScore() {
         return score;
     }
-	
+
     public void setScore(Integer score) {
         this.score = score;
     }
-	
+
     public List<String> getOrders() {
         return orders;
     }
-	
+
     public void setOrders(List<String> orders) {
         this.orders = orders;
     }
-    
+
     public StringBuffer getFullname() {
         return fullname;
     }
-    
+
     public void setFullname(StringBuffer fullname) {
         this.fullname = fullname;
     }
-    
+
     @Override
     public String toString() {
-	return "Customer [score=" + score + ", orders=" + orders + ", fullname=" + fullname
-	  + ", getFirstName()=" + getFirstName() + ", getLastName()=" + getLastName() + "]";
+        return "Customer [score=" + score + ", orders=" + orders + ", fullname=" + fullname + ", getFirstName()=" + getFirstName() + ", getLastName()=" + getLastName() + "]";
     }
 }
diff --git a/java-strings-ops/src/main/java/com/baeldung/string/tostring/Order.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/Order.java
index 017e2d9bc8..58e0fcce5a 100644
--- a/java-strings-ops/src/main/java/com/baeldung/string/tostring/Order.java
+++ b/java-strings-ops/src/main/java/com/baeldung/string/tostring/Order.java
@@ -1,7 +1,7 @@
 package com.baeldung.string.tostring;
 
 public class Order {
-    
+
     private String orderId;
     private String desc;
     private long value;
@@ -38,9 +38,10 @@ public class Order {
     public void setStatus(String status) {
         this.status = status;
     }
+
     @Override
     public String toString() {
-        return "Order [orderId=" + orderId + ", desc=" + desc + ", value=" + value  + "]";
+        return "Order [orderId=" + orderId + ", desc=" + desc + ", value=" + value + "]";
     }
 
 }
diff --git a/java-strings-ops/src/main/resources/log4j.properties b/java-strings-ops/src/main/resources/log4j.properties
new file mode 100644
index 0000000000..2ea9fa9209
--- /dev/null
+++ b/java-strings-ops/src/main/resources/log4j.properties
@@ -0,0 +1,8 @@
+# Root logger option
+log4j.rootLogger=DEBUG, stdout
+
+# Redirect log messages to console
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
\ No newline at end of file
diff --git a/java-strings-ops/src/test/java/com/baeldung/java/conversion/README.md b/java-strings-ops/src/test/java/com/baeldung/java/conversion/README.md
deleted file mode 100644
index 7c81180249..0000000000
--- a/java-strings-ops/src/test/java/com/baeldung/java/conversion/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Relevant Articles:
-- [Java String Conversions](http://www.baeldung.com/java-string-conversions)
diff --git a/java-strings-ops/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
index e2dd0ac1db..d58684445b 100644
--- a/java-strings-ops/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
@@ -10,7 +10,6 @@ import org.junit.Test;
 
 import com.google.common.base.CharMatcher;
 
-
 /***
  * Example of counting chars in a String.
  */
@@ -78,16 +77,21 @@ public class CountCharsExampleUnitTest {
     @Test
     public void givenString_whenUsingJava8Features_thenCountChars() {
         String someString = "elephant";
-        long count = someString.chars().filter(ch -> ch == 'e').count();
+        long count = someString.chars()
+            .filter(ch -> ch == 'e')
+            .count();
         assertEquals(2, count);
 
-        long count2 = someString.codePoints().filter(ch -> ch == 'e').count();
+        long count2 = someString.codePoints()
+            .filter(ch -> ch == 'e')
+            .count();
         assertEquals(2, count2);
     }
 
     @Test
     public void givenString_whenUsingGuavaCharMatcher_thenCountChars() {
-        int count = CharMatcher.is('e').countIn("elephant");
+        int count = CharMatcher.is('e')
+            .countIn("elephant");
         assertEquals(2, count);
     }
 
diff --git a/java-strings-ops/src/test/java/com/baeldung/string/AppendCharAtPositionXUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/AppendCharAtPositionXUnitTest.java
index 2cdf6145d3..7c5409fe29 100644
--- a/java-strings-ops/src/test/java/com/baeldung/string/AppendCharAtPositionXUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/AppendCharAtPositionXUnitTest.java
@@ -12,99 +12,99 @@ import org.junit.Test;
  *
  */
 public class AppendCharAtPositionXUnitTest {
-    
+
     private AppendCharAtPositionX appendCharAtPosition = new AppendCharAtPositionX();
     private String word = "Titanc";
     private char letter = 'i';
-    
+
     @Test
     public void whenUsingCharacterArrayAndCharacterAddedAtBeginning_shouldAddCharacter() {
         assertEquals("iTitanc", appendCharAtPosition.addCharUsingCharArray(word, letter, 0));
     }
-    
+
     @Test
     public void whenUsingSubstringAndCharacterAddedAtBeginning_shouldAddCharacter() {
         assertEquals("iTitanc", appendCharAtPosition.addCharUsingSubstring(word, letter, 0));
-    }  
-    
+    }
+
     @Test
     public void whenUsingStringBuilderAndCharacterAddedAtBeginning_shouldAddCharacter() {
         assertEquals("iTitanc", appendCharAtPosition.addCharUsingStringBuilder(word, letter, 0));
     }
-    
+
     @Test
     public void whenUsingCharacterArrayAndCharacterAddedAtMiddle_shouldAddCharacter() {
         assertEquals("Titianc", appendCharAtPosition.addCharUsingCharArray(word, letter, 3));
     }
-    
+
     @Test
     public void whenUsingSubstringAndCharacterAddedAtMiddle_shouldAddCharacter() {
         assertEquals("Titianc", appendCharAtPosition.addCharUsingSubstring(word, letter, 3));
-    }  
-    
+    }
+
     @Test
     public void whenUsingStringBuilderAndCharacterAddedAtMiddle_shouldAddCharacter() {
         assertEquals("Titianc", appendCharAtPosition.addCharUsingStringBuilder(word, letter, 3));
     }
-    
+
     @Test
     public void whenUsingCharacterArrayAndCharacterAddedAtEnd_shouldAddCharacter() {
         assertEquals("Titanci", appendCharAtPosition.addCharUsingCharArray(word, letter, word.length()));
     }
-    
+
     @Test
     public void whenUsingSubstringAndCharacterAddedAtEnd_shouldAddCharacter() {
         assertEquals("Titanci", appendCharAtPosition.addCharUsingSubstring(word, letter, word.length()));
-    }  
-    
+    }
+
     @Test
     public void whenUsingStringBuilderAndCharacterAddedAtEnd_shouldAddCharacter() {
         assertEquals("Titanci", appendCharAtPosition.addCharUsingStringBuilder(word, letter, word.length()));
     }
-    
-    @Test(expected=IllegalArgumentException.class)
+
+    @Test(expected = IllegalArgumentException.class)
     public void whenUsingCharacterArrayAndCharacterAddedAtNegativePosition_shouldThrowException() {
         appendCharAtPosition.addCharUsingStringBuilder(word, letter, -1);
     }
-    
-    @Test(expected=IllegalArgumentException.class)
+
+    @Test(expected = IllegalArgumentException.class)
     public void whenUsingSubstringAndCharacterAddedAtNegativePosition_shouldThrowException() {
         appendCharAtPosition.addCharUsingStringBuilder(word, letter, -1);
-    }  
-    
-    @Test(expected=IllegalArgumentException.class)
+    }
+
+    @Test(expected = IllegalArgumentException.class)
     public void whenUsingStringBuilderAndCharacterAddedAtNegativePosition_shouldThrowException() {
         appendCharAtPosition.addCharUsingStringBuilder(word, letter, -1);
     }
-    
-    @Test(expected=IllegalArgumentException.class)
+
+    @Test(expected = IllegalArgumentException.class)
     public void whenUsingCharacterArrayAndCharacterAddedAtInvalidPosition_shouldThrowException() {
         appendCharAtPosition.addCharUsingStringBuilder(word, letter, word.length() + 2);
     }
-    
-    @Test(expected=IllegalArgumentException.class)
+
+    @Test(expected = IllegalArgumentException.class)
     public void whenUsingSubstringAndCharacterAddedAtInvalidPosition_shouldThrowException() {
         appendCharAtPosition.addCharUsingStringBuilder(word, letter, word.length() + 2);
-    }  
-    
-    @Test(expected=IllegalArgumentException.class)
+    }
+
+    @Test(expected = IllegalArgumentException.class)
     public void whenUsingStringBuilderAndCharacterAddedAtInvalidPosition_shouldThrowException() {
         appendCharAtPosition.addCharUsingStringBuilder(word, letter, word.length() + 2);
     }
-    
-    @Test(expected=IllegalArgumentException.class)
+
+    @Test(expected = IllegalArgumentException.class)
     public void whenUsingCharacterArrayAndCharacterAddedAtPositionXAndStringIsNull_shouldThrowException() {
         appendCharAtPosition.addCharUsingStringBuilder(null, letter, 3);
     }
-    
-    @Test(expected=IllegalArgumentException.class)
+
+    @Test(expected = IllegalArgumentException.class)
     public void whenUsingSubstringAndCharacterAddedAtPositionXAndStringIsNull_shouldThrowException() {
         appendCharAtPosition.addCharUsingStringBuilder(null, letter, 3);
-    }  
-    
-    @Test(expected=IllegalArgumentException.class)
+    }
+
+    @Test(expected = IllegalArgumentException.class)
     public void whenUsingStringBuilderAndCharacterAddedAtPositionXAndStringIsNull_shouldThrowException() {
         appendCharAtPosition.addCharUsingStringBuilder(null, letter, 3);
     }
- 
+
 }
diff --git a/java-strings-ops/src/test/java/com/baeldung/string/PalindromeUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/PalindromeUnitTest.java
index 49f2542f39..8dea72d8ca 100644
--- a/java-strings-ops/src/test/java/com/baeldung/string/PalindromeUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/PalindromeUnitTest.java
@@ -1,6 +1,7 @@
 package com.baeldung.string;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 
 public class PalindromeUnitTest {
@@ -20,9 +21,9 @@ public class PalindromeUnitTest {
             "No mists or frost Simon",
             "Stella won no wallets"
     };
-    
+
     private Palindrome palindrome = new Palindrome();
-    
+
     @Test
     public void whenWord_shouldBePalindrome() {
         for (String word : words)
diff --git a/java-strings-ops/src/test/java/com/baeldung/string/SplitUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/SplitUnitTest.java
index 6157640a4a..1936bfb6fb 100644
--- a/java-strings-ops/src/test/java/com/baeldung/string/SplitUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/SplitUnitTest.java
@@ -14,59 +14,52 @@ public class SplitUnitTest {
 
     @Test
     public void givenString_whenSplit_thenReturnsArray_through_JavaLangString() {
-        assertThat("peter,james,thomas".split(","))
-          .containsExactly("peter", "james", "thomas");
+        assertThat("peter,james,thomas".split(",")).containsExactly("peter", "james", "thomas");
 
-        assertThat("car jeep scooter".split(" "))
-          .containsExactly("car", "jeep", "scooter");
+        assertThat("car jeep scooter".split(" ")).containsExactly("car", "jeep", "scooter");
 
-        assertThat("1-120-232323".split("-"))
-          .containsExactly("1", "120", "232323");
+        assertThat("1-120-232323".split("-")).containsExactly("1", "120", "232323");
 
-        assertThat("192.168.1.178".split("\\."))
-          .containsExactly("192", "168", "1", "178");
+        assertThat("192.168.1.178".split("\\.")).containsExactly("192", "168", "1", "178");
 
-        assertThat("b a, e, l.d u, n g".split("\\s+|,\\s*|\\.\\s*"))
-          .containsExactly("b", "a", "e", "l", "d", "u", "n", "g");
+        assertThat("b a, e, l.d u, n g".split("\\s+|,\\s*|\\.\\s*")).containsExactly("b", "a", "e", "l", "d", "u", "n", "g");
     }
 
     @Test
     public void givenString_whenSplit_thenReturnsArray_through_StringUtils() {
         StringUtils.split("car jeep scooter");
 
-        assertThat(StringUtils.split("car jeep scooter"))
-          .containsExactly("car", "jeep", "scooter");
+        assertThat(StringUtils.split("car jeep scooter")).containsExactly("car", "jeep", "scooter");
 
-        assertThat(StringUtils.split("car    jeep   scooter"))
-          .containsExactly("car", "jeep", "scooter");
+        assertThat(StringUtils.split("car    jeep   scooter")).containsExactly("car", "jeep", "scooter");
 
-        assertThat(StringUtils.split("car:jeep:scooter", ":"))
-          .containsExactly("car", "jeep", "scooter");
+        assertThat(StringUtils.split("car:jeep:scooter", ":")).containsExactly("car", "jeep", "scooter");
 
-        assertThat(StringUtils.split("car.jeep.scooter", "."))
-          .containsExactly("car", "jeep", "scooter");
+        assertThat(StringUtils.split("car.jeep.scooter", ".")).containsExactly("car", "jeep", "scooter");
     }
 
     @Test
     public void givenString_whenSplit_thenReturnsList_Splitter() {
-        //given
-        List<String> resultList = Splitter.on(',').trimResults().omitEmptyStrings().splitToList("car,jeep,,   scooter");
+        // given
+        List<String> resultList = Splitter.on(',')
+            .trimResults()
+            .omitEmptyStrings()
+            .splitToList("car,jeep,,   scooter");
 
-        assertThat(resultList)
-          .containsExactly("car", "jeep", "scooter");
+        assertThat(resultList).containsExactly("car", "jeep", "scooter");
     }
-    
+
     @Test
     public void givenStringContainsSpaces_whenSplitAndTrim_thenReturnsArray_using_Regex() {
         assertThat(" car , jeep,  scooter ".trim()
-          .split("\\s*,\\s*")).containsExactly("car", "jeep", "scooter");
+            .split("\\s*,\\s*")).containsExactly("car", "jeep", "scooter");
 
     }
-    
+
     @Test
     public void givenStringContainsSpaces_whenSplitAndTrim_thenReturnsArray_using_java_8() {
         assertThat(Arrays.stream(" car , jeep,  scooter ".split(","))
-          .map(String::trim)
-          .toArray(String[]::new)).containsExactly("car", "jeep", "scooter");
-    }   
+            .map(String::trim)
+            .toArray(String[]::new)).containsExactly("car", "jeep", "scooter");
+    }
 }
diff --git a/java-strings-ops/src/test/java/com/baeldung/string/StringComparisonUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/StringComparisonUnitTest.java
index 539f66d9b4..5339a0c72e 100644
--- a/java-strings-ops/src/test/java/com/baeldung/string/StringComparisonUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/StringComparisonUnitTest.java
@@ -1,16 +1,16 @@
 package com.baeldung.string;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Objects;
+
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 
-import java.util.Objects;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class StringComparisonUnitTest {
 
     @Test
-    public void whenUsingComparisonOperator_ThenComparingStrings(){
+    public void whenUsingComparisonOperator_ThenComparingStrings() {
 
         String string1 = "using comparison operator";
         String string2 = "using comparison operator";
@@ -21,7 +21,7 @@ public class StringComparisonUnitTest {
     }
 
     @Test
-    public void whenUsingEqualsMethod_ThenComparingStrings(){
+    public void whenUsingEqualsMethod_ThenComparingStrings() {
 
         String string1 = "using equals method";
         String string2 = "using equals method";
@@ -37,7 +37,7 @@ public class StringComparisonUnitTest {
     }
 
     @Test
-    public void whenUsingEqualsIgnoreCase_ThenComparingStrings(){
+    public void whenUsingEqualsIgnoreCase_ThenComparingStrings() {
 
         String string1 = "using equals ignore case";
         String string2 = "USING EQUALS IGNORE CASE";
@@ -46,7 +46,7 @@ public class StringComparisonUnitTest {
     }
 
     @Test
-    public void whenUsingCompareTo_ThenComparingStrings(){
+    public void whenUsingCompareTo_ThenComparingStrings() {
 
         String author = "author";
         String book = "book";
@@ -58,7 +58,7 @@ public class StringComparisonUnitTest {
     }
 
     @Test
-    public void whenUsingCompareToIgnoreCase_ThenComparingStrings(){
+    public void whenUsingCompareToIgnoreCase_ThenComparingStrings() {
 
         String author = "Author";
         String book = "book";
@@ -70,7 +70,7 @@ public class StringComparisonUnitTest {
     }
 
     @Test
-    public void whenUsingObjectsEqualsMethod_ThenComparingStrings(){
+    public void whenUsingObjectsEqualsMethod_ThenComparingStrings() {
 
         String string1 = "using objects equals";
         String string2 = "using objects equals";
@@ -84,7 +84,7 @@ public class StringComparisonUnitTest {
     }
 
     @Test
-    public void whenUsingEqualsOfApacheCommons_ThenComparingStrings(){
+    public void whenUsingEqualsOfApacheCommons_ThenComparingStrings() {
 
         assertThat(StringUtils.equals(null, null)).isTrue();
         assertThat(StringUtils.equals(null, "equals method")).isFalse();
@@ -93,7 +93,7 @@ public class StringComparisonUnitTest {
     }
 
     @Test
-    public void whenUsingEqualsIgnoreCaseOfApacheCommons_ThenComparingStrings(){
+    public void whenUsingEqualsIgnoreCaseOfApacheCommons_ThenComparingStrings() {
 
         assertThat(StringUtils.equalsIgnoreCase(null, null)).isTrue();
         assertThat(StringUtils.equalsIgnoreCase(null, "equals method")).isFalse();
@@ -102,7 +102,7 @@ public class StringComparisonUnitTest {
     }
 
     @Test
-    public void whenUsingEqualsAnyOf_ThenComparingStrings(){
+    public void whenUsingEqualsAnyOf_ThenComparingStrings() {
 
         assertThat(StringUtils.equalsAny(null, null, null)).isTrue();
         assertThat(StringUtils.equalsAny("equals any", "equals any", "any")).isTrue();
@@ -112,18 +112,17 @@ public class StringComparisonUnitTest {
     }
 
     @Test
-    public void whenUsingEqualsAnyIgnoreCase_ThenComparingStrings(){
+    public void whenUsingEqualsAnyIgnoreCase_ThenComparingStrings() {
 
         assertThat(StringUtils.equalsAnyIgnoreCase(null, null, null)).isTrue();
         assertThat(StringUtils.equalsAnyIgnoreCase("equals any", "equals any", "any")).isTrue();
         assertThat(StringUtils.equalsAnyIgnoreCase("equals any", null, "equals any")).isTrue();
         assertThat(StringUtils.equalsAnyIgnoreCase(null, "equals", "any")).isFalse();
-        assertThat(StringUtils.equalsAnyIgnoreCase(
-                "equals any ignore case", "EQUALS ANY IGNORE CASE", "any")).isTrue();
+        assertThat(StringUtils.equalsAnyIgnoreCase("equals any ignore case", "EQUALS ANY IGNORE CASE", "any")).isTrue();
     }
 
     @Test
-    public void whenUsingCompare_thenComparingStringsWithNulls(){
+    public void whenUsingCompare_thenComparingStringsWithNulls() {
 
         assertThat(StringUtils.compare(null, null)).isEqualTo(0);
         assertThat(StringUtils.compare(null, "abc")).isEqualTo(-1);
@@ -134,7 +133,7 @@ public class StringComparisonUnitTest {
     }
 
     @Test
-    public void whenUsingCompareIgnoreCase_ThenComparingStringsWithNulls(){
+    public void whenUsingCompareIgnoreCase_ThenComparingStringsWithNulls() {
 
         assertThat(StringUtils.compareIgnoreCase(null, null)).isEqualTo(0);
         assertThat(StringUtils.compareIgnoreCase(null, "abc")).isEqualTo(-1);
@@ -145,7 +144,7 @@ public class StringComparisonUnitTest {
     }
 
     @Test
-    public void whenUsingCompareWithNullIsLessOption_ThenComparingStrings(){
+    public void whenUsingCompareWithNullIsLessOption_ThenComparingStrings() {
 
         assertThat(StringUtils.compare(null, "abc", true)).isEqualTo(-1);
         assertThat(StringUtils.compare(null, "abc", false)).isEqualTo(1);
diff --git a/java-strings-ops/src/test/java/com/baeldung/string/StringHelperUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/StringHelperUnitTest.java
index 917ed1c937..eb86e84905 100644
--- a/java-strings-ops/src/test/java/com/baeldung/string/StringHelperUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/StringHelperUnitTest.java
@@ -1,11 +1,11 @@
 package com.baeldung.string;
 
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+
 public class StringHelperUnitTest {
 
     public static final String TEST_STRING = "abcdef";
diff --git a/java-strings-ops/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/isnumeric/CoreJavaIsNumericUnitTest.java
similarity index 89%
rename from java-strings-ops/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/isnumeric/CoreJavaIsNumericUnitTest.java
index 808d3c45b0..6228fdb5af 100644
--- a/java-strings-ops/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/isnumeric/CoreJavaIsNumericUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.stringisnumeric;
+package com.baeldung.string.isnumeric;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -13,16 +13,16 @@ public class CoreJavaIsNumericUnitTest {
         }
         return true;
     }
-    
+
     @Test
     public void whenUsingCoreJava_thenTrue() {
         // Valid Numbers
         assertThat(isNumeric("22")).isTrue();
         assertThat(isNumeric("5.05")).isTrue();
-        assertThat(isNumeric("-200")).isTrue(); 
+        assertThat(isNumeric("-200")).isTrue();
         assertThat(isNumeric("10.0d")).isTrue();
         assertThat(isNumeric("   22   ")).isTrue();
-         
+
         // Invalid Numbers
         assertThat(isNumeric(null)).isFalse();
         assertThat(isNumeric("")).isFalse();
diff --git a/java-strings/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsCreatableUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/isnumeric/NumberUtilsIsCreatableUnitTest.java
similarity index 95%
rename from java-strings/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsCreatableUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/isnumeric/NumberUtilsIsCreatableUnitTest.java
index 467d58837a..346248cb40 100644
--- a/java-strings/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsCreatableUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/isnumeric/NumberUtilsIsCreatableUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.stringisnumeric;
+package com.baeldung.string.isnumeric;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -17,7 +17,7 @@ public class NumberUtilsIsCreatableUnitTest {
         assertThat(NumberUtils.isCreatable("0xFF")).isTrue();
         assertThat(NumberUtils.isCreatable("07")).isTrue();
         assertThat(NumberUtils.isCreatable("2.99e+8")).isTrue();
-         
+
         // Invalid Numbers
         assertThat(NumberUtils.isCreatable(null)).isFalse();
         assertThat(NumberUtils.isCreatable("")).isFalse();
diff --git a/java-strings/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsParsableUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/isnumeric/NumberUtilsIsParsableUnitTest.java
similarity index 95%
rename from java-strings/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsParsableUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/isnumeric/NumberUtilsIsParsableUnitTest.java
index 141a761158..fa2f2aec6d 100644
--- a/java-strings/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsParsableUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/isnumeric/NumberUtilsIsParsableUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.stringisnumeric;
+package com.baeldung.string.isnumeric;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -13,7 +13,7 @@ public class NumberUtilsIsParsableUnitTest {
         assertThat(NumberUtils.isParsable("-23")).isTrue();
         assertThat(NumberUtils.isParsable("2.2")).isTrue();
         assertThat(NumberUtils.isParsable("09")).isTrue();
-        
+
         // Invalid Numbers
         assertThat(NumberUtils.isParsable(null)).isFalse();
         assertThat(NumberUtils.isParsable("")).isFalse();
diff --git a/java-strings/src/test/java/com/baeldung/stringisnumeric/RegularExpressionsUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/isnumeric/RegularExpressionsUnitTest.java
similarity index 91%
rename from java-strings/src/test/java/com/baeldung/stringisnumeric/RegularExpressionsUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/isnumeric/RegularExpressionsUnitTest.java
index c3aa43ac94..0f7f0eb081 100644
--- a/java-strings/src/test/java/com/baeldung/stringisnumeric/RegularExpressionsUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/isnumeric/RegularExpressionsUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.stringisnumeric;
+package com.baeldung.string.isnumeric;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -8,14 +8,14 @@ public class RegularExpressionsUnitTest {
     public static boolean isNumeric(String strNum) {
         return strNum.matches("-?\\d+(\\.\\d+)?");
     }
-    
+
     @Test
     public void whenUsingRegularExpressions_thenTrue() {
         // Valid Numbers
         assertThat(isNumeric("22")).isTrue();
         assertThat(isNumeric("5.05")).isTrue();
         assertThat(isNumeric("-200")).isTrue();
-         
+
         // Invalid Numbers
         assertThat(isNumeric("abc")).isFalse();
     }
diff --git a/java-strings/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericSpaceUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/isnumeric/StringUtilsIsNumericSpaceUnitTest.java
similarity index 94%
rename from java-strings/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericSpaceUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/isnumeric/StringUtilsIsNumericSpaceUnitTest.java
index 135780d9ad..05651cc567 100644
--- a/java-strings/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericSpaceUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/isnumeric/StringUtilsIsNumericSpaceUnitTest.java
@@ -1,8 +1,9 @@
-package com.baeldung.stringisnumeric;
+package com.baeldung.string.isnumeric;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
-import static org.assertj.core.api.Assertions.assertThat;
 
 public class StringUtilsIsNumericSpaceUnitTest {
     @Test
@@ -13,7 +14,7 @@ public class StringUtilsIsNumericSpaceUnitTest {
         assertThat(StringUtils.isNumericSpace("")).isTrue();
         assertThat(StringUtils.isNumericSpace("  ")).isTrue();
         assertThat(StringUtils.isNumericSpace("12 3")).isTrue();
-         
+
         // Invalid Numbers
         assertThat(StringUtils.isNumericSpace(null)).isFalse();
         assertThat(StringUtils.isNumericSpace("ab2c")).isFalse();
diff --git a/java-strings/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/isnumeric/StringUtilsIsNumericUnitTest.java
similarity index 95%
rename from java-strings/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/isnumeric/StringUtilsIsNumericUnitTest.java
index b667dda906..cae08874da 100644
--- a/java-strings/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/isnumeric/StringUtilsIsNumericUnitTest.java
@@ -1,8 +1,9 @@
-package com.baeldung.stringisnumeric;
+package com.baeldung.string.isnumeric;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
-import static org.assertj.core.api.Assertions.assertThat;
 
 public class StringUtilsIsNumericUnitTest {
     @Test
@@ -11,7 +12,7 @@ public class StringUtilsIsNumericUnitTest {
         assertThat(StringUtils.isNumeric("123")).isTrue();
         assertThat(StringUtils.isNumeric("١٢٣")).isTrue();
         assertThat(StringUtils.isNumeric("१२३")).isTrue();
-         
+
         // Invalid Numbers
         assertThat(StringUtils.isNumeric(null)).isFalse();
         assertThat(StringUtils.isNumeric("")).isFalse();
diff --git a/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java
index 9a88416179..ced8b15f2e 100644
--- a/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java
@@ -5,21 +5,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
 
 public class CustomerArrayToStringUnitTest {
-    private static final String CUSTOMER_ARRAY_TO_STRING 
-      = "Customer [orders=[Order [orderId=A1111, desc=Game, value=0]], getFirstName()=Rajesh, getLastName()=Bhojwani]";
-	 
+    private static final String CUSTOMER_ARRAY_TO_STRING = "Customer [orders=[Order [orderId=A1111, desc=Game, value=0]], getFirstName()=Rajesh, getLastName()=Bhojwani]";
+
     @Test
     public void givenArray_whenToString_thenCustomerDetails() {
-	CustomerArrayToString customer = new CustomerArrayToString();
-	customer.setFirstName("Rajesh");
-	customer.setLastName("Bhojwani");
-	Order[] orders = new Order[1];  
-	orders[0] = new Order();
-	orders[0].setOrderId("A1111");
-	orders[0].setDesc("Game");
-	orders[0].setStatus("In-Shiping");
-        customer.setOrders(orders);         
-        
+        CustomerArrayToString customer = new CustomerArrayToString();
+        customer.setFirstName("Rajesh");
+        customer.setLastName("Bhojwani");
+        Order[] orders = new Order[1];
+        orders[0] = new Order();
+        orders[0].setOrderId("A1111");
+        orders[0].setDesc("Game");
+        orders[0].setStatus("In-Shiping");
+        customer.setOrders(orders);
+
         assertEquals(CUSTOMER_ARRAY_TO_STRING, customer.toString());
     }
 
diff --git a/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java
index 5ffb0d0e58..564fde8766 100644
--- a/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java
@@ -5,20 +5,19 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
 
 public class CustomerComplexObjectToStringUnitTest {
-    private static final String CUSTOMER_COMPLEX_TO_STRING 
-      = "Customer [order=Order [orderId=A1111, desc=Game, value=0], getFirstName()=Rajesh, getLastName()=Bhojwani]";
-	 
+    private static final String CUSTOMER_COMPLEX_TO_STRING = "Customer [order=Order [orderId=A1111, desc=Game, value=0], getFirstName()=Rajesh, getLastName()=Bhojwani]";
+
     @Test
     public void givenComplex_whenToString_thenCustomerDetails() {
         CustomerComplexObjectToString customer = new CustomerComplexObjectToString();
         customer.setFirstName("Rajesh");
         customer.setLastName("Bhojwani");
-        Order order    =    new Order();
+        Order order = new Order();
         order.setOrderId("A1111");
         order.setDesc("Game");
         order.setStatus("In-Shiping");
         customer.setOrder(order);
-             
+
         assertEquals(CUSTOMER_COMPLEX_TO_STRING, customer.toString());
     }
 
diff --git a/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java
index d43733bc60..f585a8a26c 100644
--- a/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java
@@ -6,8 +6,7 @@ import org.junit.jupiter.api.Test;
 
 public class CustomerPrimitiveToStringUnitTest {
 
-    private static final String CUSTOMER_PRIMITIVE_TO_STRING 
-      = "Customer [balance=110, getFirstName()=Rajesh, getLastName()=Bhojwani]";
+    private static final String CUSTOMER_PRIMITIVE_TO_STRING = "Customer [balance=110, getFirstName()=Rajesh, getLastName()=Bhojwani]";
 
     @Test
     public void givenPrimitive_whenToString_thenCustomerDetails() {
@@ -15,8 +14,7 @@ public class CustomerPrimitiveToStringUnitTest {
         customer.setFirstName("Rajesh");
         customer.setLastName("Bhojwani");
         customer.setBalance(110);
-        
+
         assertEquals(CUSTOMER_PRIMITIVE_TO_STRING, customer.toString());
     }
 }
-
diff --git a/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java
index e04512ff75..9b3f8a1a6f 100644
--- a/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java
@@ -8,26 +8,25 @@ import java.util.List;
 import org.junit.jupiter.api.Test;
 
 public class CustomerWrapperCollectionToStringUnitTest {
-    private static final String CUSTOMER_WRAPPER_COLLECTION_TO_STRING 
-      = "Customer [score=8, orders=[Book, Pen], fullname=Bhojwani, Rajesh, getFirstName()=Rajesh, getLastName()=Bhojwani]";
-    	 
+    private static final String CUSTOMER_WRAPPER_COLLECTION_TO_STRING = "Customer [score=8, orders=[Book, Pen], fullname=Bhojwani, Rajesh, getFirstName()=Rajesh, getLastName()=Bhojwani]";
+
     @Test
     public void givenWrapperCollectionStrBuffer_whenToString_thenCustomerDetails() {
-	CustomerWrapperCollectionToString customer = new CustomerWrapperCollectionToString();
-	customer.setFirstName("Rajesh");
-	customer.setLastName("Bhojwani");
-	customer.setScore(8);
-	
-	List<String> orders = new ArrayList<String>();
-	orders.add("Book");
-	orders.add("Pen");
-	customer.setOrders(orders);
-	
-	StringBuffer fullname = new StringBuffer();
-	fullname.append(customer.getLastName()+", "+ customer.getFirstName());
-	customer.setFullname(fullname);
-	
-	assertEquals(CUSTOMER_WRAPPER_COLLECTION_TO_STRING, customer.toString());
+        CustomerWrapperCollectionToString customer = new CustomerWrapperCollectionToString();
+        customer.setFirstName("Rajesh");
+        customer.setLastName("Bhojwani");
+        customer.setScore(8);
+
+        List<String> orders = new ArrayList<String>();
+        orders.add("Book");
+        orders.add("Pen");
+        customer.setOrders(orders);
+
+        StringBuffer fullname = new StringBuffer();
+        fullname.append(customer.getLastName() + ", " + customer.getFirstName());
+        customer.setFullname(fullname);
+
+        assertEquals(CUSTOMER_WRAPPER_COLLECTION_TO_STRING, customer.toString());
     }
 
 }
diff --git a/java-strings-ops/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java
index 4bbf63f87e..ca56d5aab5 100644
--- a/java-strings-ops/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java
+++ b/java-strings-ops/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java
@@ -1,7 +1,8 @@
 package com.baeldung.stringpool;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.Test;
-import static org.assertj.core.api.Assertions.*;
 
 public class StringPoolUnitTest {
 
diff --git a/java-strings/README.md b/java-strings/README.md
index 1faa11f606..17b74231a4 100644
--- a/java-strings/README.md
+++ b/java-strings/README.md
@@ -4,21 +4,13 @@ This module contains articles about strings in Java.
 
 ### Relevant Articles:
 - [String Operations with Java Streams](https://www.baeldung.com/java-stream-operations-on-strings)
-- [Converting String to Stream of chars](https://www.baeldung.com/java-string-to-stream)
-- [Java 8 StringJoiner](https://www.baeldung.com/java-string-joiner)
-- [Converting Strings to Enums in Java](https://www.baeldung.com/java-string-to-enum)
-- [Quick Guide to the Java StringTokenizer](https://www.baeldung.com/java-stringtokenizer)
 - [Use char[] Array Over a String for Manipulating Passwords in Java?](https://www.baeldung.com/java-storing-passwords)
-- [Convert a String to Title Case](https://www.baeldung.com/java-string-title-case)
 - [Compact Strings in Java 9](https://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)
-- [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)
 - [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)
 - [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)
+- [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)
 - More articles: [[next -->]](/java-strings-2)
diff --git a/javaxval/README.md b/javaxval/README.md
index 64903d7463..c2c392b276 100644
--- a/javaxval/README.md
+++ b/javaxval/README.md
@@ -9,4 +9,4 @@ This module contains articles about Bean Validation.
 - [Difference Between @NotNull, @NotEmpty, and @NotBlank Constraints in Bean Validation](https://www.baeldung.com/java-bean-validation-not-null-empty-blank)
 - [Javax BigDecimal Validation](https://www.baeldung.com/javax-bigdecimal-validation)
 - [Grouping Javax Validation Constraints](https://www.baeldung.com/javax-validation-groups)
-- [Javax Validations for Enums](https://www.baeldung.com/javax-validations-for-enums/)
+- [Javax Validations for Enums](https://www.baeldung.com/javax-validations-enums)
diff --git a/jaxb/README.md b/jaxb/README.md
index aca078af15..d9d16ab70b 100644
--- a/jaxb/README.md
+++ b/jaxb/README.md
@@ -4,3 +4,5 @@ This module contains articles about JAXB.
 
 ### Relevant Articles:
 - [Guide to JAXB](https://www.baeldung.com/jaxb)
+- [Unmarshalling Dates Using JAXB](https://www.baeldung.com/jaxb-unmarshalling-dates)
+
diff --git a/jersey/README.md b/jersey/README.md
index 09de7051ca..8537e07358 100644
--- a/jersey/README.md
+++ b/jersey/README.md
@@ -9,3 +9,5 @@ This module contains articles about Jersey.
 - [Set a Response Body in JAX-RS](https://www.baeldung.com/jax-rs-response)
 - [Exploring the Jersey Test Framework](https://www.baeldung.com/jersey-test)
 - [Explore Jersey Request Parameters](https://www.baeldung.com/jersey-request-parameters)
+- [Add a Header to a Jersey SSE Client Request](https://www.baeldung.com/jersey-sse-client-request-headers)
+
diff --git a/jhipster-5/bookstore-monolith/README.md b/jhipster-5/bookstore-monolith/README.md
index 0537f5b1a5..e4e69b83ac 100644
--- a/jhipster-5/bookstore-monolith/README.md
+++ b/jhipster-5/bookstore-monolith/README.md
@@ -1,3 +1,5 @@
 ## Relevant articles:
 
 - [Creating New APIs and Views in JHipster](https://www.baeldung.com/jhipster-new-apis-and-views)
+- [JHipster Authentication with an External Service](https://www.baeldung.com/jhipster-authentication-external-service)
+
diff --git a/jmh/README.md b/jmh/README.md
index 6876615328..3a5370c9f2 100644
--- a/jmh/README.md
+++ b/jmh/README.md
@@ -1,4 +1,8 @@
-## Relevant articles:
+## Java Microbenchmark Harness
+
+This module contains articles about the Java Microbenchmark Harness (JMH).
+
+### Relevant articles:
 
 - [Microbenchmarking with Java](https://www.baeldung.com/java-microbenchmark-harness)
 
diff --git a/jni/README.md b/jni/README.md
index daaeb7819f..6b984e6590 100644
--- a/jni/README.md
+++ b/jni/README.md
@@ -1,3 +1,6 @@
+## JNI
+
+This module contains articles about the Java Native Interface (JNI).
 
 ### Relevant Articles: 
 
diff --git a/jooby/README.md b/jooby/README.md
index bf8c580633..a2fe1985ba 100644
--- a/jooby/README.md
+++ b/jooby/README.md
@@ -1,3 +1,7 @@
-## Relevant articles:
+## Jooby
+
+This module contains articles about Jooby.
+
+### Relevant articles:
 
 - [Introduction to Jooby](https://www.baeldung.com/jooby)
diff --git a/jsf/README.md b/jsf/README.md
index 65735cc406..7d586f9872 100644
--- a/jsf/README.md
+++ b/jsf/README.md
@@ -1,3 +1,7 @@
+## JSF
+
+This module contains articles about JavaServer Faces (JSF).
+
 ### Relevant Articles:
 - [Guide to JSF Expression Language 3.0](https://www.baeldung.com/jsf-expression-language-el-3)
 - [Introduction to JSF EL 2](https://www.baeldung.com/intro-to-jsf-expression-language)
diff --git a/json-path/README.md b/json-path/README.md
index 41cc72a842..e3f81e827b 100644
--- a/json-path/README.md
+++ b/json-path/README.md
@@ -1,4 +1,8 @@
-## Relevant articles:
+## JsonPath
+
+This module contains articles about JsonPath.
+
+### Relevant articles:
 
 - [Introduction to JsonPath](https://www.baeldung.com/guide-to-jayway-jsonpath)
 - [Count with JsonPath](https://www.baeldung.com/jsonpath-count)
diff --git a/json/README.md b/json/README.md
index 96acedd0b1..0e50dcfddb 100644
--- a/json/README.md
+++ b/json/README.md
@@ -1,6 +1,6 @@
-=========
+## JSON
 
-## Fast-Json
+This module contains articles about JSON.
 
 ### Relevant Articles:
 - [Introduction to JSON Schema in Java](https://www.baeldung.com/introduction-to-json-schema-in-java)
diff --git a/jsoup/README.md b/jsoup/README.md
index 7624ce77bf..271d04194d 100644
--- a/jsoup/README.md
+++ b/jsoup/README.md
@@ -1,6 +1,6 @@
-=========
+## jsoup
 
-## jsoup Example Project
+This module contains articles about jsoup.
 
 ### Relevant Articles: 
 - [Parsing HTML in Java with Jsoup](https://www.baeldung.com/java-with-jsoup)
diff --git a/jta/README.md b/jta/README.md
index 445a291c8f..0351177a0d 100644
--- a/jta/README.md
+++ b/jta/README.md
@@ -1,2 +1,6 @@
+## JTA
+
+This module contains articles about the Java Transaction API (JTA).
+
 ### Relevant Articles:
 - [Guide to Java EE JTA](https://www.baeldung.com/jee-jta)
diff --git a/kotlin-js/README.md b/kotlin-js/README.md
index 84d0c70427..2ec50bad78 100644
--- a/kotlin-js/README.md
+++ b/kotlin-js/README.md
@@ -1,3 +1,7 @@
+## JavaScript in Kotlin
+
+This module contains articles about JavaScript in Kotlin.
+
 ### Relevant Articles: 
 
 - [Kotlin and Javascript](https://www.baeldung.com/kotlin-javascript)
diff --git a/kotlin-libraries-2/README.md b/kotlin-libraries-2/README.md
index 0b9f238d51..4064ef67d8 100644
--- a/kotlin-libraries-2/README.md
+++ b/kotlin-libraries-2/README.md
@@ -1,4 +1,11 @@
-## Relevant articles:
+## Kotlin Libraries
+
+This module contains articles about Kotlin Libraries.
+
+### Relevant articles:
 
 - [Jackson Support for Kotlin](https://www.baeldung.com/jackson-kotlin)
 - [Introduction to RxKotlin](https://www.baeldung.com/rxkotlin)
+- [MockK: A Mocking Library for Kotlin](https://www.baeldung.com/kotlin-mockk)
+- [Kotlin Immutable Collections](https://www.baeldung.com/kotlin-immutable-collections)
+- More articles: [[<-- prev]](/kotlin-libraries)
diff --git a/kotlin-libraries-2/pom.xml b/kotlin-libraries-2/pom.xml
index 14ac61a093..518142403e 100644
--- a/kotlin-libraries-2/pom.xml
+++ b/kotlin-libraries-2/pom.xml
@@ -28,9 +28,30 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-collections-immutable -->
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-collections-immutable</artifactId>
+            <version>${kotlinx-collections-immutable.version}</version>
+        </dependency>
+        <!-- MockK dependencies-->
+        <dependency>
+            <groupId>io.mockk</groupId>
+            <artifactId>mockk</artifactId>
+            <version>${mockk.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <properties>
+        <guava.version>27.1-jre</guava.version>
+        <mockk.version>1.9.3</mockk.version>
+        <kotlinx-collections-immutable.version>0.1</kotlinx-collections-immutable.version>
     </properties>
 
 </project>
diff --git a/kotlin-libraries/src/test/kotlin/com/baeldung/kotlin/immutable/KotlinxImmutablesUnitTest.kt b/kotlin-libraries-2/src/test/kotlin/com/baeldung/kotlin/immutable/KotlinxImmutablesUnitTest.kt
similarity index 100%
rename from kotlin-libraries/src/test/kotlin/com/baeldung/kotlin/immutable/KotlinxImmutablesUnitTest.kt
rename to kotlin-libraries-2/src/test/kotlin/com/baeldung/kotlin/immutable/KotlinxImmutablesUnitTest.kt
diff --git a/kotlin-libraries/src/test/kotlin/com/baeldung/kotlin/immutable/ReadOnlyUnitTest.kt b/kotlin-libraries-2/src/test/kotlin/com/baeldung/kotlin/immutable/ReadOnlyUnitTest.kt
similarity index 100%
rename from kotlin-libraries/src/test/kotlin/com/baeldung/kotlin/immutable/ReadOnlyUnitTest.kt
rename to kotlin-libraries-2/src/test/kotlin/com/baeldung/kotlin/immutable/ReadOnlyUnitTest.kt
diff --git a/kotlin-libraries/src/test/kotlin/com/baeldung/mockk/AnnotationMockKUnitTest.kt b/kotlin-libraries-2/src/test/kotlin/com/baeldung/mockk/AnnotationMockKUnitTest.kt
similarity index 100%
rename from kotlin-libraries/src/test/kotlin/com/baeldung/mockk/AnnotationMockKUnitTest.kt
rename to kotlin-libraries-2/src/test/kotlin/com/baeldung/mockk/AnnotationMockKUnitTest.kt
diff --git a/kotlin-libraries/src/test/kotlin/com/baeldung/mockk/BasicMockKUnitTest.kt b/kotlin-libraries-2/src/test/kotlin/com/baeldung/mockk/BasicMockKUnitTest.kt
similarity index 100%
rename from kotlin-libraries/src/test/kotlin/com/baeldung/mockk/BasicMockKUnitTest.kt
rename to kotlin-libraries-2/src/test/kotlin/com/baeldung/mockk/BasicMockKUnitTest.kt
diff --git a/kotlin-libraries/src/test/kotlin/com/baeldung/mockk/HierarchicalMockKUnitTest.kt b/kotlin-libraries-2/src/test/kotlin/com/baeldung/mockk/HierarchicalMockKUnitTest.kt
similarity index 100%
rename from kotlin-libraries/src/test/kotlin/com/baeldung/mockk/HierarchicalMockKUnitTest.kt
rename to kotlin-libraries-2/src/test/kotlin/com/baeldung/mockk/HierarchicalMockKUnitTest.kt
diff --git a/kotlin-libraries/src/test/kotlin/com/baeldung/mockk/TestableService.kt b/kotlin-libraries-2/src/test/kotlin/com/baeldung/mockk/TestableService.kt
similarity index 100%
rename from kotlin-libraries/src/test/kotlin/com/baeldung/mockk/TestableService.kt
rename to kotlin-libraries-2/src/test/kotlin/com/baeldung/mockk/TestableService.kt
diff --git a/kotlin-libraries/README.md b/kotlin-libraries/README.md
index 6ad90c1cd2..99a57c8293 100644
--- a/kotlin-libraries/README.md
+++ b/kotlin-libraries/README.md
@@ -1,4 +1,8 @@
-## Relevant articles:
+## Kotlin Libraries
+
+This module contains articles about Kotlin Libraries.
+
+### Relevant articles:
 
 - [Kotlin with Mockito](https://www.baeldung.com/kotlin-mockito)
 - [HTTP Requests with Kotlin and khttp](https://www.baeldung.com/kotlin-khttp)
@@ -10,5 +14,4 @@
 - [Introduction to Arrow in Kotlin](https://www.baeldung.com/kotlin-arrow)
 - [Kotlin with Ktor](https://www.baeldung.com/kotlin-ktor)
 - [REST API With Kotlin and Kovert](https://www.baeldung.com/kotlin-kovert)
-- [MockK: A Mocking Library for Kotlin](https://www.baeldung.com/kotlin-mockk)
-- [Kotlin Immutable Collections](https://www.baeldung.com/kotlin-immutable-collections)
+- More articles: [[next -->]](/kotlin-libraries-2)
diff --git a/kotlin-libraries/pom.xml b/kotlin-libraries/pom.xml
index 5299b5029e..7099166674 100644
--- a/kotlin-libraries/pom.xml
+++ b/kotlin-libraries/pom.xml
@@ -129,25 +129,7 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-collections-immutable -->
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-collections-immutable</artifactId>
-            <version>${kotlinx-collections-immutable.version}</version>
-        </dependency>
 
-        <!-- MockK dependencies-->
-        <dependency>
-            <groupId>io.mockk</groupId>
-            <artifactId>mockk</artifactId>
-            <version>${mockk.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
@@ -185,13 +167,10 @@
         <junit.vintage.version>5.2.0</junit.vintage.version>
         <assertj.version>3.10.0</assertj.version>
         <exposed.version>0.10.4</exposed.version>
-        <mockk.version>1.9.3</mockk.version>
-        <guava.version>27.1-jre</guava.version>
         <kovenant.version>3.3.0</kovenant.version>
         <byte-buddy.version>1.8.13</byte-buddy.version>
         <objenesis.version>2.6</objenesis.version>
         <rxkotlin.version>2.3.0</rxkotlin.version>
-        <kotlinx-collections-immutable.version>0.1</kotlinx-collections-immutable.version>
         <arrow-core.version>0.7.3</arrow-core.version>
     </properties>
 
diff --git a/libraries-2/README.md b/libraries-2/README.md
index ea95b18d72..fd1f73c386 100644
--- a/libraries-2/README.md
+++ b/libraries-2/README.md
@@ -18,4 +18,6 @@ Remember, for advanced libraries like [Jackson](/jackson) and [JUnit](/testing-m
 - [Key Value Store with Chronicle Map](https://www.baeldung.com/java-chronicle-map)
 - [Guide to MapDB](https://www.baeldung.com/mapdb)
 - [A Guide to Apache Mesos](https://www.baeldung.com/apache-mesos)
+- [JasperReports with Spring](https://www.baeldung.com/spring-jasper)
 - More articles [[<-- prev]](/libraries)
+
diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml
index 708006fa15..1ffaf0bbd7 100644
--- a/libraries-2/pom.xml
+++ b/libraries-2/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>libraries-2</artifactId>
     <name>libraries-2</name>
@@ -112,10 +112,36 @@
             <artifactId>mesos</artifactId>
             <version>${mesos.library.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.sf.jasperreports</groupId>
+            <artifactId>jasperreports</artifactId>
+            <version>${jasperreports.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>${hsqldb.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
-	    <mapdb.version>3.0.7</mapdb.version>
+        <mapdb.version>3.0.7</mapdb.version>
         <assertj.version>3.6.2</assertj.version>
         <classgraph.version>4.8.28</classgraph.version>
         <jbpm.version>6.0.0.Final</jbpm.version>
@@ -129,5 +155,8 @@
         <gson.version>2.8.5</gson.version>
         <mockwebserver.version>3.14.2</mockwebserver.version>
         <handlebars.version>4.1.2</handlebars.version>
+        <jasperreports.version>6.6.0</jasperreports.version>
+        <spring.version>5.1.9.RELEASE</spring.version>
+        <hsqldb.version>2.5.0</hsqldb.version>
     </properties>
 </project>
diff --git a/spring-all/src/main/java/org/baeldung/jasperreports/Main.java b/libraries-2/src/main/java/com/baeldung/jasperreports/Main.java
similarity index 93%
rename from spring-all/src/main/java/org/baeldung/jasperreports/Main.java
rename to libraries-2/src/main/java/com/baeldung/jasperreports/Main.java
index 79aee100a6..1c75c161fb 100644
--- a/spring-all/src/main/java/org/baeldung/jasperreports/Main.java
+++ b/libraries-2/src/main/java/com/baeldung/jasperreports/Main.java
@@ -1,9 +1,10 @@
-package org.baeldung.jasperreports;
+package com.baeldung.jasperreports;
+
+import com.baeldung.jasperreports.config.JasperRerportsSimpleConfig;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.baeldung.jasperreports.config.JasperRerportsSimpleConfig;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 public class Main {
     public static void main(String[] args) {
diff --git a/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportExporter.java b/libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportExporter.java
similarity index 87%
rename from spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportExporter.java
rename to libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportExporter.java
index 103bb37eb4..fa4b25707b 100644
--- a/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportExporter.java
+++ b/libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportExporter.java
@@ -1,22 +1,17 @@
-package org.baeldung.jasperreports;
+package com.baeldung.jasperreports;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.export.HtmlExporter;
 import net.sf.jasperreports.engine.export.JRCsvExporter;
 import net.sf.jasperreports.engine.export.JRPdfExporter;
 import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter;
-import net.sf.jasperreports.export.SimpleExporterInput;
-import net.sf.jasperreports.export.SimpleHtmlExporterOutput;
-import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
-import net.sf.jasperreports.export.SimplePdfExporterConfiguration;
-import net.sf.jasperreports.export.SimplePdfReportConfiguration;
-import net.sf.jasperreports.export.SimpleWriterExporterOutput;
-import net.sf.jasperreports.export.SimpleXlsxReportConfiguration;
+import net.sf.jasperreports.export.*;
 import org.springframework.stereotype.Component;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 @Component
 public class SimpleReportExporter {
 
diff --git a/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportFiller.java b/libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportFiller.java
similarity index 88%
rename from spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportFiller.java
rename to libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportFiller.java
index 08891d940a..5f0f7e1345 100644
--- a/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportFiller.java
+++ b/libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportFiller.java
@@ -1,20 +1,17 @@
-package org.baeldung.jasperreports;
+package com.baeldung.jasperreports;
 
+import net.sf.jasperreports.engine.*;
+import net.sf.jasperreports.engine.util.JRSaver;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.sql.DataSource;
 import java.io.InputStream;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.sql.DataSource;
-import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JasperCompileManager;
-import net.sf.jasperreports.engine.JasperFillManager;
-import net.sf.jasperreports.engine.JasperPrint;
-import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.util.JRSaver;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 @Component
 public class SimpleReportFiller {
diff --git a/spring-all/src/main/java/org/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java b/libraries-2/src/main/java/com/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java
similarity index 83%
rename from spring-all/src/main/java/org/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java
rename to libraries-2/src/main/java/com/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java
index 5cc2d894c9..10bae0052f 100644
--- a/spring-all/src/main/java/org/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java
+++ b/libraries-2/src/main/java/com/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java
@@ -1,13 +1,14 @@
-package org.baeldung.jasperreports.config;
+package com.baeldung.jasperreports.config;
 
-import javax.sql.DataSource;
-import org.baeldung.jasperreports.SimpleReportExporter;
-import org.baeldung.jasperreports.SimpleReportFiller;
+import com.baeldung.jasperreports.SimpleReportExporter;
+import com.baeldung.jasperreports.SimpleReportFiller;
 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
 public class JasperRerportsSimpleConfig {
 
diff --git a/libraries-2/src/main/resources/META-INF/kmodule.xml b/libraries-2/src/main/resources/META-INF/kmodule.xml
index 1b9ce1ce71..9e2597d5de 100644
--- a/libraries-2/src/main/resources/META-INF/kmodule.xml
+++ b/libraries-2/src/main/resources/META-INF/kmodule.xml
@@ -1,3 +1,3 @@
 <kmodule xmlns="http://jboss.org/kie/6.0.0/kmodule">
-	<kbase name="kbase" packages="com.baeldung.process" />
+    <kbase name="kbase" packages="com.baeldung.process"/>
 </kmodule>
\ No newline at end of file
diff --git a/spring-all/src/main/resources/employee-schema.sql b/libraries-2/src/main/resources/employee-schema.sql
similarity index 100%
rename from spring-all/src/main/resources/employee-schema.sql
rename to libraries-2/src/main/resources/employee-schema.sql
diff --git a/libraries-2/src/main/resources/employeeEmailReport.jrxml b/libraries-2/src/main/resources/employeeEmailReport.jrxml
new file mode 100644
index 0000000000..1e60344e47
--- /dev/null
+++ b/libraries-2/src/main/resources/employeeEmailReport.jrxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd"
+              name="employeeReport" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20"
+              topMargin="20" bottomMargin="20">
+    <parameter name="idEmployee" class="java.lang.Integer" isForPrompting="false"/>
+    <queryString>
+        <![CDATA[SELECT * FROM EMAIL WHERE ID_EMPLOYEE = $P{idEmployee}]]>
+    </queryString>
+    <field name="ADDRESS" class="java.lang.String"/>
+    <detail>
+        <band height="20" splitType="Stretch">
+            <textField>
+                <reportElement x="0" y="0" width="156" height="20"/>
+                <textElement/>
+                <textFieldExpression class="java.lang.String"><![CDATA[$F{ADDRESS}]]></textFieldExpression>
+            </textField>
+        </band>
+    </detail>
+</jasperReport>
diff --git a/spring-all/src/main/resources/employeeReport.jrxml b/libraries-2/src/main/resources/employeeReport.jrxml
similarity index 78%
rename from spring-all/src/main/resources/employeeReport.jrxml
rename to libraries-2/src/main/resources/employeeReport.jrxml
index 3d2be226fb..434c3e1338 100644
--- a/spring-all/src/main/resources/employeeReport.jrxml
+++ b/libraries-2/src/main/resources/employeeReport.jrxml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="employeeReport" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd"
+              name="employeeReport" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20"
+              topMargin="20" bottomMargin="20">
     <parameter name="title" class="java.lang.String" isForPrompting="false"/>
     <parameter name="condition" class="java.lang.String" isForPrompting="false">
         <defaultValueExpression><![CDATA[" 1 = 1"]]></defaultValueExpression>
     </parameter>
     <parameter name="minSalary" class="java.lang.Double" isForPrompting="false"/>
     <queryString>
-		<![CDATA[SELECT * FROM EMPLOYEE WHERE SALARY >= $P{minSalary} AND $P!{condition}]]>
+        <![CDATA[SELECT * FROM EMPLOYEE WHERE SALARY >= $P{minSalary} AND $P!{condition}]]>
     </queryString>
     <field name="FIRST_NAME" class="java.lang.String"/>
     <field name="LAST_NAME" class="java.lang.String"/>
@@ -44,7 +48,8 @@
                     <subreportParameterExpression><![CDATA[$F{ID}]]></subreportParameterExpression>
                 </subreportParameter>
                 <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-                <subreportExpression class="java.lang.String"><![CDATA["employeeEmailReport.jasper"]]></subreportExpression>
+                <subreportExpression class="java.lang.String">
+                    <![CDATA["employeeEmailReport.jasper"]]></subreportExpression>
             </subreport>
         </band>
     </detail>
diff --git a/libraries-data-2/README.md b/libraries-data-2/README.md
index 25d9fe177e..24618b5e37 100644
--- a/libraries-data-2/README.md
+++ b/libraries-data-2/README.md
@@ -7,10 +7,8 @@ This module contains articles about libraries for data processing in Java.
 - [Guide to the HyperLogLog Algorithm](https://www.baeldung.com/java-hyperloglog)
 - [Introduction to Conflict-Free Replicated Data Types](https://www.baeldung.com/java-conflict-free-replicated-data-types)
 - [Introduction to javax.measure](https://www.baeldung.com/javax-measure)
-- [Introduction To Docx4J](https://www.baeldung.com/docx4j)
-- [Interact with Google Sheets from Java](https://www.baeldung.com/google-sheets-java-client)
-- [Introduction To OpenCSV](https://www.baeldung.com/opencsv)
-- [Introduction to Smooks](https://www.baeldung.com/smooks)
 - [A Guide to Infinispan in Java](https://www.baeldung.com/infinispan)
-- More articles: [[<-- prev>]](/libraries-data)
-
+- [Guide to JMapper](https://www.baeldung.com/jmapper)
+- [An Introduction to SuanShu](https://www.baeldung.com/suanshu)
+- [Intro to Derive4J](https://www.baeldung.com/derive4j)
+More articles: [[<-- prev]](/../libraries-data)
\ No newline at end of file
diff --git a/libraries-data-2/pom.xml b/libraries-data-2/pom.xml
index 87c620f438..e79a2d98e0 100644
--- a/libraries-data-2/pom.xml
+++ b/libraries-data-2/pom.xml
@@ -67,43 +67,6 @@
             <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>
@@ -124,22 +87,78 @@
             <artifactId>spring-web</artifactId>
             <version>${spring.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.google.api-client</groupId>
+            <artifactId>google-api-client</artifactId>
+            <version>${google-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.jmapper-framework</groupId>
+            <artifactId>jmapper-core</artifactId>
+            <version>${jmapper.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.numericalmethod</groupId>
+            <artifactId>suanshu</artifactId>
+            <version>${suanshu.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.derive4j</groupId>
+            <artifactId>derive4j</artifactId>
+            <version>${derive4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility-proxy</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>nm-repo</id>
+            <name>Numerical Method's Maven Repository</name>
+            <url>http://repo.numericalmethod.com/maven/</url>
+            <layout>default</layout>
+        </repository>
+    </repositories>
+
     <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>
+        <google-api.version>1.23.0</google-api.version>
+        <jmapper.version>1.6.0.1</jmapper.version>
+        <suanshu.version>4.0.0</suanshu.version>
+        <derive4j.version>1.1.0</derive4j.version>
+        <assertj.version>3.6.2</assertj.version>
+        <slf4j.version>1.7.25</slf4j.version>
+        <awaitility.version>3.0.0</awaitility.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/libraries-data-3/src/main/java/com/baeldung/derive4j/adt/Either.java b/libraries-data-2/src/main/java/com/baeldung/derive4j/adt/Either.java
similarity index 100%
rename from libraries-data-3/src/main/java/com/baeldung/derive4j/adt/Either.java
rename to libraries-data-2/src/main/java/com/baeldung/derive4j/adt/Either.java
diff --git a/libraries-data-3/src/main/java/com/baeldung/derive4j/lazy/LazyRequest.java b/libraries-data-2/src/main/java/com/baeldung/derive4j/lazy/LazyRequest.java
similarity index 90%
rename from libraries-data-3/src/main/java/com/baeldung/derive4j/lazy/LazyRequest.java
rename to libraries-data-2/src/main/java/com/baeldung/derive4j/lazy/LazyRequest.java
index bee947df12..143648d67a 100644
--- a/libraries-data-3/src/main/java/com/baeldung/derive4j/lazy/LazyRequest.java
+++ b/libraries-data-2/src/main/java/com/baeldung/derive4j/lazy/LazyRequest.java
@@ -16,6 +16,6 @@ public interface LazyRequest {
         R DELETE(String path);
     }
 
-    <R> R match(LazyRequest.Cases<R> method);
+    <R> R match(Cases<R> method);
 }
 
diff --git a/libraries-data-3/src/main/java/com/baeldung/derive4j/pattern/HTTPRequest.java b/libraries-data-2/src/main/java/com/baeldung/derive4j/pattern/HTTPRequest.java
similarity index 100%
rename from libraries-data-3/src/main/java/com/baeldung/derive4j/pattern/HTTPRequest.java
rename to libraries-data-2/src/main/java/com/baeldung/derive4j/pattern/HTTPRequest.java
diff --git a/libraries-data-3/src/main/java/com/baeldung/derive4j/pattern/HTTPResponse.java b/libraries-data-2/src/main/java/com/baeldung/derive4j/pattern/HTTPResponse.java
similarity index 100%
rename from libraries-data-3/src/main/java/com/baeldung/derive4j/pattern/HTTPResponse.java
rename to libraries-data-2/src/main/java/com/baeldung/derive4j/pattern/HTTPResponse.java
diff --git a/libraries-data-3/src/main/java/com/baeldung/derive4j/pattern/HTTPServer.java b/libraries-data-2/src/main/java/com/baeldung/derive4j/pattern/HTTPServer.java
similarity index 100%
rename from libraries-data-3/src/main/java/com/baeldung/derive4j/pattern/HTTPServer.java
rename to libraries-data-2/src/main/java/com/baeldung/derive4j/pattern/HTTPServer.java
diff --git a/libraries-data-3/src/main/java/com/baeldung/jmapper/User.java b/libraries-data-2/src/main/java/com/baeldung/jmapper/User.java
similarity index 100%
rename from libraries-data-3/src/main/java/com/baeldung/jmapper/User.java
rename to libraries-data-2/src/main/java/com/baeldung/jmapper/User.java
diff --git a/libraries-data-3/src/main/java/com/baeldung/jmapper/UserDto.java b/libraries-data-2/src/main/java/com/baeldung/jmapper/UserDto.java
similarity index 100%
rename from libraries-data-3/src/main/java/com/baeldung/jmapper/UserDto.java
rename to libraries-data-2/src/main/java/com/baeldung/jmapper/UserDto.java
index 326e8f3cd5..039e78b17d 100644
--- a/libraries-data-3/src/main/java/com/baeldung/jmapper/UserDto.java
+++ b/libraries-data-2/src/main/java/com/baeldung/jmapper/UserDto.java
@@ -1,11 +1,11 @@
 package com.baeldung.jmapper;
 
-import java.time.LocalDate;
-import java.time.Period;
-
 import com.googlecode.jmapper.annotations.JMap;
 import com.googlecode.jmapper.annotations.JMapConversion;
 
+import java.time.LocalDate;
+import java.time.Period;
+
 public class UserDto {
     
     @JMap
diff --git a/libraries-data-3/src/main/java/com/baeldung/jmapper/UserDto1.java b/libraries-data-2/src/main/java/com/baeldung/jmapper/UserDto1.java
similarity index 100%
rename from libraries-data-3/src/main/java/com/baeldung/jmapper/UserDto1.java
rename to libraries-data-2/src/main/java/com/baeldung/jmapper/UserDto1.java
diff --git a/libraries-data-3/src/main/java/com/baeldung/jmapper/relational/User.java b/libraries-data-2/src/main/java/com/baeldung/jmapper/relational/User.java
similarity index 100%
rename from libraries-data-3/src/main/java/com/baeldung/jmapper/relational/User.java
rename to libraries-data-2/src/main/java/com/baeldung/jmapper/relational/User.java
diff --git a/libraries-data-3/src/main/java/com/baeldung/jmapper/relational/UserDto1.java b/libraries-data-2/src/main/java/com/baeldung/jmapper/relational/UserDto1.java
similarity index 100%
rename from libraries-data-3/src/main/java/com/baeldung/jmapper/relational/UserDto1.java
rename to libraries-data-2/src/main/java/com/baeldung/jmapper/relational/UserDto1.java
diff --git a/libraries-data-3/src/main/java/com/baeldung/jmapper/relational/UserDto2.java b/libraries-data-2/src/main/java/com/baeldung/jmapper/relational/UserDto2.java
similarity index 100%
rename from libraries-data-3/src/main/java/com/baeldung/jmapper/relational/UserDto2.java
rename to libraries-data-2/src/main/java/com/baeldung/jmapper/relational/UserDto2.java
diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/CsvBean.java b/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/CsvBean.java
deleted file mode 100644
index af9caaae12..0000000000
--- a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/CsvBean.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.baeldung.opencsv.beans;
-
-public class CsvBean { }
diff --git a/libraries-data-3/src/main/java/com/baeldung/suanshu/SuanShuMath.java b/libraries-data-2/src/main/java/com/baeldung/suanshu/SuanShuMath.java
similarity index 99%
rename from libraries-data-3/src/main/java/com/baeldung/suanshu/SuanShuMath.java
rename to libraries-data-2/src/main/java/com/baeldung/suanshu/SuanShuMath.java
index 46af24692d..ce7bc60a3a 100644
--- a/libraries-data-3/src/main/java/com/baeldung/suanshu/SuanShuMath.java
+++ b/libraries-data-2/src/main/java/com/baeldung/suanshu/SuanShuMath.java
@@ -1,19 +1,18 @@
 package com.baeldung.suanshu;
 
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.numericalmethod.suanshu.algebra.linear.matrix.doubles.Matrix;
-import com.numericalmethod.suanshu.algebra.linear.vector.doubles.Vector;
-import com.numericalmethod.suanshu.algebra.linear.vector.doubles.dense.DenseVector;
 import com.numericalmethod.suanshu.algebra.linear.matrix.doubles.matrixtype.dense.DenseMatrix;
 import com.numericalmethod.suanshu.algebra.linear.matrix.doubles.operation.Inverse;
+import com.numericalmethod.suanshu.algebra.linear.vector.doubles.Vector;
+import com.numericalmethod.suanshu.algebra.linear.vector.doubles.dense.DenseVector;
 import com.numericalmethod.suanshu.analysis.function.polynomial.Polynomial;
 import com.numericalmethod.suanshu.analysis.function.polynomial.root.PolyRoot;
 import com.numericalmethod.suanshu.analysis.function.polynomial.root.PolyRootSolver;
 import com.numericalmethod.suanshu.number.complex.Complex;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
 
 class SuanShuMath {
 
diff --git a/libraries-data-2/src/test/com/baeldung/crdt/CRDTUnitTest.java b/libraries-data-2/src/test/java/com/baeldung/crdt/CRDTUnitTest.java
similarity index 100%
rename from libraries-data-2/src/test/com/baeldung/crdt/CRDTUnitTest.java
rename to libraries-data-2/src/test/java/com/baeldung/crdt/CRDTUnitTest.java
diff --git a/libraries-data-3/src/test/java/com/baeldung/derive4j/adt/EitherUnitTest.java b/libraries-data-2/src/test/java/com/baeldung/derive4j/adt/EitherUnitTest.java
similarity index 99%
rename from libraries-data-3/src/test/java/com/baeldung/derive4j/adt/EitherUnitTest.java
rename to libraries-data-2/src/test/java/com/baeldung/derive4j/adt/EitherUnitTest.java
index 511e24961f..4e68f09f6a 100644
--- a/libraries-data-3/src/test/java/com/baeldung/derive4j/adt/EitherUnitTest.java
+++ b/libraries-data-2/src/test/java/com/baeldung/derive4j/adt/EitherUnitTest.java
@@ -8,6 +8,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.Optional;
 import java.util.function.Function;
+
 @RunWith(MockitoJUnitRunner.class)
 public class EitherUnitTest {
     @Test
diff --git a/libraries-data-3/src/test/java/com/baeldung/derive4j/lazy/LazyRequestUnitTest.java b/libraries-data-2/src/test/java/com/baeldung/derive4j/lazy/LazyRequestUnitTest.java
similarity index 100%
rename from libraries-data-3/src/test/java/com/baeldung/derive4j/lazy/LazyRequestUnitTest.java
rename to libraries-data-2/src/test/java/com/baeldung/derive4j/lazy/LazyRequestUnitTest.java
diff --git a/libraries-data-3/src/test/java/com/baeldung/derive4j/pattern/HTTPRequestUnitTest.java b/libraries-data-2/src/test/java/com/baeldung/derive4j/pattern/HTTPRequestUnitTest.java
similarity index 100%
rename from libraries-data-3/src/test/java/com/baeldung/derive4j/pattern/HTTPRequestUnitTest.java
rename to libraries-data-2/src/test/java/com/baeldung/derive4j/pattern/HTTPRequestUnitTest.java
diff --git a/libraries-data-2/src/test/com/baeldung/flink/BackupCreatorIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java
similarity index 100%
rename from libraries-data-2/src/test/com/baeldung/flink/BackupCreatorIntegrationTest.java
rename to libraries-data-2/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java
diff --git a/libraries-data-2/src/test/com/baeldung/flink/WordCapitalizerIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java
similarity index 100%
rename from libraries-data-2/src/test/com/baeldung/flink/WordCapitalizerIntegrationTest.java
rename to libraries-data-2/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java
diff --git a/libraries-data-2/src/test/com/baeldung/flink/WordCountIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java
similarity index 100%
rename from libraries-data-2/src/test/com/baeldung/flink/WordCountIntegrationTest.java
rename to libraries-data-2/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java
diff --git a/libraries-data-2/src/test/com/baeldung/hll/HLLLongRunningManualTest.java b/libraries-data-2/src/test/java/com/baeldung/hll/HLLLongRunningManualTest.java
similarity index 100%
rename from libraries-data-2/src/test/com/baeldung/hll/HLLLongRunningManualTest.java
rename to libraries-data-2/src/test/java/com/baeldung/hll/HLLLongRunningManualTest.java
diff --git a/libraries-data-2/src/test/com/baeldung/infinispan/AbstractIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/infinispan/AbstractIntegrationTest.java
similarity index 100%
rename from libraries-data-2/src/test/com/baeldung/infinispan/AbstractIntegrationTest.java
rename to libraries-data-2/src/test/java/com/baeldung/infinispan/AbstractIntegrationTest.java
diff --git a/libraries-data-2/src/test/com/baeldung/infinispan/service/HelloWorldServiceTemporaryLiveTest.java b/libraries-data-2/src/test/java/com/baeldung/infinispan/service/HelloWorldServiceTemporaryLiveTest.java
similarity index 100%
rename from libraries-data-2/src/test/com/baeldung/infinispan/service/HelloWorldServiceTemporaryLiveTest.java
rename to libraries-data-2/src/test/java/com/baeldung/infinispan/service/HelloWorldServiceTemporaryLiveTest.java
diff --git a/libraries-data-2/src/test/com/baeldung/infinispan/service/TransactionalServiceIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/infinispan/service/TransactionalServiceIntegrationTest.java
similarity index 100%
rename from libraries-data-2/src/test/com/baeldung/infinispan/service/TransactionalServiceIntegrationTest.java
rename to libraries-data-2/src/test/java/com/baeldung/infinispan/service/TransactionalServiceIntegrationTest.java
diff --git a/libraries-data-3/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java
similarity index 95%
rename from libraries-data-3/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java
rename to libraries-data-2/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java
index 9db7bdb4ac..177ef08d41 100644
--- a/libraries-data-3/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java
+++ b/libraries-data-2/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java
@@ -1,17 +1,14 @@
 package com.baeldung.jmapper;
 
-import static com.googlecode.jmapper.api.JMapperAPI.attribute;
-import static com.googlecode.jmapper.api.JMapperAPI.global;
-import static com.googlecode.jmapper.api.JMapperAPI.mappedClass;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.time.LocalDate;
-
-import org.junit.Test;
-
 import com.googlecode.jmapper.JMapper;
 import com.googlecode.jmapper.api.JMapperAPI;
+import org.junit.Test;
+
+import java.time.LocalDate;
+
+import static com.googlecode.jmapper.api.JMapperAPI.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class JMapperIntegrationTest {
 
diff --git a/libraries-data-3/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java b/libraries-data-2/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java
similarity index 99%
rename from libraries-data-3/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java
rename to libraries-data-2/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java
index 6af2865159..a44d608a0a 100644
--- a/libraries-data-3/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java
+++ b/libraries-data-2/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java
@@ -1,16 +1,15 @@
 package com.baeldung.jmapper;
 
-import static com.googlecode.jmapper.api.JMapperAPI.attribute;
-import static com.googlecode.jmapper.api.JMapperAPI.mappedClass;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
 import com.baeldung.jmapper.relational.User;
 import com.baeldung.jmapper.relational.UserDto1;
 import com.baeldung.jmapper.relational.UserDto2;
 import com.googlecode.jmapper.RelationalJMapper;
 import com.googlecode.jmapper.api.JMapperAPI;
+import org.junit.Test;
+
+import static com.googlecode.jmapper.api.JMapperAPI.attribute;
+import static com.googlecode.jmapper.api.JMapperAPI.mappedClass;
+import static org.junit.Assert.assertEquals;
 
 public class JMapperRelationalIntegrationTest {
 
diff --git a/libraries-data-2/src/test/com/baeldung/measurement/WaterTankUnitTest.java b/libraries-data-2/src/test/java/com/baeldung/measurement/WaterTankUnitTest.java
similarity index 100%
rename from libraries-data-2/src/test/com/baeldung/measurement/WaterTankUnitTest.java
rename to libraries-data-2/src/test/java/com/baeldung/measurement/WaterTankUnitTest.java
diff --git a/libraries-data-3/src/main/resources/user_jmapper.xml b/libraries-data-2/src/test/resources/user_jmapper.xml
similarity index 100%
rename from libraries-data-3/src/main/resources/user_jmapper.xml
rename to libraries-data-2/src/test/resources/user_jmapper.xml
diff --git a/libraries-data-3/src/main/resources/user_jmapper1.xml b/libraries-data-2/src/test/resources/user_jmapper1.xml
similarity index 100%
rename from libraries-data-3/src/main/resources/user_jmapper1.xml
rename to libraries-data-2/src/test/resources/user_jmapper1.xml
diff --git a/libraries-data-3/src/main/resources/user_jmapper2.xml b/libraries-data-2/src/test/resources/user_jmapper2.xml
similarity index 100%
rename from libraries-data-3/src/main/resources/user_jmapper2.xml
rename to libraries-data-2/src/test/resources/user_jmapper2.xml
diff --git a/libraries-data-3/README.md b/libraries-data-3/README.md
deleted file mode 100644
index 6be6eae4a8..0000000000
--- a/libraries-data-3/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Relevant articles
-- [Parsing YAML with SnakeYAML](https://www.baeldung.com/java-snake-yaml)
-- [Guide to JMapper](https://www.baeldung.com/jmapper)
-- [An Introduction to SuanShu](https://www.baeldung.com/suanshu)
-- [Intro to Derive4J](https://www.baeldung.com/derive4j)
diff --git a/libraries-data-3/pom.xml b/libraries-data-3/pom.xml
deleted file mode 100644
index f55701f51c..0000000000
--- a/libraries-data-3/pom.xml
+++ /dev/null
@@ -1,55 +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>
-    <artifactId>libraries-data-3</artifactId>
-    <name>libraries-data-3</name>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>${snakeyaml.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.jmapper-framework</groupId>
-            <artifactId>jmapper-core</artifactId>
-            <version>${jmapper.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.numericalmethod</groupId>
-            <artifactId>suanshu</artifactId>
-            <version>${suanshu.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.derive4j</groupId>
-            <artifactId>derive4j</artifactId>
-            <version>${derive4j.version}</version>
-        </dependency>
-
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>nm-repo</id>
-            <name>Numerical Method's Maven Repository</name>
-            <url>http://repo.numericalmethod.com/maven/</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
-
-    <properties>
-        <snakeyaml.version>1.21</snakeyaml.version>
-        <jmapper.version>1.6.0.1</jmapper.version>
-        <suanshu.version>4.0.0</suanshu.version>
-        <derive4j.version>1.1.0</derive4j.version>
-    </properties>
-</project>
\ No newline at end of file
diff --git a/libraries-data-3/src/test/resources/yaml/customer_with_type.yaml b/libraries-data-3/src/test/resources/yaml/customer_with_type.yaml
deleted file mode 100644
index 6e13c26cea..0000000000
--- a/libraries-data-3/src/test/resources/yaml/customer_with_type.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-!!com.baeldung.snakeyaml.Customer
-firstName: "John"
-lastName: "Doe"
-age: 20
\ No newline at end of file
diff --git a/libraries-data-db/README.md b/libraries-data-db/README.md
new file mode 100644
index 0000000000..790a3eb318
--- /dev/null
+++ b/libraries-data-db/README.md
@@ -0,0 +1,11 @@
+## DB Data Libraries
+
+This module contains articles about database-related data processing libraries.
+
+### Relevant articles
+- [Introduction to Reladomo](https://www.baeldung.com/reladomo)
+- [Introduction to ORMLite](https://www.baeldung.com/ormlite)
+- [Guide to Java Data Objects](https://www.baeldung.com/jdo)
+- [Intro to JDO Queries 2/2](https://www.baeldung.com/jdo-queries)
+- [Introduction to HikariCP](https://www.baeldung.com/hikaricp)
+- [Guide to Ebean ORM](https://www.baeldung.com/ebean-orm)
diff --git a/libraries-data-3/log4j.properties b/libraries-data-db/log4j.properties
similarity index 100%
rename from libraries-data-3/log4j.properties
rename to libraries-data-db/log4j.properties
diff --git a/libraries-data/myPersistence.xml b/libraries-data-db/myPersistence.xml
similarity index 100%
rename from libraries-data/myPersistence.xml
rename to libraries-data-db/myPersistence.xml
diff --git a/libraries-data-db/pom.xml b/libraries-data-db/pom.xml
new file mode 100644
index 0000000000..185f23124d
--- /dev/null
+++ b/libraries-data-db/pom.xml
@@ -0,0 +1,228 @@
+<?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-db</artifactId>
+    <name>libraries-data-db</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.goldmansachs.reladomo</groupId>
+            <artifactId>reladomo</artifactId>
+            <version>${reladomo.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.goldmansachs.reladomo</groupId>
+            <artifactId>reladomo-test-util</artifactId>
+            <version>${reladomo.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.j256.ormlite</groupId>
+            <artifactId>ormlite-jdbc</artifactId>
+            <version>${ormlite.version}</version>
+        </dependency>
+        <!-- JDO -->
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>javax.jdo</artifactId>
+            <version>${javax.jdo.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-core</artifactId>
+            <version>${datanucleus.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jdo</artifactId>
+            <version>${datanucleus.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-rdbms</artifactId>
+            <version>${datanucleus.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-maven-plugin</artifactId>
+            <version>${datanucleus-maven-plugin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-xml</artifactId>
+            <version>${datanucleus-xml.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jdo-query</artifactId>
+            <version>${datanucleus-jdo-query.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+        <!-- Hikari CP -->
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>${HikariCP.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- ebean -->
+        <dependency>
+            <groupId>io.ebean</groupId>
+            <artifactId>ebean</artifactId>
+            <version>${ebean.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>libraries-data-db</finalName>
+        <plugins>
+            <!-- Reladomo -->
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>${maven-antrun-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>generateMithra</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
+                                <taskdef name="gen-reladomo" classpath="plugin_classpath" classname="com.gs.fw.common.mithra.generator.MithraGenerator" />
+                                <gen-reladomo xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml" generateGscListMethod="true"
+                                              generatedDir="${project.build.directory}/generated-sources/reladomo" nonGeneratedDir="${project.basedir}/src/main/java" />
+
+                                <taskdef name="gen-ddl" classname="com.gs.fw.common.mithra.generator.dbgenerator.MithraDbDefinitionGenerator" loaderRef="reladomoGenerator">
+                                    <classpath refid="maven.plugin.classpath" />
+                                </taskdef>
+                                <gen-ddl xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
+                                         generatedDir="${project.build.directory}/generated-db/sql" databaseType="postgres" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.goldmansachs.reladomo</groupId>
+                        <artifactId>reladomogen</artifactId>
+                        <version>${reladomo.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>com.goldmansachs.reladomo</groupId>
+                        <artifactId>reladomo-gen-util</artifactId>
+                        <version>${reladomo.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>${build-helper-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/generated-sources/reladomo</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add-resource</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>add-resource</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>${project.build.directory}/generated-db/</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- /Reladomo -->
+
+            <!-- JDO Plugin -->
+            <plugin>
+                <groupId>org.datanucleus</groupId>
+                <artifactId>datanucleus-maven-plugin</artifactId>
+                <version>${datanucleus-maven-plugin.version}</version>
+                <configuration>
+                    <api>JDO</api>
+                    <props>${basedir}/datanucleus.properties</props>
+                    <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+                    <verbose>true</verbose>
+                    <fork>false</fork>
+                    <!-- Solve windows line too long error -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>enhance</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>io.ebean</groupId>
+                <artifactId>ebean-maven-plugin</artifactId>
+                <version>11.11.2</version>
+                <executions>
+                    <!-- enhance main classes -->
+                    <execution>
+                        <id>main</id>
+                        <phase>process-classes</phase>
+                        <configuration>
+                            <transformArgs>debug=1</transformArgs>
+                        </configuration>
+                        <goals>
+                            <goal>enhance</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <reladomo.version>16.5.1</reladomo.version>
+        <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
+        <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
+        <ormlite.version>5.0</ormlite.version>
+        <datanucleus.version>5.1.1</datanucleus.version>
+        <datanucleus-maven-plugin.version>5.0.2</datanucleus-maven-plugin.version>
+        <datanucleus-xml.version>5.0.0-release</datanucleus-xml.version>
+        <datanucleus-jdo-query.version>5.0.4</datanucleus-jdo-query.version>
+        <javax.jdo.version>3.2.0-m7</javax.jdo.version>
+        <slf4j.version>1.7.25</slf4j.version>
+        <HikariCP.version>2.7.2</HikariCP.version>
+        <ebean.version>11.22.4</ebean.version>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/libraries-data/src/main/java/com/baeldung/ebean/app/App.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java
similarity index 93%
rename from libraries-data/src/main/java/com/baeldung/ebean/app/App.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java
index 44a4fa8562..9c59cbb8c0 100644
--- a/libraries-data/src/main/java/com/baeldung/ebean/app/App.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java
@@ -1,14 +1,13 @@
-package com.baeldung.ebean.app;
-
-import java.util.Arrays;
-
-import com.baeldung.ebean.model.Address;
-import com.baeldung.ebean.model.Customer;
+package com.baeldung.libraries.ebean.app;
 
+import com.baeldung.libraries.ebean.model.Address;
+import com.baeldung.libraries.ebean.model.Customer;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.annotation.Transactional;
 
+import java.util.Arrays;
+
 public class App {
 
     public static void main(String[] args) {
diff --git a/libraries-data/src/main/java/com/baeldung/ebean/app/App2.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java
similarity index 95%
rename from libraries-data/src/main/java/com/baeldung/ebean/app/App2.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java
index fba77007c6..c604f2cc25 100644
--- a/libraries-data/src/main/java/com/baeldung/ebean/app/App2.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java
@@ -1,11 +1,11 @@
-package com.baeldung.ebean.app;
-
-import java.util.Properties;
+package com.baeldung.libraries.ebean.app;
 
 import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.config.ServerConfig;
 
+import java.util.Properties;
+
 public class App2 {
 
     public static void main(String[] args) {
diff --git a/libraries-data/src/main/java/com/baeldung/ebean/model/Address.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/Address.java
similarity index 96%
rename from libraries-data/src/main/java/com/baeldung/ebean/model/Address.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/Address.java
index dfcd90ffa7..a5c97b9c1d 100644
--- a/libraries-data/src/main/java/com/baeldung/ebean/model/Address.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/Address.java
@@ -1,4 +1,4 @@
-package com.baeldung.ebean.model;
+package com.baeldung.libraries.ebean.model;
 
 import javax.persistence.Entity;
 
diff --git a/libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/BaseModel.java
similarity index 95%
rename from libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/BaseModel.java
index 547d5bf075..7abd425470 100644
--- a/libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/BaseModel.java
@@ -1,13 +1,12 @@
-package com.baeldung.ebean.model;
+package com.baeldung.libraries.ebean.model;
 
-import java.time.Instant;
+import io.ebean.annotation.WhenCreated;
+import io.ebean.annotation.WhenModified;
 
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Version;
-
-import io.ebean.annotation.WhenCreated;
-import io.ebean.annotation.WhenModified;
+import java.time.Instant;
 
 @MappedSuperclass
 public abstract class BaseModel {
diff --git a/libraries-data/src/main/java/com/baeldung/ebean/model/Customer.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/Customer.java
similarity index 94%
rename from libraries-data/src/main/java/com/baeldung/ebean/model/Customer.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/Customer.java
index 4dd629245a..f8fa9e505e 100644
--- a/libraries-data/src/main/java/com/baeldung/ebean/model/Customer.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/model/Customer.java
@@ -1,4 +1,4 @@
-package com.baeldung.ebean.model;
+package com.baeldung.libraries.ebean.model;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
diff --git a/libraries-data/src/main/java/com/baeldung/hikaricp/DataSource.java b/libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/DataSource.java
similarity index 97%
rename from libraries-data/src/main/java/com/baeldung/hikaricp/DataSource.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/DataSource.java
index e8d3b4ff96..868d4b90b0 100644
--- a/libraries-data/src/main/java/com/baeldung/hikaricp/DataSource.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/DataSource.java
@@ -1,11 +1,11 @@
-package com.baeldung.hikaricp;
-
-import java.sql.Connection;
-import java.sql.SQLException;
+package com.baeldung.libraries.hikaricp;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 
+import java.sql.Connection;
+import java.sql.SQLException;
+
 public class DataSource {
 
     private static HikariConfig config = new HikariConfig();
diff --git a/libraries-data/src/main/java/com/baeldung/hikaricp/Employee.java b/libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/Employee.java
similarity index 97%
rename from libraries-data/src/main/java/com/baeldung/hikaricp/Employee.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/Employee.java
index 1ea3c13a48..338599c969 100644
--- a/libraries-data/src/main/java/com/baeldung/hikaricp/Employee.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/Employee.java
@@ -1,4 +1,4 @@
-package com.baeldung.hikaricp;
+package com.baeldung.libraries.hikaricp;
 
 import java.sql.Date;
 
diff --git a/libraries-data/src/main/java/com/baeldung/hikaricp/HikariCPDemo.java b/libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/HikariCPDemo.java
similarity index 97%
rename from libraries-data/src/main/java/com/baeldung/hikaricp/HikariCPDemo.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/HikariCPDemo.java
index 57d124fd5d..e23b583d98 100644
--- a/libraries-data/src/main/java/com/baeldung/hikaricp/HikariCPDemo.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/hikaricp/HikariCPDemo.java
@@ -1,4 +1,4 @@
-package com.baeldung.hikaricp;
+package com.baeldung.libraries.hikaricp;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/libraries-data/src/main/java/com/baeldung/jdo/GuideToJDO.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java
similarity index 98%
rename from libraries-data/src/main/java/com/baeldung/jdo/GuideToJDO.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java
index bd459f963c..99b0a4bef7 100644
--- a/libraries-data/src/main/java/com/baeldung/jdo/GuideToJDO.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java
@@ -1,5 +1,12 @@
-package com.baeldung.jdo;
+package com.baeldung.libraries.jdo;
 
+import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
+import org.datanucleus.metadata.PersistenceUnitMetaData;
+
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+import javax.jdo.Query;
+import javax.jdo.Transaction;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -7,14 +14,6 @@ import java.util.Random;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-import javax.jdo.Query;
-import javax.jdo.Transaction;
-
-import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
-import org.datanucleus.metadata.PersistenceUnitMetaData;
-
 public class GuideToJDO {
 
     private static final Logger LOGGER = Logger.getLogger(GuideToJDO.class.getName());
@@ -45,7 +44,7 @@ public class GuideToJDO {
     public void CreateH2Properties() {
 
         pumd = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null);
-        pumd.addClassName("com.baeldung.jdo.Product");
+        pumd.addClassName("com.baeldung.libraries.jdo.Product");
         pumd.setExcludeUnlistedClasses();
         pumd.addProperty("javax.jdo.option.ConnectionDriverName", "org.h2.Driver");
         pumd.addProperty("javax.jdo.option.ConnectionURL", "jdbc:h2:mem:mypersistence");
@@ -57,7 +56,7 @@ public class GuideToJDO {
 
     public void CreateXMLProperties() {
         pumdXML = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null);
-        pumdXML.addClassName("com.baeldung.jdo.ProductXML");
+        pumdXML.addClassName("com.baeldung.libraries.jdo.ProductXML");
         pumdXML.setExcludeUnlistedClasses();
         pumdXML.addProperty("javax.jdo.option.ConnectionURL", "xml:file:myPersistence.xml");
         pumdXML.addProperty("datanucleus.autoCreateSchema", "true");
diff --git a/libraries-data/src/main/java/com/baeldung/jdo/Product.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/Product.java
similarity index 95%
rename from libraries-data/src/main/java/com/baeldung/jdo/Product.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/Product.java
index 124428d671..3ff27732a9 100644
--- a/libraries-data/src/main/java/com/baeldung/jdo/Product.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/Product.java
@@ -1,4 +1,4 @@
-package com.baeldung.jdo;
+package com.baeldung.libraries.jdo;
 
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.PersistenceCapable;
diff --git a/libraries-data/src/main/java/com/baeldung/jdo/ProductXML.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/ProductXML.java
similarity index 96%
rename from libraries-data/src/main/java/com/baeldung/jdo/ProductXML.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/ProductXML.java
index d702a8ac90..2679b049bb 100644
--- a/libraries-data/src/main/java/com/baeldung/jdo/ProductXML.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/ProductXML.java
@@ -1,4 +1,4 @@
-package com.baeldung.jdo;
+package com.baeldung.libraries.jdo;
 
 import javax.jdo.annotations.PersistenceCapable;
 import javax.jdo.annotations.PrimaryKey;
diff --git a/libraries-data/src/main/java/com/baeldung/jdo/query/MyApp.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/query/MyApp.java
similarity index 85%
rename from libraries-data/src/main/java/com/baeldung/jdo/query/MyApp.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/query/MyApp.java
index 30f019a79d..61f983c727 100644
--- a/libraries-data/src/main/java/com/baeldung/jdo/query/MyApp.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/query/MyApp.java
@@ -1,14 +1,13 @@
-package com.baeldung.jdo.query;
+package com.baeldung.libraries.jdo.query;
 
-import java.util.List;
+import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
+import org.datanucleus.metadata.PersistenceUnitMetaData;
 
 import javax.jdo.JDOQLTypedQuery;
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
 import javax.jdo.Query;
-
-import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
-import org.datanucleus.metadata.PersistenceUnitMetaData;
+import java.util.List;
 
 public class MyApp {
 
@@ -53,14 +52,14 @@ public class MyApp {
 
     public static void queryUsingJDOQL() {
 
-        Query query = pm.newQuery("SELECT FROM com.baeldung.jdo.query.ProductItem " + "WHERE price < threshold PARAMETERS double threshold");
+        Query query = pm.newQuery("SELECT FROM com.baeldung.libraries.jdo.query.ProductItem " + "WHERE price < threshold PARAMETERS double threshold");
         List<ProductItem> explicitParamResults = (List<ProductItem>) query.execute(10);
 
-        query = pm.newQuery("SELECT FROM " + "com.baeldung.jdo.query.ProductItem WHERE price < :threshold");
+        query = pm.newQuery("SELECT FROM " + "com.baeldung.libraries.jdo.query.ProductItem WHERE price < :threshold");
         query.setParameters("double threshold");
         List<ProductItem> explicitParamResults2 = (List<ProductItem>) query.execute(10);
 
-        query = pm.newQuery("SELECT FROM " + "com.baeldung.jdo.query.ProductItem WHERE price < :threshold");
+        query = pm.newQuery("SELECT FROM " + "com.baeldung.libraries.jdo.query.ProductItem WHERE price < :threshold");
         List<ProductItem> implicitParamResults = (List<ProductItem>) query.execute(10);
 
     }
@@ -83,7 +82,7 @@ public class MyApp {
     }
 
     public static void queryUsingJPQL() {
-        Query query = pm.newQuery("JPQL", "select i from " + "com.baeldung.jdo.query.ProductItem i where i.price < 10" + " and i.status = 'InStock'");
+        Query query = pm.newQuery("JPQL", "select i from " + "com.baeldung.libraries.jdo.query.ProductItem i where i.price < 10" + " and i.status = 'InStock'");
         List<ProductItem> results = (List<ProductItem>) query.execute();
 
     }
diff --git a/libraries-data/src/main/java/com/baeldung/jdo/query/ProductItem.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/query/ProductItem.java
similarity index 97%
rename from libraries-data/src/main/java/com/baeldung/jdo/query/ProductItem.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/query/ProductItem.java
index 25dd8bdb98..9cefeeb44f 100644
--- a/libraries-data/src/main/java/com/baeldung/jdo/query/ProductItem.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/query/ProductItem.java
@@ -1,4 +1,4 @@
-package com.baeldung.jdo.query;
+package com.baeldung.libraries.jdo.query;
 
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.PersistenceCapable;
diff --git a/libraries-data/src/main/java/com/baeldung/jdo/xml/AnnotadedPerson.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/AnnotadedPerson.java
similarity index 97%
rename from libraries-data/src/main/java/com/baeldung/jdo/xml/AnnotadedPerson.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/AnnotadedPerson.java
index 0673ff341c..0520bf1d09 100644
--- a/libraries-data/src/main/java/com/baeldung/jdo/xml/AnnotadedPerson.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/AnnotadedPerson.java
@@ -1,7 +1,4 @@
-package com.baeldung.jdo.xml;
-
-import java.util.ArrayList;
-import java.util.List;
+package com.baeldung.libraries.jdo.xml;
 
 import javax.jdo.annotations.Element;
 import javax.jdo.annotations.PersistenceCapable;
@@ -9,6 +6,8 @@ import javax.jdo.annotations.PrimaryKey;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
+import java.util.ArrayList;
+import java.util.List;
 
 @PersistenceCapable(schema = "/myproduct/people", table = "person")
 public class AnnotadedPerson {
diff --git a/libraries-data/src/main/java/com/baeldung/jdo/xml/MyApp.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/MyApp.java
similarity index 94%
rename from libraries-data/src/main/java/com/baeldung/jdo/xml/MyApp.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/MyApp.java
index b43b45f415..513481956d 100644
--- a/libraries-data/src/main/java/com/baeldung/jdo/xml/MyApp.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/MyApp.java
@@ -1,16 +1,11 @@
-package com.baeldung.jdo.xml;
-
-import java.util.List;
-
-import javax.jdo.JDOHelper;
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-import javax.jdo.Query;
-import javax.jdo.Transaction;
+package com.baeldung.libraries.jdo.xml;
 
 import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
 import org.datanucleus.metadata.PersistenceUnitMetaData;
 
+import javax.jdo.*;
+import java.util.List;
+
 public class MyApp {
 
     private static PersistenceUnitMetaData pumd;
diff --git a/libraries-data/src/main/java/com/baeldung/jdo/xml/Person.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/Person.java
similarity index 96%
rename from libraries-data/src/main/java/com/baeldung/jdo/xml/Person.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/Person.java
index 4fbc81ee03..0cc3dff316 100644
--- a/libraries-data/src/main/java/com/baeldung/jdo/xml/Person.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/Person.java
@@ -1,10 +1,9 @@
-package com.baeldung.jdo.xml;
-
-import java.util.ArrayList;
-import java.util.List;
+package com.baeldung.libraries.jdo.xml;
 
 import javax.jdo.annotations.PersistenceCapable;
 import javax.jdo.annotations.PrimaryKey;
+import java.util.ArrayList;
+import java.util.List;
 
 @PersistenceCapable
 public class Person {
diff --git a/libraries-data/src/main/java/com/baeldung/jdo/xml/Product.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/Product.java
similarity index 96%
rename from libraries-data/src/main/java/com/baeldung/jdo/xml/Product.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/Product.java
index 5aac05834d..04b81ea356 100644
--- a/libraries-data/src/main/java/com/baeldung/jdo/xml/Product.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/xml/Product.java
@@ -1,4 +1,4 @@
-package com.baeldung.jdo.xml;
+package com.baeldung.libraries.jdo.xml;
 
 import javax.jdo.annotations.PersistenceCapable;
 import javax.jdo.annotations.PrimaryKey;
diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/Address.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Address.java
similarity index 94%
rename from libraries-data/src/main/java/com/baeldung/ormlite/Address.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Address.java
index 747b0b0b12..d433eba13f 100644
--- a/libraries-data/src/main/java/com/baeldung/ormlite/Address.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Address.java
@@ -1,4 +1,4 @@
-package com.baeldung.ormlite;
+package com.baeldung.libraries.ormlite;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/Book.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Book.java
similarity index 95%
rename from libraries-data/src/main/java/com/baeldung/ormlite/Book.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Book.java
index ed7b813b8d..b55390058b 100644
--- a/libraries-data/src/main/java/com/baeldung/ormlite/Book.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Book.java
@@ -1,4 +1,4 @@
-package com.baeldung.ormlite;
+package com.baeldung.libraries.ormlite;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/Library.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Library.java
similarity index 96%
rename from libraries-data/src/main/java/com/baeldung/ormlite/Library.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Library.java
index 994b4c6575..c7d0d91b46 100644
--- a/libraries-data/src/main/java/com/baeldung/ormlite/Library.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/Library.java
@@ -1,4 +1,4 @@
-package com.baeldung.ormlite;
+package com.baeldung.libraries.ormlite;
 
 import com.j256.ormlite.dao.ForeignCollection;
 import com.j256.ormlite.field.DatabaseField;
diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDao.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/LibraryDao.java
similarity index 84%
rename from libraries-data/src/main/java/com/baeldung/ormlite/LibraryDao.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/LibraryDao.java
index fd8f5f40d6..12cefe0358 100644
--- a/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDao.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/LibraryDao.java
@@ -1,10 +1,10 @@
-package com.baeldung.ormlite;
+package com.baeldung.libraries.ormlite;
+
+import com.j256.ormlite.dao.Dao;
 
 import java.sql.SQLException;
 import java.util.List;
 
-import com.j256.ormlite.dao.Dao;
-
 public interface LibraryDao extends Dao<Library, Long> {
     public List<Library> findByName(String name) throws SQLException;
 }
diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDaoImpl.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/LibraryDaoImpl.java
similarity index 92%
rename from libraries-data/src/main/java/com/baeldung/ormlite/LibraryDaoImpl.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/LibraryDaoImpl.java
index af313101e2..fe43bf85c1 100644
--- a/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDaoImpl.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ormlite/LibraryDaoImpl.java
@@ -1,11 +1,11 @@
-package com.baeldung.ormlite;
-
-import java.sql.SQLException;
-import java.util.List;
+package com.baeldung.libraries.ormlite;
 
 import com.j256.ormlite.dao.BaseDaoImpl;
 import com.j256.ormlite.support.ConnectionSource;
 
+import java.sql.SQLException;
+import java.util.List;
+
 public class LibraryDaoImpl extends BaseDaoImpl<Library, Long> implements LibraryDao {
 
     public LibraryDaoImpl(ConnectionSource connectionSource) throws SQLException {
diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/Department.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/Department.java
similarity index 90%
rename from libraries-data/src/main/java/com/baeldung/reladomo/Department.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/Department.java
index d26ddafbf4..bc57fa6000 100644
--- a/libraries-data/src/main/java/com/baeldung/reladomo/Department.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/Department.java
@@ -1,4 +1,4 @@
-package com.baeldung.reladomo;
+package com.baeldung.libraries.reladomo;
 
 public class Department extends DepartmentAbstract {
     public Department() {
diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/DepartmentDatabaseObject.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/DepartmentDatabaseObject.java
similarity index 66%
rename from libraries-data/src/main/java/com/baeldung/reladomo/DepartmentDatabaseObject.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/DepartmentDatabaseObject.java
index 4cfb5cb055..23bd584914 100644
--- a/libraries-data/src/main/java/com/baeldung/reladomo/DepartmentDatabaseObject.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/DepartmentDatabaseObject.java
@@ -1,4 +1,4 @@
-package com.baeldung.reladomo;
+package com.baeldung.libraries.reladomo;
 public class DepartmentDatabaseObject extends DepartmentDatabaseObjectAbstract
 {
 }
diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/DepartmentList.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/DepartmentList.java
similarity index 82%
rename from libraries-data/src/main/java/com/baeldung/reladomo/DepartmentList.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/DepartmentList.java
index edad6bc1f4..278a840553 100644
--- a/libraries-data/src/main/java/com/baeldung/reladomo/DepartmentList.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/DepartmentList.java
@@ -1,6 +1,9 @@
-package com.baeldung.reladomo;
+package com.baeldung.libraries.reladomo;
+
 import com.gs.fw.finder.Operation;
-import java.util.*;
+
+import java.util.Collection;
+
 public class DepartmentList extends DepartmentListAbstract
 {
 	public DepartmentList()
diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/Employee.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/Employee.java
similarity index 89%
rename from libraries-data/src/main/java/com/baeldung/reladomo/Employee.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/Employee.java
index 519e841282..023dc4a3c7 100644
--- a/libraries-data/src/main/java/com/baeldung/reladomo/Employee.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/Employee.java
@@ -1,4 +1,4 @@
-package com.baeldung.reladomo;
+package com.baeldung.libraries.reladomo;
 public class Employee extends EmployeeAbstract
 {
 	public Employee()
diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/EmployeeDatabaseObject.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/EmployeeDatabaseObject.java
similarity index 65%
rename from libraries-data/src/main/java/com/baeldung/reladomo/EmployeeDatabaseObject.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/EmployeeDatabaseObject.java
index 407049f342..e0faced1c6 100644
--- a/libraries-data/src/main/java/com/baeldung/reladomo/EmployeeDatabaseObject.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/EmployeeDatabaseObject.java
@@ -1,4 +1,4 @@
-package com.baeldung.reladomo;
+package com.baeldung.libraries.reladomo;
 public class EmployeeDatabaseObject extends EmployeeDatabaseObjectAbstract
 {
 }
diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/EmployeeList.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/EmployeeList.java
similarity index 81%
rename from libraries-data/src/main/java/com/baeldung/reladomo/EmployeeList.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/EmployeeList.java
index 4e759898c3..192356f4c9 100644
--- a/libraries-data/src/main/java/com/baeldung/reladomo/EmployeeList.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/EmployeeList.java
@@ -1,6 +1,9 @@
-package com.baeldung.reladomo;
+package com.baeldung.libraries.reladomo;
+
 import com.gs.fw.finder.Operation;
-import java.util.*;
+
+import java.util.Collection;
+
 public class EmployeeList extends EmployeeListAbstract
 {
 	public EmployeeList()
diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/ReladomoApplication.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/ReladomoApplication.java
similarity index 95%
rename from libraries-data/src/main/java/com/baeldung/reladomo/ReladomoApplication.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/ReladomoApplication.java
index c6b242d3ae..1ccae8c59d 100644
--- a/libraries-data/src/main/java/com/baeldung/reladomo/ReladomoApplication.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/ReladomoApplication.java
@@ -1,13 +1,10 @@
-package com.baeldung.reladomo;
-
-import java.io.InputStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+package com.baeldung.libraries.reladomo;
 
 import com.gs.fw.common.mithra.MithraManager;
 import com.gs.fw.common.mithra.MithraManagerProvider;
 
+import java.io.InputStream;
+
 public class ReladomoApplication {
 
     public static void main(String[] args) {
diff --git a/libraries-data/src/main/java/com/baeldung/reladomo/ReladomoConnectionManager.java b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/ReladomoConnectionManager.java
similarity index 98%
rename from libraries-data/src/main/java/com/baeldung/reladomo/ReladomoConnectionManager.java
rename to libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/ReladomoConnectionManager.java
index 66a8f9ff99..15f6ec5601 100644
--- a/libraries-data/src/main/java/com/baeldung/reladomo/ReladomoConnectionManager.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/reladomo/ReladomoConnectionManager.java
@@ -1,4 +1,12 @@
-package com.baeldung.reladomo;
+package com.baeldung.libraries.reladomo;
+
+import com.gs.fw.common.mithra.bulkloader.BulkLoader;
+import com.gs.fw.common.mithra.bulkloader.BulkLoaderException;
+import com.gs.fw.common.mithra.connectionmanager.SourcelessConnectionManager;
+import com.gs.fw.common.mithra.connectionmanager.XAConnectionManager;
+import com.gs.fw.common.mithra.databasetype.DatabaseType;
+import com.gs.fw.common.mithra.databasetype.H2DatabaseType;
+import org.h2.tools.RunScript;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -9,15 +17,6 @@ import java.sql.SQLException;
 import java.util.TimeZone;
 import java.util.stream.Stream;
 
-import org.h2.tools.RunScript;
-
-import com.gs.fw.common.mithra.bulkloader.BulkLoader;
-import com.gs.fw.common.mithra.bulkloader.BulkLoaderException;
-import com.gs.fw.common.mithra.connectionmanager.SourcelessConnectionManager;
-import com.gs.fw.common.mithra.connectionmanager.XAConnectionManager;
-import com.gs.fw.common.mithra.databasetype.DatabaseType;
-import com.gs.fw.common.mithra.databasetype.H2DatabaseType;
-
 public class ReladomoConnectionManager implements SourcelessConnectionManager {
 
     private static ReladomoConnectionManager instance;
diff --git a/libraries-data/src/main/resources/META-INF/BenchmarkList b/libraries-data-db/src/main/resources/META-INF/BenchmarkList
similarity index 100%
rename from libraries-data/src/main/resources/META-INF/BenchmarkList
rename to libraries-data-db/src/main/resources/META-INF/BenchmarkList
diff --git a/libraries-data/src/main/resources/META-INF/datanucleus.properties b/libraries-data-db/src/main/resources/META-INF/datanucleus.properties
similarity index 100%
rename from libraries-data/src/main/resources/META-INF/datanucleus.properties
rename to libraries-data-db/src/main/resources/META-INF/datanucleus.properties
diff --git a/libraries-data/src/main/resources/META-INF/jdoconfig.xml b/libraries-data-db/src/main/resources/META-INF/jdoconfig.xml
similarity index 100%
rename from libraries-data/src/main/resources/META-INF/jdoconfig.xml
rename to libraries-data-db/src/main/resources/META-INF/jdoconfig.xml
diff --git a/libraries-data/src/main/resources/META-INF/package.jdo b/libraries-data-db/src/main/resources/META-INF/package.jdo
similarity index 91%
rename from libraries-data/src/main/resources/META-INF/package.jdo
rename to libraries-data-db/src/main/resources/META-INF/package.jdo
index 7f85bbbd58..afe505401b 100644
--- a/libraries-data/src/main/resources/META-INF/package.jdo
+++ b/libraries-data-db/src/main/resources/META-INF/package.jdo
@@ -1,7 +1,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo http://xmlns.jcp.org/xml/ns/jdo/jdo_3_1.xsd"
     version="3.1">
-    <package name="com.baeldung.jdo.xml">
+    <package name="com.baeldung.libraries.jdo.xml">
         <class name="Person" detachable="true" schema="/myproduct/people"
             table="person">
             <field name="personNum">
@@ -16,7 +16,7 @@
             </field>
         </class>
     </package>
-    <package name="com.baeldung.jdo.query">
+    <package name="com.baeldung.libraries.jdo.query">
         <class name="ProductItem" detachable="true" table="product_item">
  
             <query name="PriceBelow10" language="javax.jdo.query.SQL">
diff --git a/libraries-data/src/main/resources/db.sql b/libraries-data-db/src/main/resources/db.sql
similarity index 100%
rename from libraries-data/src/main/resources/db.sql
rename to libraries-data-db/src/main/resources/db.sql
diff --git a/libraries-data-db/src/main/resources/ebean.mf b/libraries-data-db/src/main/resources/ebean.mf
new file mode 100644
index 0000000000..c3484f8f57
--- /dev/null
+++ b/libraries-data-db/src/main/resources/ebean.mf
@@ -0,0 +1,3 @@
+entity-packages: com.baeldung.libraries.ebean.model
+transactional-packages: com.baeldung.libraries.ebean.app
+querybean-packages: com.baeldung.libraries.ebean.app
diff --git a/libraries-data/src/main/resources/ebean.properties b/libraries-data-db/src/main/resources/ebean.properties
similarity index 100%
rename from libraries-data/src/main/resources/ebean.properties
rename to libraries-data-db/src/main/resources/ebean.properties
diff --git a/libraries-data-db/src/main/resources/logback.xml b/libraries-data-db/src/main/resources/logback.xml
new file mode 100644
index 0000000000..3d2ec51566
--- /dev/null
+++ b/libraries-data-db/src/main/resources/logback.xml
@@ -0,0 +1,15 @@
+<?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>
+    <logger name="io.ebean.DDL" level="TRACE"/>
+    <logger name="io.ebean.SQL" level="TRACE"/>
+    <logger name="io.ebean.TXN" level="TRACE"/>
+    <root level="WARN">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/libraries-data/src/main/resources/reladomo/Department.xml b/libraries-data-db/src/main/resources/reladomo/Department.xml
similarity index 89%
rename from libraries-data/src/main/resources/reladomo/Department.xml
rename to libraries-data-db/src/main/resources/reladomo/Department.xml
index a284965cd6..2392ff74ec 100644
--- a/libraries-data/src/main/resources/reladomo/Department.xml
+++ b/libraries-data-db/src/main/resources/reladomo/Department.xml
@@ -1,5 +1,5 @@
 <MithraObject objectType="transactional">
-    <PackageName>com.baeldung.reladomo</PackageName>
+    <PackageName>com.baeldung.libraries.reladomo</PackageName>
     <ClassName>Department</ClassName>
     <DefaultTable>departments</DefaultTable>
 
diff --git a/libraries-data/src/main/resources/reladomo/Employee.xml b/libraries-data-db/src/main/resources/reladomo/Employee.xml
similarity index 86%
rename from libraries-data/src/main/resources/reladomo/Employee.xml
rename to libraries-data-db/src/main/resources/reladomo/Employee.xml
index 00e360bc67..676cd5d1d1 100644
--- a/libraries-data/src/main/resources/reladomo/Employee.xml
+++ b/libraries-data-db/src/main/resources/reladomo/Employee.xml
@@ -1,5 +1,5 @@
 <MithraObject objectType="transactional">
-    <PackageName>com.baeldung.reladomo</PackageName>
+    <PackageName>com.baeldung.libraries.reladomo</PackageName>
     <ClassName>Employee</ClassName>
     <DefaultTable>employees</DefaultTable>
 
diff --git a/libraries-data/src/main/resources/reladomo/ReladomoClassList.xml b/libraries-data-db/src/main/resources/reladomo/ReladomoClassList.xml
similarity index 100%
rename from libraries-data/src/main/resources/reladomo/ReladomoClassList.xml
rename to libraries-data-db/src/main/resources/reladomo/ReladomoClassList.xml
diff --git a/libraries-data-db/src/main/resources/reladomo/ReladomoRuntimeConfig.xml b/libraries-data-db/src/main/resources/reladomo/ReladomoRuntimeConfig.xml
new file mode 100644
index 0000000000..e4800e31f8
--- /dev/null
+++ b/libraries-data-db/src/main/resources/reladomo/ReladomoRuntimeConfig.xml
@@ -0,0 +1,6 @@
+<MithraRuntime>
+   <ConnectionManager className="com.baeldung.libraries.reladomo.ReladomoConnectionManager ">
+           <MithraObjectConfiguration className="com.baeldung.libraries.reladomo.Department" cacheType="partial"/>
+           <MithraObjectConfiguration className="com.baeldung.libraries.reladomo.Employee " cacheType="partial"/>
+    </ConnectionManager>
+</MithraRuntime>
\ No newline at end of file
diff --git a/libraries-data/src/test/java/com/baeldung/hikaricp/HikariCPIntegrationTest.java b/libraries-data-db/src/test/java/com/baeldung/libraries/hikaricp/HikariCPIntegrationTest.java
similarity index 88%
rename from libraries-data/src/test/java/com/baeldung/hikaricp/HikariCPIntegrationTest.java
rename to libraries-data-db/src/test/java/com/baeldung/libraries/hikaricp/HikariCPIntegrationTest.java
index 80588ecc03..fe5bd85736 100644
--- a/libraries-data/src/test/java/com/baeldung/hikaricp/HikariCPIntegrationTest.java
+++ b/libraries-data-db/src/test/java/com/baeldung/libraries/hikaricp/HikariCPIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.hikaricp;
+package com.baeldung.libraries.hikaricp;
 
 import org.junit.Test;
 
diff --git a/libraries-data/src/test/java/com/baeldung/jdo/GuideToJDOIntegrationTest.java b/libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java
similarity index 96%
rename from libraries-data/src/test/java/com/baeldung/jdo/GuideToJDOIntegrationTest.java
rename to libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java
index e8c69d67b7..1c15a4f087 100644
--- a/libraries-data/src/test/java/com/baeldung/jdo/GuideToJDOIntegrationTest.java
+++ b/libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java
@@ -1,24 +1,23 @@
-package com.baeldung.jdo;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.util.List;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-import javax.jdo.Query;
-import javax.jdo.Transaction;
+package com.baeldung.libraries.jdo;
 
 import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
 import org.datanucleus.metadata.PersistenceUnitMetaData;
 import org.junit.Test;
 
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+import javax.jdo.Query;
+import javax.jdo.Transaction;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 public class GuideToJDOIntegrationTest {
     @Test
     public void givenProduct_WhenNewThenPerformTransaction() {
         PersistenceUnitMetaData pumd = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null);
-        pumd.addClassName("com.baeldung.jdo.Product");
+        pumd.addClassName("com.baeldung.libraries.jdo.Product");
         pumd.setExcludeUnlistedClasses();
         pumd.addProperty("javax.jdo.option.ConnectionDriverName", "org.h2.Driver");
         pumd.addProperty("javax.jdo.option.ConnectionURL", "jdbc:h2:mem:mypersistence");
@@ -53,7 +52,7 @@ public class GuideToJDOIntegrationTest {
     @Test
     public void givenProduct_WhenQueryThenExist() {
         PersistenceUnitMetaData pumd = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null);
-        pumd.addClassName("com.baeldung.jdo.Product");
+        pumd.addClassName("com.baeldung.libraries.jdo.Product");
         pumd.setExcludeUnlistedClasses();
         pumd.addProperty("javax.jdo.option.ConnectionDriverName", "org.h2.Driver");
         pumd.addProperty("javax.jdo.option.ConnectionURL", "jdbc:h2:mem:mypersistence");
diff --git a/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteIntegrationTest.java b/libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java
similarity index 99%
rename from libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteIntegrationTest.java
rename to libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java
index 5a713902b4..139e52632a 100644
--- a/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteIntegrationTest.java
+++ b/libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java
@@ -1,20 +1,20 @@
-package com.baeldung.ormlite;
+package com.baeldung.libraries.ormlite;
 
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.List;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
 import com.j256.ormlite.dao.CloseableWrappedIterable;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.jdbc.JdbcPooledConnectionSource;
 import com.j256.ormlite.table.TableUtils;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.List;
+
+import static org.junit.Assert.*;
 
 public class ORMLiteIntegrationTest {
     private static JdbcPooledConnectionSource connectionSource;
diff --git a/libraries-data/src/test/java/com/baeldung/reladomo/ReladomoIntegrationTest.java b/libraries-data-db/src/test/java/com/baeldung/libraries/reladomo/ReladomoIntegrationTest.java
similarity index 96%
rename from libraries-data/src/test/java/com/baeldung/reladomo/ReladomoIntegrationTest.java
rename to libraries-data-db/src/test/java/com/baeldung/libraries/reladomo/ReladomoIntegrationTest.java
index 3660d9a8e1..b2abb587a9 100644
--- a/libraries-data/src/test/java/com/baeldung/reladomo/ReladomoIntegrationTest.java
+++ b/libraries-data-db/src/test/java/com/baeldung/libraries/reladomo/ReladomoIntegrationTest.java
@@ -1,13 +1,12 @@
-package com.baeldung.reladomo;
-
-import static org.junit.Assert.*;
+package com.baeldung.libraries.reladomo;
 
+import com.gs.fw.common.mithra.test.ConnectionManagerForTests;
+import com.gs.fw.common.mithra.test.MithraTestResource;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.gs.fw.common.mithra.test.ConnectionManagerForTests;
-import com.gs.fw.common.mithra.test.MithraTestResource;
+import static org.junit.Assert.*;
 
 public class ReladomoIntegrationTest {
     private MithraTestResource mithraTestResource;
diff --git a/libraries-data-db/src/test/resources/reladomo/ReladomoTestConfig.xml b/libraries-data-db/src/test/resources/reladomo/ReladomoTestConfig.xml
new file mode 100644
index 0000000000..4e1b791efc
--- /dev/null
+++ b/libraries-data-db/src/test/resources/reladomo/ReladomoTestConfig.xml
@@ -0,0 +1,7 @@
+ <MithraRuntime>
+    <ConnectionManager className="com.gs.fw.common.mithra.test.ConnectionManagerForTests">
+        <Property name="resourceName" value="testDb"/>
+        <MithraObjectConfiguration className="com.baeldung.libraries.reladomo.Department" cacheType="partial"/>
+        <MithraObjectConfiguration className="com.baeldung.libraries.reladomo.Employee" cacheType="partial"/>
+    </ConnectionManager>
+ </MithraRuntime>
\ No newline at end of file
diff --git a/libraries-data-db/src/test/resources/reladomo/test-data.txt b/libraries-data-db/src/test/resources/reladomo/test-data.txt
new file mode 100644
index 0000000000..0e8a36a0b2
--- /dev/null
+++ b/libraries-data-db/src/test/resources/reladomo/test-data.txt
@@ -0,0 +1,7 @@
+class com.baeldung.libraries.reladomo.Department
+id, name
+1, "Marketing"
+
+class com.baeldung.libraries.reladomo.Employee
+id, name
+1, "Paul"
\ No newline at end of file
diff --git a/libraries-data-io/README.md b/libraries-data-io/README.md
new file mode 100644
index 0000000000..550f353c97
--- /dev/null
+++ b/libraries-data-io/README.md
@@ -0,0 +1,11 @@
+## IO Data Libraries
+
+This module contains articles about IO data processing libraries.
+
+### Relevant articles
+- [Introduction To Kryo](https://www.baeldung.com/kryo)
+- [Parsing YAML with SnakeYAML](https://www.baeldung.com/java-snake-yaml)
+- [Introduction to Smooks](https://www.baeldung.com/smooks)
+- [Introduction To OpenCSV](https://www.baeldung.com/opencsv)
+- [Interact with Google Sheets from Java](https://www.baeldung.com/google-sheets-java-client)
+- [Introduction To Docx4J](https://www.baeldung.com/docx4j)
diff --git a/libraries-data-io/pom.xml b/libraries-data-io/pom.xml
new file mode 100644
index 0000000000..0e3029f565
--- /dev/null
+++ b/libraries-data-io/pom.xml
@@ -0,0 +1,82 @@
+<?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-io</artifactId>
+    <name>libraries-data-io</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.esotericsoftware</groupId>
+            <artifactId>kryo</artifactId>
+            <version>${kryo.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>${snakeyaml.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.milyn</groupId>
+            <artifactId>milyn-smooks-all</artifactId>
+            <version>${smooks.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.opencsv/opencsv -->
+        <dependency>
+            <groupId>com.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
+            <version>${opencsv.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>
+        <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>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${org.assertj.core.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <snakeyaml.version>1.21</snakeyaml.version>
+        <kryo.version>4.0.1</kryo.version>
+        <smooks.version>1.7.0</smooks.version>
+        <opencsv.version>4.1</opencsv.version>
+        <google-api.version>1.23.0</google-api.version>
+        <google-sheets.version>v4-rev493-1.21.0</google-sheets.version>
+        <org.assertj.core.version>3.9.0</org.assertj.core.version>
+        <docx4j.version>3.3.5</docx4j.version>
+        <jaxb-api.version>2.1</jaxb-api.version>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/libraries-data-2/src/main/java/com/baeldung/docx/Docx4jExample.java b/libraries-data-io/src/main/java/com/baeldung/libraries/docx/Docx4jExample.java
similarity index 91%
rename from libraries-data-2/src/main/java/com/baeldung/docx/Docx4jExample.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/docx/Docx4jExample.java
index 6fe29d26e3..5000f63020 100644
--- a/libraries-data-2/src/main/java/com/baeldung/docx/Docx4jExample.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/docx/Docx4jExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.docx;
+package com.baeldung.libraries.docx;
 
 import org.docx4j.dml.wordprocessingDrawing.Inline;
 import org.docx4j.jaxb.Context;
@@ -7,17 +7,7 @@ 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 org.docx4j.wml.*;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
diff --git a/libraries-data/src/main/java/com/baeldung/kryo/ComplexClass.java b/libraries-data-io/src/main/java/com/baeldung/libraries/kryo/ComplexClass.java
similarity index 89%
rename from libraries-data/src/main/java/com/baeldung/kryo/ComplexClass.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/kryo/ComplexClass.java
index 0e125e48a9..85355881f1 100644
--- a/libraries-data/src/main/java/com/baeldung/kryo/ComplexClass.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/kryo/ComplexClass.java
@@ -1,4 +1,4 @@
-package com.baeldung.kryo;
+package com.baeldung.libraries.kryo;
 
 import java.io.Serializable;
 
diff --git a/libraries-data/src/main/java/com/baeldung/kryo/Person.java b/libraries-data-io/src/main/java/com/baeldung/libraries/kryo/Person.java
similarity index 97%
rename from libraries-data/src/main/java/com/baeldung/kryo/Person.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/kryo/Person.java
index f9be5cfd62..1dbe0648ba 100644
--- a/libraries-data/src/main/java/com/baeldung/kryo/Person.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/kryo/Person.java
@@ -1,10 +1,11 @@
-package com.baeldung.kryo;
+package com.baeldung.libraries.kryo;
 
 import com.esotericsoftware.kryo.DefaultSerializer;
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.KryoSerializable;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
+
 import java.util.Date;
 
 @DefaultSerializer(PersonSerializer.class)
diff --git a/libraries-data/src/main/java/com/baeldung/kryo/PersonSerializer.java b/libraries-data-io/src/main/java/com/baeldung/libraries/kryo/PersonSerializer.java
similarity index 95%
rename from libraries-data/src/main/java/com/baeldung/kryo/PersonSerializer.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/kryo/PersonSerializer.java
index f5d01509a6..20a061f4e8 100644
--- a/libraries-data/src/main/java/com/baeldung/kryo/PersonSerializer.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/kryo/PersonSerializer.java
@@ -1,9 +1,10 @@
-package com.baeldung.kryo;
+package com.baeldung.libraries.kryo;
 
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.Serializer;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
+
 import java.util.Date;
 
 public class PersonSerializer extends Serializer<Person> {
diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/Application.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/Application.java
similarity index 86%
rename from libraries-data-2/src/main/java/com/baeldung/opencsv/Application.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/Application.java
index fd7e4d82d4..ee819b844b 100644
--- a/libraries-data-2/src/main/java/com/baeldung/opencsv/Application.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/Application.java
@@ -1,11 +1,11 @@
-package com.baeldung.opencsv;
+package com.baeldung.libraries.opencsv;
 
-import com.baeldung.opencsv.beans.NamedColumnBean;
-import com.baeldung.opencsv.beans.SimplePositionBean;
-import com.baeldung.opencsv.examples.sync.BeanExamples;
-import com.baeldung.opencsv.examples.sync.CsvReaderExamples;
-import com.baeldung.opencsv.examples.sync.CsvWriterExamples;
-import com.baeldung.opencsv.helpers.Helpers;
+import com.baeldung.libraries.opencsv.beans.NamedColumnBean;
+import com.baeldung.libraries.opencsv.beans.SimplePositionBean;
+import com.baeldung.libraries.opencsv.examples.sync.BeanExamples;
+import com.baeldung.libraries.opencsv.examples.sync.CsvReaderExamples;
+import com.baeldung.libraries.opencsv.examples.sync.CsvWriterExamples;
+import com.baeldung.libraries.opencsv.helpers.Helpers;
 
 import java.io.Reader;
 import java.nio.file.Files;
diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/Constants.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/Constants.java
similarity index 93%
rename from libraries-data-2/src/main/java/com/baeldung/opencsv/Constants.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/Constants.java
index f7978acf24..f1b3b71939 100644
--- a/libraries-data-2/src/main/java/com/baeldung/opencsv/Constants.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/Constants.java
@@ -1,4 +1,4 @@
-package com.baeldung.opencsv;
+package com.baeldung.libraries.opencsv;
 
 public class Constants {
 
diff --git a/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/CsvBean.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/CsvBean.java
new file mode 100644
index 0000000000..e0abab7129
--- /dev/null
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/CsvBean.java
@@ -0,0 +1,3 @@
+package com.baeldung.libraries.opencsv.beans;
+
+public class CsvBean { }
diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/NamedColumnBean.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/NamedColumnBean.java
similarity index 91%
rename from libraries-data-2/src/main/java/com/baeldung/opencsv/beans/NamedColumnBean.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/NamedColumnBean.java
index d9e5f96333..0021584e4f 100644
--- a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/NamedColumnBean.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/NamedColumnBean.java
@@ -1,4 +1,4 @@
-package com.baeldung.opencsv.beans;
+package com.baeldung.libraries.opencsv.beans;
 
 import com.opencsv.bean.CsvBindByName;
 
diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/SimplePositionBean.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/SimplePositionBean.java
similarity index 93%
rename from libraries-data-2/src/main/java/com/baeldung/opencsv/beans/SimplePositionBean.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/SimplePositionBean.java
index 799006e2f9..c1710d784a 100644
--- a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/SimplePositionBean.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/SimplePositionBean.java
@@ -1,4 +1,4 @@
-package com.baeldung.opencsv.beans;
+package com.baeldung.libraries.opencsv.beans;
 
 import com.opencsv.bean.CsvBindByPosition;
 
diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/WriteExampleBean.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/WriteExampleBean.java
similarity index 93%
rename from libraries-data-2/src/main/java/com/baeldung/opencsv/beans/WriteExampleBean.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/WriteExampleBean.java
index f145f67f11..f5e6466512 100644
--- a/libraries-data-2/src/main/java/com/baeldung/opencsv/beans/WriteExampleBean.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/beans/WriteExampleBean.java
@@ -1,4 +1,4 @@
-package com.baeldung.opencsv.beans;
+package com.baeldung.libraries.opencsv.beans;
 
 public class WriteExampleBean extends CsvBean {
 
diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/BeanExamples.java
similarity index 85%
rename from libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/BeanExamples.java
index 086f32677e..f401c7c77c 100644
--- a/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/BeanExamples.java
@@ -1,9 +1,9 @@
-package com.baeldung.opencsv.examples.sync;
+package com.baeldung.libraries.opencsv.examples.sync;
 
-import com.baeldung.opencsv.beans.CsvBean;
-import com.baeldung.opencsv.beans.WriteExampleBean;
-import com.baeldung.opencsv.helpers.Helpers;
-import com.baeldung.opencsv.pojos.CsvTransfer;
+import com.baeldung.libraries.opencsv.beans.CsvBean;
+import com.baeldung.libraries.opencsv.beans.WriteExampleBean;
+import com.baeldung.libraries.opencsv.helpers.Helpers;
+import com.baeldung.libraries.opencsv.pojos.CsvTransfer;
 import com.opencsv.CSVWriter;
 import com.opencsv.bean.*;
 
diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvReaderExamples.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/CsvReaderExamples.java
similarity index 93%
rename from libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvReaderExamples.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/CsvReaderExamples.java
index bacfdcff3d..2f7d979b2f 100644
--- a/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvReaderExamples.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/CsvReaderExamples.java
@@ -1,6 +1,6 @@
-package com.baeldung.opencsv.examples.sync;
+package com.baeldung.libraries.opencsv.examples.sync;
 
-import com.baeldung.opencsv.helpers.Helpers;
+import com.baeldung.libraries.opencsv.helpers.Helpers;
 import com.opencsv.CSVParser;
 import com.opencsv.CSVParserBuilder;
 import com.opencsv.CSVReader;
diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvWriterExamples.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/CsvWriterExamples.java
similarity index 89%
rename from libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvWriterExamples.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/CsvWriterExamples.java
index 6f52160ba8..b5c23bd99d 100644
--- a/libraries-data-2/src/main/java/com/baeldung/opencsv/examples/sync/CsvWriterExamples.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/examples/sync/CsvWriterExamples.java
@@ -1,6 +1,6 @@
-package com.baeldung.opencsv.examples.sync;
+package com.baeldung.libraries.opencsv.examples.sync;
 
-import com.baeldung.opencsv.helpers.Helpers;
+import com.baeldung.libraries.opencsv.helpers.Helpers;
 import com.opencsv.CSVWriter;
 
 import java.io.FileWriter;
diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/helpers/Helpers.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/helpers/Helpers.java
similarity index 96%
rename from libraries-data-2/src/main/java/com/baeldung/opencsv/helpers/Helpers.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/helpers/Helpers.java
index 9a46fbc495..b703d0e82d 100644
--- a/libraries-data-2/src/main/java/com/baeldung/opencsv/helpers/Helpers.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/helpers/Helpers.java
@@ -1,6 +1,6 @@
-package com.baeldung.opencsv.helpers;
+package com.baeldung.libraries.opencsv.helpers;
 
-import com.baeldung.opencsv.Constants;
+import com.baeldung.libraries.opencsv.Constants;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
diff --git a/libraries-data-2/src/main/java/com/baeldung/opencsv/pojos/CsvTransfer.java b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/pojos/CsvTransfer.java
similarity index 89%
rename from libraries-data-2/src/main/java/com/baeldung/opencsv/pojos/CsvTransfer.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/pojos/CsvTransfer.java
index 79366e3d20..7572bf2e92 100644
--- a/libraries-data-2/src/main/java/com/baeldung/opencsv/pojos/CsvTransfer.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/opencsv/pojos/CsvTransfer.java
@@ -1,6 +1,6 @@
-package com.baeldung.opencsv.pojos;
+package com.baeldung.libraries.opencsv.pojos;
 
-import com.baeldung.opencsv.beans.CsvBean;
+import com.baeldung.libraries.opencsv.beans.CsvBean;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/libraries-data-2/src/main/java/com/baeldung/google/sheets/GoogleAuthorizeUtil.java b/libraries-data-io/src/main/java/com/baeldung/libraries/sheets/GoogleAuthorizeUtil.java
similarity index 97%
rename from libraries-data-2/src/main/java/com/baeldung/google/sheets/GoogleAuthorizeUtil.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/sheets/GoogleAuthorizeUtil.java
index 641fae42dd..ddc6569678 100644
--- a/libraries-data-2/src/main/java/com/baeldung/google/sheets/GoogleAuthorizeUtil.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/sheets/GoogleAuthorizeUtil.java
@@ -1,11 +1,4 @@
-package com.baeldung.google.sheets;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.security.GeneralSecurityException;
-import java.util.Arrays;
-import java.util.List;
+package com.baeldung.libraries.sheets;
 
 import com.google.api.client.auth.oauth2.Credential;
 import com.google.api.client.extensions.java6.auth.oauth2.AuthorizationCodeInstalledApp;
@@ -17,6 +10,13 @@ import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.client.util.store.MemoryDataStoreFactory;
 import com.google.api.services.sheets.v4.SheetsScopes;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.security.GeneralSecurityException;
+import java.util.Arrays;
+import java.util.List;
+
 public class GoogleAuthorizeUtil {
     public static Credential authorize() throws IOException, GeneralSecurityException {
         InputStream in = GoogleAuthorizeUtil.class.getResourceAsStream("/google-sheets-client-secret.json");
diff --git a/libraries-data-2/src/main/java/com/baeldung/google/sheets/SheetsServiceUtil.java b/libraries-data-io/src/main/java/com/baeldung/libraries/sheets/SheetsServiceUtil.java
similarity index 95%
rename from libraries-data-2/src/main/java/com/baeldung/google/sheets/SheetsServiceUtil.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/sheets/SheetsServiceUtil.java
index 8a78d50551..db7de9986f 100644
--- a/libraries-data-2/src/main/java/com/baeldung/google/sheets/SheetsServiceUtil.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/sheets/SheetsServiceUtil.java
@@ -1,13 +1,13 @@
-package com.baeldung.google.sheets;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
+package com.baeldung.libraries.sheets;
 
 import com.google.api.client.auth.oauth2.Credential;
 import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.sheets.v4.Sheets;
 
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
 public class SheetsServiceUtil {
 
     private static final String APPLICATION_NAME = "Google Sheets Example";
diff --git a/libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderConverter.java b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/converter/OrderConverter.java
similarity index 94%
rename from libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderConverter.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/smooks/converter/OrderConverter.java
index fa317f93b7..bca47cb75a 100644
--- a/libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderConverter.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/converter/OrderConverter.java
@@ -1,6 +1,6 @@
-package com.baeldung.smooks.converter;
+package com.baeldung.libraries.smooks.converter;
 
-import com.baeldung.smooks.model.Order;
+import com.baeldung.libraries.smooks.model.Order;
 import org.milyn.Smooks;
 import org.milyn.payload.JavaResult;
 import org.milyn.payload.StringResult;
diff --git a/libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderValidator.java b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/converter/OrderValidator.java
similarity index 94%
rename from libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderValidator.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/smooks/converter/OrderValidator.java
index 3975921da0..f36d3a6835 100644
--- a/libraries-data-2/src/main/java/com/baeldung/smooks/converter/OrderValidator.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/converter/OrderValidator.java
@@ -1,4 +1,4 @@
-package com.baeldung.smooks.converter;
+package com.baeldung.libraries.smooks.converter;
 
 import org.milyn.Smooks;
 import org.milyn.payload.JavaResult;
diff --git a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Item.java b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Item.java
similarity index 97%
rename from libraries-data-2/src/main/java/com/baeldung/smooks/model/Item.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Item.java
index 3e1f4a7ef4..3c6322a357 100644
--- a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Item.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Item.java
@@ -1,4 +1,4 @@
-package com.baeldung.smooks.model;
+package com.baeldung.libraries.smooks.model;
 
 public class Item {
 
diff --git a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Order.java b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Order.java
similarity index 95%
rename from libraries-data-2/src/main/java/com/baeldung/smooks/model/Order.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Order.java
index 047e1fe8a3..1900e6337f 100644
--- a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Order.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Order.java
@@ -1,4 +1,4 @@
-package com.baeldung.smooks.model;
+package com.baeldung.libraries.smooks.model;
 
 import java.util.Date;
 import java.util.List;
diff --git a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Status.java b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Status.java
similarity index 55%
rename from libraries-data-2/src/main/java/com/baeldung/smooks/model/Status.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Status.java
index 53c50bdf46..8f22a439b2 100644
--- a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Status.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Status.java
@@ -1,4 +1,4 @@
-package com.baeldung.smooks.model;
+package com.baeldung.libraries.smooks.model;
 
 public enum Status {
     NEW, IN_PROGRESS, FINISHED
diff --git a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Supplier.java b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Supplier.java
similarity index 96%
rename from libraries-data-2/src/main/java/com/baeldung/smooks/model/Supplier.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Supplier.java
index 827a0fc907..8dd70e83c8 100644
--- a/libraries-data-2/src/main/java/com/baeldung/smooks/model/Supplier.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/smooks/model/Supplier.java
@@ -1,4 +1,4 @@
-package com.baeldung.smooks.model;
+package com.baeldung.libraries.smooks.model;
 
 public class Supplier {
 
diff --git a/libraries-data-3/src/main/java/com/baeldung/snakeyaml/Address.java b/libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Address.java
similarity index 93%
rename from libraries-data-3/src/main/java/com/baeldung/snakeyaml/Address.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Address.java
index 83c327a4ed..c0216ddcd7 100644
--- a/libraries-data-3/src/main/java/com/baeldung/snakeyaml/Address.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Address.java
@@ -1,4 +1,4 @@
-package com.baeldung.snakeyaml;
+package com.baeldung.libraries.snakeyaml;
 
 public class Address {
     private String line;
diff --git a/libraries-data-3/src/main/java/com/baeldung/snakeyaml/Contact.java b/libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Contact.java
similarity index 89%
rename from libraries-data-3/src/main/java/com/baeldung/snakeyaml/Contact.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Contact.java
index a808747786..54695315bc 100644
--- a/libraries-data-3/src/main/java/com/baeldung/snakeyaml/Contact.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Contact.java
@@ -1,4 +1,4 @@
-package com.baeldung.snakeyaml;
+package com.baeldung.libraries.snakeyaml;
 
 public class Contact {
 
diff --git a/libraries-data-3/src/main/java/com/baeldung/snakeyaml/Customer.java b/libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Customer.java
similarity index 96%
rename from libraries-data-3/src/main/java/com/baeldung/snakeyaml/Customer.java
rename to libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Customer.java
index c741f6dc85..9cebaf0005 100644
--- a/libraries-data-3/src/main/java/com/baeldung/snakeyaml/Customer.java
+++ b/libraries-data-io/src/main/java/com/baeldung/libraries/snakeyaml/Customer.java
@@ -1,4 +1,4 @@
-package com.baeldung.snakeyaml;
+package com.baeldung.libraries.snakeyaml;
 
 import java.util.List;
 
diff --git a/libraries-data-2/src/main/resources/google-sheets-client-secret.json b/libraries-data-io/src/main/resources/google-sheets-client-secret.json
similarity index 100%
rename from libraries-data-2/src/main/resources/google-sheets-client-secret.json
rename to libraries-data-io/src/main/resources/google-sheets-client-secret.json
diff --git a/libraries-data-2/src/main/resources/image.jpg b/libraries-data-io/src/main/resources/image.jpg
similarity index 100%
rename from libraries-data-2/src/main/resources/image.jpg
rename to libraries-data-io/src/main/resources/image.jpg
diff --git a/libraries-data-2/src/main/resources/smooks/email.ftl b/libraries-data-io/src/main/resources/smooks/email.ftl
similarity index 100%
rename from libraries-data-2/src/main/resources/smooks/email.ftl
rename to libraries-data-io/src/main/resources/smooks/email.ftl
diff --git a/libraries-data-2/src/main/resources/smooks/item-rules.csv b/libraries-data-io/src/main/resources/smooks/item-rules.csv
similarity index 100%
rename from libraries-data-2/src/main/resources/smooks/item-rules.csv
rename to libraries-data-io/src/main/resources/smooks/item-rules.csv
diff --git a/libraries-data-2/src/main/resources/smooks/order.ftl b/libraries-data-io/src/main/resources/smooks/order.ftl
similarity index 100%
rename from libraries-data-2/src/main/resources/smooks/order.ftl
rename to libraries-data-io/src/main/resources/smooks/order.ftl
diff --git a/libraries-data-2/src/main/resources/smooks/order.json b/libraries-data-io/src/main/resources/smooks/order.json
similarity index 100%
rename from libraries-data-2/src/main/resources/smooks/order.json
rename to libraries-data-io/src/main/resources/smooks/order.json
diff --git a/libraries-data-2/src/main/resources/smooks/order.xml b/libraries-data-io/src/main/resources/smooks/order.xml
similarity index 100%
rename from libraries-data-2/src/main/resources/smooks/order.xml
rename to libraries-data-io/src/main/resources/smooks/order.xml
diff --git a/libraries-data-2/src/main/resources/smooks/smooks-mapping.xml b/libraries-data-io/src/main/resources/smooks/smooks-mapping.xml
similarity index 78%
rename from libraries-data-2/src/main/resources/smooks/smooks-mapping.xml
rename to libraries-data-io/src/main/resources/smooks/smooks-mapping.xml
index 7996834e38..6587ff170e 100644
--- a/libraries-data-2/src/main/resources/smooks/smooks-mapping.xml
+++ b/libraries-data-io/src/main/resources/smooks/smooks-mapping.xml
@@ -2,7 +2,7 @@
 <smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
                       xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.2.xsd">
 
-    <jb:bean beanId="order" class="com.baeldung.smooks.model.Order" createOnElement="order">
+    <jb:bean beanId="order" class="com.baeldung.libraries.smooks.model.Order" createOnElement="order">
         <jb:value property="number" data="order/order-number" />
         <jb:value property="status" data="order/order-status" />
         <jb:value property="creationDate" data="order/@creation-date"  decoder="Date">
@@ -12,7 +12,7 @@
         <jb:wiring property="items" beanIdRef="items" />
     </jb:bean>
 
-    <jb:bean beanId="supplier" class="com.baeldung.smooks.model.Supplier" createOnElement="supplier">
+    <jb:bean beanId="supplier" class="com.baeldung.libraries.smooks.model.Supplier" createOnElement="supplier">
         <jb:value property="name" data="name" />
         <jb:value property="phoneNumber" data="phone" />
     </jb:bean>
@@ -20,7 +20,7 @@
     <jb:bean beanId="items" class="java.util.ArrayList" createOnElement="order">
         <jb:wiring beanIdRef="item" />
     </jb:bean>
-    <jb:bean beanId="item" class="com.baeldung.smooks.model.Item" createOnElement="item">
+    <jb:bean beanId="item" class="com.baeldung.libraries.smooks.model.Item" createOnElement="item">
         <jb:value property="code"  data="item/code" />
         <jb:value property="price" decoder="Double" data="item/price" />
         <jb:value property="quantity" decoder="Integer" data="item/quantity" />
diff --git a/libraries-data-2/src/main/resources/smooks/smooks-transform-edi.xml b/libraries-data-io/src/main/resources/smooks/smooks-transform-edi.xml
similarity index 100%
rename from libraries-data-2/src/main/resources/smooks/smooks-transform-edi.xml
rename to libraries-data-io/src/main/resources/smooks/smooks-transform-edi.xml
diff --git a/libraries-data-2/src/main/resources/smooks/smooks-transform-email.xml b/libraries-data-io/src/main/resources/smooks/smooks-transform-email.xml
similarity index 100%
rename from libraries-data-2/src/main/resources/smooks/smooks-transform-email.xml
rename to libraries-data-io/src/main/resources/smooks/smooks-transform-email.xml
diff --git a/libraries-data-2/src/main/resources/smooks/smooks-validation.xml b/libraries-data-io/src/main/resources/smooks/smooks-validation.xml
similarity index 100%
rename from libraries-data-2/src/main/resources/smooks/smooks-validation.xml
rename to libraries-data-io/src/main/resources/smooks/smooks-validation.xml
diff --git a/libraries-data-2/src/main/resources/smooks/supplier.properties b/libraries-data-io/src/main/resources/smooks/supplier.properties
similarity index 100%
rename from libraries-data-2/src/main/resources/smooks/supplier.properties
rename to libraries-data-io/src/main/resources/smooks/supplier.properties
diff --git a/libraries-data-2/src/test/com/baeldung/docx/Docx4jReadAndWriteIntegrationTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/docx/Docx4jReadAndWriteIntegrationTest.java
similarity index 94%
rename from libraries-data-2/src/test/com/baeldung/docx/Docx4jReadAndWriteIntegrationTest.java
rename to libraries-data-io/src/test/java/com/baeldung/libraries/docx/Docx4jReadAndWriteIntegrationTest.java
index 9a2691d3f0..231ee4e097 100644
--- a/libraries-data-2/src/test/com/baeldung/docx/Docx4jReadAndWriteIntegrationTest.java
+++ b/libraries-data-io/src/test/java/com/baeldung/libraries/docx/Docx4jReadAndWriteIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.docx;
+package com.baeldung.libraries.docx;
 
 import org.junit.Test;
 
diff --git a/libraries-data/src/test/java/com/baeldung/kryo/KryoUnitTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/kryo/KryoUnitTest.java
similarity index 94%
rename from libraries-data/src/test/java/com/baeldung/kryo/KryoUnitTest.java
rename to libraries-data-io/src/test/java/com/baeldung/libraries/kryo/KryoUnitTest.java
index c124ca618d..0b15f178b6 100644
--- a/libraries-data/src/test/java/com/baeldung/kryo/KryoUnitTest.java
+++ b/libraries-data-io/src/test/java/com/baeldung/libraries/kryo/KryoUnitTest.java
@@ -1,6 +1,11 @@
-package com.baeldung.kryo;
+package com.baeldung.libraries.kryo;
 
-import static org.junit.Assert.assertEquals;
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
+import com.esotericsoftware.kryo.serializers.JavaSerializer;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -9,13 +14,7 @@ import java.util.Date;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.junit.Before;
-import org.junit.Test;
-
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.io.Input;
-import com.esotericsoftware.kryo.io.Output;
-import com.esotericsoftware.kryo.serializers.JavaSerializer;
+import static org.junit.Assert.assertEquals;
 
 public class KryoUnitTest {
 
@@ -27,8 +26,8 @@ public class KryoUnitTest {
     public void init() {
         kryo = new Kryo();
         try {
-            output = new Output(new FileOutputStream("file.dat"));
-            input = new Input(new FileInputStream("file.dat"));
+            output = new Output(new FileOutputStream("src/test/resources/file.dat"));
+            input = new Input(new FileInputStream("src/test/resources/file.dat"));
         } catch (FileNotFoundException ex) {
             Logger.getLogger(KryoUnitTest.class.getName())
                 .log(Level.SEVERE, null, ex);
diff --git a/libraries-data-2/src/test/com/baeldung/opencsv/OpenCsvIntegrationTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/opencsv/OpenCsvIntegrationTest.java
similarity index 93%
rename from libraries-data-2/src/test/com/baeldung/opencsv/OpenCsvIntegrationTest.java
rename to libraries-data-io/src/test/java/com/baeldung/libraries/opencsv/OpenCsvIntegrationTest.java
index fca96684ad..b0db4309d9 100644
--- a/libraries-data-2/src/test/com/baeldung/opencsv/OpenCsvIntegrationTest.java
+++ b/libraries-data-io/src/test/java/com/baeldung/libraries/opencsv/OpenCsvIntegrationTest.java
@@ -1,6 +1,6 @@
-package com.baeldung.opencsv;
+package com.baeldung.libraries.opencsv;
 
-import com.baeldung.opencsv.helpers.Helpers;
+import com.baeldung.libraries.opencsv.helpers.Helpers;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/libraries-data-2/src/test/com/baeldung/google/sheets/GoogleSheetsLiveTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/sheets/GoogleSheetsLiveTest.java
similarity index 99%
rename from libraries-data-2/src/test/com/baeldung/google/sheets/GoogleSheetsLiveTest.java
rename to libraries-data-io/src/test/java/com/baeldung/libraries/sheets/GoogleSheetsLiveTest.java
index 358b3390f9..31f769c11b 100644
--- a/libraries-data-2/src/test/com/baeldung/google/sheets/GoogleSheetsLiveTest.java
+++ b/libraries-data-io/src/test/java/com/baeldung/libraries/sheets/GoogleSheetsLiveTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.google.sheets;
+package com.baeldung.libraries.sheets;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
diff --git a/libraries-data-2/src/test/com/baeldung/smooks/converter/SmooksIntegrationTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/smooks/SmooksIntegrationTest.java
similarity index 88%
rename from libraries-data-2/src/test/com/baeldung/smooks/converter/SmooksIntegrationTest.java
rename to libraries-data-io/src/test/java/com/baeldung/libraries/smooks/SmooksIntegrationTest.java
index df7fea58f8..75444d2185 100644
--- a/libraries-data-2/src/test/com/baeldung/smooks/converter/SmooksIntegrationTest.java
+++ b/libraries-data-io/src/test/java/com/baeldung/libraries/smooks/SmooksIntegrationTest.java
@@ -1,9 +1,11 @@
-package com.baeldung.smooks.converter;
+package com.baeldung.libraries.smooks;
 
-import com.baeldung.smooks.model.Item;
-import com.baeldung.smooks.model.Order;
-import com.baeldung.smooks.model.Status;
-import com.baeldung.smooks.model.Supplier;
+import com.baeldung.libraries.smooks.converter.OrderConverter;
+import com.baeldung.libraries.smooks.converter.OrderValidator;
+import com.baeldung.libraries.smooks.model.Item;
+import com.baeldung.libraries.smooks.model.Order;
+import com.baeldung.libraries.smooks.model.Status;
+import com.baeldung.libraries.smooks.model.Supplier;
 import org.junit.Test;
 import org.milyn.validation.ValidationResult;
 import java.text.SimpleDateFormat;
diff --git a/libraries-data-3/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/snakeyaml/JavaToYAMLSerializationUnitTest.java
similarity index 88%
rename from libraries-data-3/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java
rename to libraries-data-io/src/test/java/com/baeldung/libraries/snakeyaml/JavaToYAMLSerializationUnitTest.java
index f6836f6d56..f1a926c12b 100644
--- a/libraries-data-3/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java
+++ b/libraries-data-io/src/test/java/com/baeldung/libraries/snakeyaml/JavaToYAMLSerializationUnitTest.java
@@ -1,16 +1,14 @@
-package com.baeldung.snakeyaml;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.StringWriter;
-import java.util.LinkedHashMap;
-import java.util.Map;
+package com.baeldung.libraries.snakeyaml;
 
 import org.junit.Test;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.nodes.Tag;
 
-import com.baeldung.snakeyaml.Customer;
+import java.io.StringWriter;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
 
 public class JavaToYAMLSerializationUnitTest {
 
@@ -36,7 +34,7 @@ public class JavaToYAMLSerializationUnitTest {
         Yaml yaml = new Yaml();
         StringWriter writer = new StringWriter();
         yaml.dump(customer, writer);        
-        String expectedYaml = "!!com.baeldung.snakeyaml.Customer {age: 45, contactDetails: null, firstName: Greg,\n  homeAddress: null, lastName: McDowell}\n";
+        String expectedYaml = "!!com.baeldung.libraries.snakeyaml.Customer {age: 45, contactDetails: null, firstName: Greg,\n  homeAddress: null, lastName: McDowell}\n";
         assertEquals(expectedYaml, writer.toString());
     }
 
diff --git a/libraries-data-3/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java b/libraries-data-io/src/test/java/com/baeldung/libraries/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
similarity index 99%
rename from libraries-data-3/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
rename to libraries-data-io/src/test/java/com/baeldung/libraries/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
index 56cd3c2b2e..6f32f143a9 100644
--- a/libraries-data-3/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
+++ b/libraries-data-io/src/test/java/com/baeldung/libraries/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.snakeyaml;
+package com.baeldung.libraries.snakeyaml;
 
 import org.junit.Test;
 import org.yaml.snakeyaml.TypeDescription;
diff --git a/libraries-data-io/src/test/resources/file.dat b/libraries-data-io/src/test/resources/file.dat
new file mode 100644
index 0000000000..c246a9f44b
Binary files /dev/null and b/libraries-data-io/src/test/resources/file.dat differ
diff --git a/libraries-data-3/src/test/resources/yaml/customer.yaml b/libraries-data-io/src/test/resources/yaml/customer.yaml
similarity index 100%
rename from libraries-data-3/src/test/resources/yaml/customer.yaml
rename to libraries-data-io/src/test/resources/yaml/customer.yaml
diff --git a/libraries-data-3/src/test/resources/yaml/customer_with_contact_details.yaml b/libraries-data-io/src/test/resources/yaml/customer_with_contact_details.yaml
similarity index 100%
rename from libraries-data-3/src/test/resources/yaml/customer_with_contact_details.yaml
rename to libraries-data-io/src/test/resources/yaml/customer_with_contact_details.yaml
diff --git a/libraries-data-3/src/test/resources/yaml/customer_with_contact_details_and_address.yaml b/libraries-data-io/src/test/resources/yaml/customer_with_contact_details_and_address.yaml
similarity index 100%
rename from libraries-data-3/src/test/resources/yaml/customer_with_contact_details_and_address.yaml
rename to libraries-data-io/src/test/resources/yaml/customer_with_contact_details_and_address.yaml
diff --git a/libraries-data-3/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml b/libraries-data-io/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml
similarity index 100%
rename from libraries-data-3/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml
rename to libraries-data-io/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml
diff --git a/libraries-data-io/src/test/resources/yaml/customer_with_type.yaml b/libraries-data-io/src/test/resources/yaml/customer_with_type.yaml
new file mode 100644
index 0000000000..1454addc36
--- /dev/null
+++ b/libraries-data-io/src/test/resources/yaml/customer_with_type.yaml
@@ -0,0 +1,4 @@
+!!com.baeldung.libraries.snakeyaml.Customer
+firstName: "John"
+lastName: "Doe"
+age: 20
\ No newline at end of file
diff --git a/libraries-data-3/src/test/resources/yaml/customers.yaml b/libraries-data-io/src/test/resources/yaml/customers.yaml
similarity index 100%
rename from libraries-data-3/src/test/resources/yaml/customers.yaml
rename to libraries-data-io/src/test/resources/yaml/customers.yaml
diff --git a/libraries-data/README.md b/libraries-data/README.md
index be8f2b2525..7614d11b16 100644
--- a/libraries-data/README.md
+++ b/libraries-data/README.md
@@ -3,20 +3,13 @@
 This module contains articles about libraries for data processing in Java.
 
 ### Relevant articles
-- [Introduction to Reladomo](https://www.baeldung.com/reladomo)
-- [Introduction to ORMLite](https://www.baeldung.com/ormlite)
-- [Introduction To Kryo](https://www.baeldung.com/kryo)
 - [Introduction to KafkaStreams in Java](https://www.baeldung.com/java-kafka-streams)
-- [Guide to Java Data Objects](https://www.baeldung.com/jdo)
-- [Intro to JDO Queries 2/2](https://www.baeldung.com/jdo-queries)
-- [Introduction to HikariCP](https://www.baeldung.com/hikaricp)
 - [Introduction to JCache](https://www.baeldung.com/jcache)
 - [A Guide to Apache Ignite](https://www.baeldung.com/apache-ignite)
 - [Apache Ignite with Spring Data](https://www.baeldung.com/apache-ignite-spring-data)
 - [A Guide to Apache Crunch](https://www.baeldung.com/apache-crunch)
 - [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)
 - [Kafka Connect Example with MQTT and MongoDB](https://www.baeldung.com/kafka-connect-mqtt-mongodb)
 - [Building a Data Pipeline with Flink and Kafka](https://www.baeldung.com/kafka-flink-data-pipeline)
-- More articles: [[next -->]](/libraries-data-2)
+More articles: [[next -->]](/../libraries-data-2)
\ No newline at end of file
diff --git a/libraries-data/file.dat b/libraries-data/file.dat
deleted file mode 100644
index 70177cef97..0000000000
Binary files a/libraries-data/file.dat and /dev/null differ
diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index e255236480..8e5360dea3 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -13,11 +13,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>kryo</artifactId>
-            <version>${kryo.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -29,21 +24,6 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.goldmansachs.reladomo</groupId>
-            <artifactId>reladomo</artifactId>
-            <version>${reladomo.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.goldmansachs.reladomo</groupId>
-            <artifactId>reladomo-test-util</artifactId>
-            <version>${reladomo.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.j256.ormlite</groupId>
-            <artifactId>ormlite-jdbc</artifactId>
-            <version>${ormlite.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-streams</artifactId>
@@ -87,49 +67,6 @@
             <artifactId>gson</artifactId>
             <version>${gson.version}</version>
         </dependency>
-        <!-- Hikari CP -->
-        <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <version>${HikariCP.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- JDO -->
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>javax.jdo</artifactId>
-            <version>${javax.jdo.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-core</artifactId>
-            <version>${datanucleus.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-api-jdo</artifactId>
-            <version>${datanucleus.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-rdbms</artifactId>
-            <version>${datanucleus.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-maven-plugin</artifactId>
-            <version>${datanucleus-maven-plugin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-xml</artifactId>
-            <version>${datanucleus-xml.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-jdo-query</artifactId>
-            <version>${datanucleus-jdo-query.version}</version>
-        </dependency>
         <!-- Jcache -->
         <dependency>
             <groupId>javax.cache</groupId>
@@ -232,23 +169,6 @@
             <artifactId>assertj-core</artifactId>
             <version>${assertj.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${awaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility-proxy</artifactId>
-            <version>${awaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.ebean</groupId>
-            <artifactId>ebean</artifactId>
-            <version>${ebean.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -289,113 +209,13 @@
 
     <build>
         <plugins>
-
-            <!-- Reladomo -->
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>${maven-antrun-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>generateMithra</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <taskdef name="gen-reladomo" classpath="plugin_classpath" classname="com.gs.fw.common.mithra.generator.MithraGenerator" />
-                                <gen-reladomo xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml" generateGscListMethod="true"
-                                    generatedDir="${project.build.directory}/generated-sources/reladomo" nonGeneratedDir="${project.basedir}/src/main/java" />
-
-                                <taskdef name="gen-ddl" classname="com.gs.fw.common.mithra.generator.dbgenerator.MithraDbDefinitionGenerator" loaderRef="reladomoGenerator">
-                                    <classpath refid="maven.plugin.classpath" />
-                                </taskdef>
-                                <gen-ddl xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
-                                    generatedDir="${project.build.directory}/generated-db/sql" databaseType="postgres" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.goldmansachs.reladomo</groupId>
-                        <artifactId>reladomogen</artifactId>
-                        <version>${reladomo.version}</version>
-                    </dependency>
-
-                    <dependency>
-                        <groupId>com.goldmansachs.reladomo</groupId>
-                        <artifactId>reladomo-gen-util</artifactId>
-                        <version>${reladomo.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>${build-helper-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.build.directory}/generated-sources/reladomo</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>add-resource</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>${project.build.directory}/generated-db/</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- /Reladomo -->
-
-            <!-- JDO Plugin -->
-            <plugin>
-                <groupId>org.datanucleus</groupId>
-                <artifactId>datanucleus-maven-plugin</artifactId>
-                <version>${datanucleus-maven-plugin.version}</version>
-                <configuration>
-                    <api>JDO</api>
-                    <props>${basedir}/datanucleus.properties</props>
-                    <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                    <verbose>true</verbose>
-                    <fork>false</fork>
-                    <!-- Solve windows line too long error -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>enhance</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.3</version>
                 <configuration>
                     <descriptors>
-                        <descriptor>src/main/assembly/hadoop-job.xml</descriptor>
+                        <descriptor>src/main/resources/assembly/hadoop-job.xml</descriptor>
                     </descriptors>
                     <archive>
                         <manifest>
@@ -413,51 +233,22 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>io.ebean</groupId>
-                <artifactId>ebean-maven-plugin</artifactId>
-                <version>11.11.2</version>
-                <executions>
-                    <!-- enhance main classes -->
-                    <execution>
-                        <id>main</id>
-                        <phase>process-classes</phase>
-                        <configuration>
-                            <transformArgs>debug=1</transformArgs>
-                        </configuration>
-                        <goals>
-                            <goal>enhance</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
     <properties>
         <storm.version>1.2.2</storm.version>
-        <kryo.version>4.0.1</kryo.version>
-        <reladomo.version>16.5.1</reladomo.version>
-        <ormlite.version>5.0</ormlite.version>
         <kafka.version>1.0.0</kafka.version>
         <ignite.version>2.4.0</ignite.version>
         <gson.version>2.8.2</gson.version>
         <cache.version>1.1.0</cache.version>
         <flink.version>1.5.0</flink.version>
-        <awaitility.version>3.0.0</awaitility.version>
         <assertj.version>3.6.2</assertj.version>
         <hazelcast.version>3.8.4</hazelcast.version>
         <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
         <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
-        <HikariCP.version>2.7.2</HikariCP.version>
-        <javax.jdo.version>3.2.0-m7</javax.jdo.version>
-        <datanucleus.version>5.1.1</datanucleus.version>
-        <datanucleus-maven-plugin.version>5.0.2</datanucleus-maven-plugin.version>
-        <datanucleus-xml.version>5.0.0-release</datanucleus-xml.version>
-        <datanucleus-jdo-query.version>5.0.4</datanucleus-jdo-query.version>
         <org.apache.crunch.crunch-core.version>0.15.0</org.apache.crunch.crunch-core.version>
         <org.apache.hadoop.hadoop-client>2.2.0</org.apache.hadoop.hadoop-client> 
-        <ebean.version>11.22.4</ebean.version>
         <slf4j.version>1.7.25</slf4j.version>
         <logback.version>1.0.1</logback.version>          
     </properties>
diff --git a/libraries-data/src/main/resources/ReladomoRuntimeConfig.xml b/libraries-data/src/main/resources/ReladomoRuntimeConfig.xml
deleted file mode 100644
index 7181e75406..0000000000
--- a/libraries-data/src/main/resources/ReladomoRuntimeConfig.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<MithraRuntime>
-   <ConnectionManager className="com.baeldung.reladomo.ReladomoConnectionManager ">
-           <MithraObjectConfiguration className="com.baeldung.reladomo.Department" cacheType="partial"/>
-           <MithraObjectConfiguration className="com.baeldung.reladomo.Employee " cacheType="partial"/>
-    </ConnectionManager>
-</MithraRuntime>
\ No newline at end of file
diff --git a/libraries-data/src/main/assembly/hadoop-job.xml b/libraries-data/src/main/resources/assembly/hadoop-job.xml
similarity index 100%
rename from libraries-data/src/main/assembly/hadoop-job.xml
rename to libraries-data/src/main/resources/assembly/hadoop-job.xml
diff --git a/libraries-data/src/main/resources/ebean.mf b/libraries-data/src/main/resources/ebean.mf
deleted file mode 100644
index f49fecc717..0000000000
--- a/libraries-data/src/main/resources/ebean.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-entity-packages: com.baeldung.ebean.model
-transactional-packages: com.baeldung.ebean.app
-querybean-packages: com.baeldung.ebean.app
diff --git a/libraries-data/src/main/resources/employee.txt b/libraries-data/src/main/resources/employee.txt
deleted file mode 100644
index 6c476f39fa..0000000000
--- a/libraries-data/src/main/resources/employee.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{id:"1", name="John", isEmployed: "true"}
-{id:"1", name="Anna", isEmployed: "false"}
-{id:"1", name="George", isEmployed: "true"}
\ No newline at end of file
diff --git a/libraries-data/src/main/kafka-connect/01_Quick_Start/connect-file-sink.properties b/libraries-data/src/main/resources/kafka-connect/01_Quick_Start/connect-file-sink.properties
similarity index 100%
rename from libraries-data/src/main/kafka-connect/01_Quick_Start/connect-file-sink.properties
rename to libraries-data/src/main/resources/kafka-connect/01_Quick_Start/connect-file-sink.properties
diff --git a/libraries-data/src/main/kafka-connect/01_Quick_Start/connect-file-source.properties b/libraries-data/src/main/resources/kafka-connect/01_Quick_Start/connect-file-source.properties
similarity index 100%
rename from libraries-data/src/main/kafka-connect/01_Quick_Start/connect-file-source.properties
rename to libraries-data/src/main/resources/kafka-connect/01_Quick_Start/connect-file-source.properties
diff --git a/libraries-data/src/main/kafka-connect/01_Quick_Start/connect-standalone.properties b/libraries-data/src/main/resources/kafka-connect/01_Quick_Start/connect-standalone.properties
similarity index 100%
rename from libraries-data/src/main/kafka-connect/01_Quick_Start/connect-standalone.properties
rename to libraries-data/src/main/resources/kafka-connect/01_Quick_Start/connect-standalone.properties
diff --git a/libraries-data/src/main/kafka-connect/02_Distributed/connect-distributed.properties b/libraries-data/src/main/resources/kafka-connect/02_Distributed/connect-distributed.properties
similarity index 100%
rename from libraries-data/src/main/kafka-connect/02_Distributed/connect-distributed.properties
rename to libraries-data/src/main/resources/kafka-connect/02_Distributed/connect-distributed.properties
diff --git a/libraries-data/src/main/kafka-connect/02_Distributed/connect-file-sink.json b/libraries-data/src/main/resources/kafka-connect/02_Distributed/connect-file-sink.json
similarity index 100%
rename from libraries-data/src/main/kafka-connect/02_Distributed/connect-file-sink.json
rename to libraries-data/src/main/resources/kafka-connect/02_Distributed/connect-file-sink.json
diff --git a/libraries-data/src/main/kafka-connect/02_Distributed/connect-file-source.json b/libraries-data/src/main/resources/kafka-connect/02_Distributed/connect-file-source.json
similarity index 100%
rename from libraries-data/src/main/kafka-connect/02_Distributed/connect-file-source.json
rename to libraries-data/src/main/resources/kafka-connect/02_Distributed/connect-file-source.json
diff --git a/libraries-data/src/main/kafka-connect/03_Transform/connect-distributed.properties b/libraries-data/src/main/resources/kafka-connect/03_Transform/connect-distributed.properties
similarity index 100%
rename from libraries-data/src/main/kafka-connect/03_Transform/connect-distributed.properties
rename to libraries-data/src/main/resources/kafka-connect/03_Transform/connect-distributed.properties
diff --git a/libraries-data/src/main/kafka-connect/03_Transform/connect-file-source-transform.json b/libraries-data/src/main/resources/kafka-connect/03_Transform/connect-file-source-transform.json
similarity index 100%
rename from libraries-data/src/main/kafka-connect/03_Transform/connect-file-source-transform.json
rename to libraries-data/src/main/resources/kafka-connect/03_Transform/connect-file-source-transform.json
diff --git a/libraries-data/src/main/kafka-connect/04_Custom/connect-mongodb-sink.json b/libraries-data/src/main/resources/kafka-connect/04_Custom/connect-mongodb-sink.json
similarity index 100%
rename from libraries-data/src/main/kafka-connect/04_Custom/connect-mongodb-sink.json
rename to libraries-data/src/main/resources/kafka-connect/04_Custom/connect-mongodb-sink.json
diff --git a/libraries-data/src/main/kafka-connect/04_Custom/connect-mqtt-source.json b/libraries-data/src/main/resources/kafka-connect/04_Custom/connect-mqtt-source.json
similarity index 100%
rename from libraries-data/src/main/kafka-connect/04_Custom/connect-mqtt-source.json
rename to libraries-data/src/main/resources/kafka-connect/04_Custom/connect-mqtt-source.json
diff --git a/libraries-data/src/main/kafka-connect/04_Custom/docker-compose.yaml b/libraries-data/src/main/resources/kafka-connect/04_Custom/docker-compose.yaml
similarity index 100%
rename from libraries-data/src/main/kafka-connect/04_Custom/docker-compose.yaml
rename to libraries-data/src/main/resources/kafka-connect/04_Custom/docker-compose.yaml
diff --git a/libraries-data/src/main/resources/user_jmapper.xml b/libraries-data/src/main/resources/user_jmapper.xml
deleted file mode 100644
index f007de9f0a..0000000000
--- a/libraries-data/src/main/resources/user_jmapper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<jmapper>
-  <class name="com.baeldung.jmapper.UserDto">
-    <attribute name="id">
-      <value name="id"/>
-    </attribute>
-    <attribute name="username">
-      <value name="email"/>
-    </attribute>
-  </class>
-</jmapper>
\ No newline at end of file
diff --git a/libraries-data/src/main/resources/user_jmapper1.xml b/libraries-data/src/main/resources/user_jmapper1.xml
deleted file mode 100644
index abcfd77e1c..0000000000
--- a/libraries-data/src/main/resources/user_jmapper1.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<jmapper>
-  <class name="com.baeldung.jmapper.UserDto1">
-    <global/>
-  </class>
-</jmapper>
\ No newline at end of file
diff --git a/libraries-data/src/main/resources/user_jmapper2.xml b/libraries-data/src/main/resources/user_jmapper2.xml
deleted file mode 100644
index 1e708e14bf..0000000000
--- a/libraries-data/src/main/resources/user_jmapper2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<jmapper>
-  <class name="com.baeldung.jmapper.relational.User">
-    <attribute name="id">
-      <value name="id"/>
-      <classes>
-        <class name="com.baeldung.jmapper.relational.UserDto1"/>
-        <class name="com.baeldung.jmapper.relational.UserDto2"/>
-      </classes>
-    </attribute>
-    <attribute name="email">
-      <attributes>
-        <attribute name="username"/>
-        <attribute name="email"/>
-      </attributes>
-      <classes>
-        <class name="com.baeldung.jmapper.relational.UserDto1"/>
-        <class name="com.baeldung.jmapper.relational.UserDto2"/>
-      </classes>      
-    </attribute>
-  </class>
-</jmapper>
\ No newline at end of file
diff --git a/libraries-data/src/test/resources/reladomo/ReladomoTestConfig.xml b/libraries-data/src/test/resources/reladomo/ReladomoTestConfig.xml
deleted file mode 100644
index 6e5d212fb8..0000000000
--- a/libraries-data/src/test/resources/reladomo/ReladomoTestConfig.xml
+++ /dev/null
@@ -1,7 +0,0 @@
- <MithraRuntime>
-    <ConnectionManager className="com.gs.fw.common.mithra.test.ConnectionManagerForTests">
-        <Property name="resourceName" value="testDb"/>
-        <MithraObjectConfiguration className="com.baeldung.reladomo.Department" cacheType="partial"/>
-        <MithraObjectConfiguration className="com.baeldung.reladomo.Employee" cacheType="partial"/>
-    </ConnectionManager>
- </MithraRuntime>
\ No newline at end of file
diff --git a/libraries-data/src/test/resources/reladomo/test-data.txt b/libraries-data/src/test/resources/reladomo/test-data.txt
deleted file mode 100644
index 8e407278ac..0000000000
--- a/libraries-data/src/test/resources/reladomo/test-data.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-class com.baeldung.reladomo.Department
-id, name
-1, "Marketing"
-
-class com.baeldung.reladomo.Employee
-id, name
-1, "Paul"
\ No newline at end of file
diff --git a/libraries-primitive/README.MD b/libraries-primitive/README.MD
index f27fb73dd6..086cdc0d2d 100644
--- a/libraries-primitive/README.MD
+++ b/libraries-primitive/README.MD
@@ -1,3 +1,5 @@
 ### Relevant Articles
 
 - [Guide to FastUtil](https://www.baeldung.com/fastutil)
+- [Primitive Collections in Eclipse Collections](https://www.baeldung.com/java-eclipse-primitive-collections)
+
diff --git a/libraries-primitive/pom.xml b/libraries-primitive/pom.xml
index cddb3ab1fe..30f683a544 100644
--- a/libraries-primitive/pom.xml
+++ b/libraries-primitive/pom.xml
@@ -3,17 +3,11 @@
          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>libraries-primitive</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>libraries-primitive</name>
 
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
     <dependencies>
         <!-- https://mvnrepository.com/artifact/it.unimi.dsi/fastutil -->
         <dependency>
@@ -47,12 +41,15 @@
             <artifactId>eclipse-collections-api</artifactId>
             <version>10.0.0</version>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.collections</groupId>
             <artifactId>eclipse-collections</artifactId>
             <version>10.0.0</version>
         </dependency>
-
     </dependencies>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
 </project>
\ No newline at end of file
diff --git a/libraries/README.md b/libraries/README.md
index 627c30e75a..79ba8fe55d 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -40,7 +40,6 @@ Remember, for advanced libraries like [Jackson](/jackson) and [JUnit](/testing-m
 - [Publish and Receive Messages with Nats Java Client](https://www.baeldung.com/nats-java-client)
 - [Java Concurrency Utility with JCTools](https://www.baeldung.com/java-concurrency-jc-tools)
 - [Introduction to JavaPoet](https://www.baeldung.com/java-poet)
-- [Convert String to Date in Java](https://www.baeldung.com/java-string-to-date)
 - [Guide to Resilience4j](https://www.baeldung.com/resilience4j)
 - [Exactly Once Processing in Kafka](https://www.baeldung.com/kafka-exactly-once)
 - [Implementing a FTP-Client in Java](https://www.baeldung.com/java-ftp-client)
diff --git a/libraries/src/main/java/com/baeldung/pairs/CustomPair.java b/libraries/src/main/java/com/baeldung/pairs/CustomPair.java
new file mode 100644
index 0000000000..bd37977f92
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/pairs/CustomPair.java
@@ -0,0 +1,33 @@
+package com.baeldung.pairs;
+
+public class CustomPair {
+
+    private String key;
+    private String value;
+    
+    public CustomPair(String key, String value) {
+        super();
+        this.key = key;
+        this.value = value;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+    
+    public Object[] getPair() {
+        return new Object[] { this.key, this.value};
+    }
+}
diff --git a/libraries/src/test/resources/yaml/customer.yaml b/libraries/src/test/resources/yaml/customer.yaml
deleted file mode 100644
index aa76141c7d..0000000000
--- a/libraries/src/test/resources/yaml/customer.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-firstName: "John"
-lastName: "Doe"
-age: 20
\ No newline at end of file
diff --git a/libraries/src/test/resources/yaml/customer_with_contact_details.yaml b/libraries/src/test/resources/yaml/customer_with_contact_details.yaml
deleted file mode 100644
index 34563cbd21..0000000000
--- a/libraries/src/test/resources/yaml/customer_with_contact_details.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-firstName: "John"
-lastName: "Doe"
-age: 31
-contactDetails:
-   - { type: "mobile", number: 123456789}
-   - { type: "landline", number: 456786868}
-   
\ No newline at end of file
diff --git a/libraries/src/test/resources/yaml/customer_with_contact_details_and_address.yaml b/libraries/src/test/resources/yaml/customer_with_contact_details_and_address.yaml
deleted file mode 100644
index 664afe8594..0000000000
--- a/libraries/src/test/resources/yaml/customer_with_contact_details_and_address.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-firstName: "John"
-lastName: "Doe"
-age: 31
-contactDetails:
-   - type: "mobile"
-     number: 123456789
-   - type: "landline"
-     number: 456786868
-homeAddress:
-   line: "Xyz, DEF Street"
-   city: "City Y"
-   state: "State Y"
-   zip: 345657
diff --git a/libraries/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml b/libraries/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml
deleted file mode 100644
index 145da256d9..0000000000
--- a/libraries/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-firstName: "John"
-lastName: "Doe"
-age: 31
-contactDetails:
-   - !contact { type: "mobile", number: 123456789}
-   - !contact { type: "landline", number: 456786868}
diff --git a/libraries/src/test/resources/yaml/customer_with_type.yaml b/libraries/src/test/resources/yaml/customer_with_type.yaml
deleted file mode 100644
index 6e13c26cea..0000000000
--- a/libraries/src/test/resources/yaml/customer_with_type.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-!!com.baeldung.snakeyaml.Customer
-firstName: "John"
-lastName: "Doe"
-age: 20
\ No newline at end of file
diff --git a/libraries/src/test/resources/yaml/customers.yaml b/libraries/src/test/resources/yaml/customers.yaml
deleted file mode 100644
index 23b9039c2e..0000000000
--- a/libraries/src/test/resources/yaml/customers.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-firstName: "John"
-lastName: "Doe"
-age: 20
----
-firstName: "Jack"
-lastName: "Jones"
-age: 25
\ No newline at end of file
diff --git a/logging-modules/flogger/pom.xml b/logging-modules/flogger/pom.xml
index 0bba719616..20201af179 100644
--- a/logging-modules/flogger/pom.xml
+++ b/logging-modules/flogger/pom.xml
@@ -2,14 +2,14 @@
 <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>flogger</artifactId>
+
     <parent>
         <artifactId>logging-modules</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>flogger</artifactId>
 
     <dependencies>
         <dependency>
diff --git a/lombok/README.md b/lombok/README.md
index 54a0984159..39d3cd6b05 100644
--- a/lombok/README.md
+++ b/lombok/README.md
@@ -1,4 +1,8 @@
-## Relevant Articles:
+## Project Lombok
+
+This module contains articles about Project Lombok.
+
+### Relevant Articles:
 - [Introduction to Project Lombok](https://www.baeldung.com/intro-to-project-lombok)
 - [Using Lombok’s @Builder Annotation](https://www.baeldung.com/lombok-builder)
 - [Using Lombok’s @Getter for Boolean Fields](https://www.baeldung.com/lombok-getter-boolean)
diff --git a/lucene/README.md b/lucene/README.md
index 2bfd8bf4e1..ad83f26386 100644
--- a/lucene/README.md
+++ b/lucene/README.md
@@ -1,3 +1,7 @@
+## Apache Lucene
+
+This module contains articles about Apache Lucene.
+
 ### Relevant Articles:
 
 - [Introduction to Apache Lucene](https://www.baeldung.com/lucene)
diff --git a/mapstruct/README.md b/mapstruct/README.md
index 92c55a131d..be02c1186b 100644
--- a/mapstruct/README.md
+++ b/mapstruct/README.md
@@ -1,2 +1,8 @@
+## MapStruct
+
+This module contains articles about MapStruct.
+
 ###Relevant Articles:
 - [Quick Guide to MapStruct](https://www.baeldung.com/mapstruct)
+- [Custom Mapper with MapStruct](https://www.baeldung.com/mapstruct-custom-mapper)
+
diff --git a/mapstruct/src/test/java/com/baeldung/mapper/EmployeeMapperUnitTest.java b/mapstruct/src/test/java/com/baeldung/mapper/EmployeeMapperUnitTest.java
index 330c12eb13..1a48b341b9 100644
--- a/mapstruct/src/test/java/com/baeldung/mapper/EmployeeMapperUnitTest.java
+++ b/mapstruct/src/test/java/com/baeldung/mapper/EmployeeMapperUnitTest.java
@@ -46,7 +46,7 @@ public class EmployeeMapperUnitTest {
     }
 
     @Test
-    public void givenEmployeeDTOwithNestedMappingToEmployee_whenMaps_thenCorrect() {
+    public void givenEmpDTONestedMappingToEmp_whenMaps_thenCorrect() {
         EmployeeDTO dto = new EmployeeDTO();
         dto.setDivision(new DivisionDTO(1, "Division1"));
 
@@ -102,7 +102,7 @@ public class EmployeeMapperUnitTest {
     }
 
     @Test
-    public void givenEmployeeWithStartDateMappingToEmployeeDTO_whenMaps_thenCorrect() throws ParseException {
+    public void givenEmpStartDtMappingToEmpDTO_whenMaps_thenCorrect() throws ParseException {
         Employee entity = new Employee();
         entity.setStartDt(new Date());
 
@@ -112,7 +112,7 @@ public class EmployeeMapperUnitTest {
     }
 
     @Test
-    public void givenEmployeeDTOWithStartDateMappingToEmployee_whenMaps_thenCorrect() throws ParseException {
+    public void givenEmpDTOStartDtMappingToEmp_whenMaps_thenCorrect() throws ParseException {
         EmployeeDTO dto = new EmployeeDTO();
         dto.setEmployeeStartDt("01-04-2016 01:00:00");
 
diff --git a/mapstruct/src/test/java/com/baeldung/mapper/SimpleSourceDestinationMapperIntegrationTest.java b/mapstruct/src/test/java/com/baeldung/mapper/SimpleSourceDestinationMapperIntegrationTest.java
index 31d60c0d7d..78527e70e4 100644
--- a/mapstruct/src/test/java/com/baeldung/mapper/SimpleSourceDestinationMapperIntegrationTest.java
+++ b/mapstruct/src/test/java/com/baeldung/mapper/SimpleSourceDestinationMapperIntegrationTest.java
@@ -18,7 +18,7 @@ public class SimpleSourceDestinationMapperIntegrationTest {
     SimpleSourceDestinationMapper simpleSourceDestinationMapper;
 
     @Test
-    public void givenSimpleSourceToSimpleDestination_whenMaps_thenCorrect() {
+    public void givenSourceToDestination_whenMaps_thenCorrect() {
         SimpleSource simpleSource = new SimpleSource();
         simpleSource.setName("SourceName");
         simpleSource.setDescription("SourceDescription");
@@ -30,7 +30,7 @@ public class SimpleSourceDestinationMapperIntegrationTest {
     }
 
     @Test
-    public void givenSimpleDestinationToSourceDestination_whenMaps_thenCorrect() {
+    public void givenDestinationToSource_whenMaps_thenCorrect() {
         SimpleDestination destination = new SimpleDestination();
         destination.setName("DestinationName");
         destination.setDescription("DestinationDescription");
diff --git a/maven-all/README.md b/maven-all/README.md
index d014f323d2..b20d944b14 100644
--- a/maven-all/README.md
+++ b/maven-all/README.md
@@ -1,3 +1,7 @@
+## Apache Maven
+
+This module contains articles about Apache Maven. Please refer to its submodules.
+
 ### Relevant Articles
 
-- [Apache Maven Tutorial](https://www.baeldung.com/maven)
\ No newline at end of file
+- [Apache Maven Tutorial](https://www.baeldung.com/maven)
diff --git a/maven-all/maven-war-plugin/README.md b/maven-all/maven-war-plugin/README.md
index d559fea80b..09d33772f0 100644
--- a/maven-all/maven-war-plugin/README.md
+++ b/maven-all/maven-war-plugin/README.md
@@ -1,3 +1,7 @@
+## Maven WAR Plugin
+
+This module contains articles about the Maven WAR Plugin.
+
 ### Relevant Articles
 
-- [Eclipse Error: web.xml is missing and failOnMissingWebXml is set to true](https://www.baeldung.com/eclipse-error-web-xml-missing)
\ No newline at end of file
+- [Eclipse Error: web.xml is missing and failOnMissingWebXml is set to true](https://www.baeldung.com/eclipse-error-web-xml-missing)
diff --git a/maven-all/maven/README.md b/maven-all/maven/README.md
index acf7dfc47b..ced4a52703 100644
--- a/maven-all/maven/README.md
+++ b/maven-all/maven/README.md
@@ -1,3 +1,8 @@
+## Apache Maven
+
+This module contains articles about core Apache Maven. Articles about other Maven plugins (such as the Maven WAR Plugin)
+have their own dedicated modules. 
+
 ### Relevant Articles
 
 - [Guide to the Core Maven Plugins](https://www.baeldung.com/core-maven-plugins)
diff --git a/maven-all/profiles/README.md b/maven-all/profiles/README.md
index 22d5d7f70c..cfbe5c397f 100644
--- a/maven-all/profiles/README.md
+++ b/maven-all/profiles/README.md
@@ -1,3 +1,7 @@
+## Maven Profiles
+
+This module contains articles about Maven profiles.
+
 ### Relevant Articles
 
-- [Guide to Maven Profiles](https://www.baeldung.com/maven-profiles)
\ No newline at end of file
+- [Guide to Maven Profiles](https://www.baeldung.com/maven-profiles)
diff --git a/maven-all/versions-maven-plugin/README.md b/maven-all/versions-maven-plugin/README.md
index 8f5670f802..19414a2a4b 100644
--- a/maven-all/versions-maven-plugin/README.md
+++ b/maven-all/versions-maven-plugin/README.md
@@ -1,3 +1,7 @@
+## Versions Maven Plugin
+
+This module contains articles about the Versions Maven Plugin.
+
 ### Relevant Articles
 
-- [Use the Latest Version of a Dependency in Maven](https://www.baeldung.com/maven-dependency-latest-version)
\ No newline at end of file
+- [Use the Latest Version of a Dependency in Maven](https://www.baeldung.com/maven-dependency-latest-version)
diff --git a/maven-archetype/README.md b/maven-archetype/README.md
index b707150854..ba5a83fe14 100644
--- a/maven-archetype/README.md
+++ b/maven-archetype/README.md
@@ -1,4 +1,7 @@
+## Maven Archetype
+
+This module contains articles about the Maven Archetype Plugin.
+
 ### Relevant Articles: 
-================================
 
 - [Guide to Maven Archetype](https://www.baeldung.com/maven-archetype)
diff --git a/maven-java-11/README.md b/maven-java-11/README.md
new file mode 100644
index 0000000000..fcb6ea3f06
--- /dev/null
+++ b/maven-java-11/README.md
@@ -0,0 +1,7 @@
+## Maven and Java 11
+
+This module contains articles about Maven with Java 11+.
+
+### Relevant Articles: 
+
+- [Multi-Module Maven Application with Java Modules](https://www.baeldung.com/maven-multi-module-project-java-jpms)
diff --git a/maven-polyglot/README.md b/maven-polyglot/README.md
index 8635c8eddf..037b921ae7 100644
--- a/maven-polyglot/README.md
+++ b/maven-polyglot/README.md
@@ -1,3 +1,7 @@
+## Maven Polyglot
+
+This module contains articles about Maven Polyglot.
+
 To run the maven-polyglot-json-app successfully, you first have to build the maven-polyglot-json-extension module using: mvn clean install.
 
 ### Relevant Articles: 
diff --git a/mesos-marathon/README.md b/mesos-marathon/README.md
index 09467ebfcb..65b2361698 100644
--- a/mesos-marathon/README.md
+++ b/mesos-marathon/README.md
@@ -1,3 +1,7 @@
+## Marathon and Mesos
+
+This module contains articles about Marathon and Mesos.
+
 ### Relevant articles
 
 - [Simple Jenkins Pipeline with Marathon and Mesos](https://www.baeldung.com/jenkins-pipeline-with-marathon-mesos)
diff --git a/metrics/README.md b/metrics/README.md
index d344a2707f..b8a1bf026f 100644
--- a/metrics/README.md
+++ b/metrics/README.md
@@ -1,5 +1,11 @@
-## Relevant articles:
+## Metrics
+
+This module contains articles about metrics.
+
+### Relevant articles:
 
 - [Intro to Dropwizard Metrics](https://www.baeldung.com/dropwizard-metrics)
 - [Introduction to Netflix Servo](https://www.baeldung.com/netflix-servo)
 - [Quick Guide to Micrometer](https://www.baeldung.com/micrometer)
+- [@Timed Annotation Using Metrics and AspectJ](https://www.baeldung.com/timed-metrics-aspectj)
+
diff --git a/micronaut/README.md b/micronaut/README.md
index 0a39cf9e33..86ed705a9f 100644
--- a/micronaut/README.md
+++ b/micronaut/README.md
@@ -1,2 +1,6 @@
+## Micronaut
+
+This module contains articles about Micronaut.
+
 ### Relevant Articles:
 - [Introduction to Micronaut Framework](https://www.baeldung.com/micronaut)
diff --git a/microprofile/README.md b/microprofile/README.md
index 7525ee5bff..faa1e59af0 100644
--- a/microprofile/README.md
+++ b/microprofile/README.md
@@ -1,3 +1,7 @@
+## Eclipse MicroProfile
+
+This module contains articles about Eclipse MicroProfile.
+
 ### Relevant articles:
 
 - [Building Microservices with Eclipse MicroProfile](https://www.baeldung.com/eclipse-microprofile)
diff --git a/ml/README.md b/ml/README.md
deleted file mode 100644
index 1362f2840c..0000000000
--- a/ml/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Logistic Regression in Java
-This is a soft introduction to ML using [deeplearning4j](https://deeplearning4j.org) library
-
-### Relevant Articles:
-- [Logistic Regression in Java](https://www.baeldung.com/)
diff --git a/ml/pom.xml b/ml/pom.xml
deleted file mode 100644
index 80afcc24f4..0000000000
--- a/ml/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung.deeplearning4j</groupId>
-    <artifactId>ml</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>Machine Learning</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.nd4j</groupId>
-            <artifactId>nd4j-native-platform</artifactId>
-            <version>${dl4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.deeplearning4j</groupId>
-            <artifactId>deeplearning4j-core</artifactId>
-            <version>${dl4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.deeplearning4j</groupId>
-            <artifactId>deeplearning4j-nn</artifactId>
-            <version>${dl4j.version}</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.datavec/datavec-api -->
-        <dependency>
-            <groupId>org.datavec</groupId>
-            <artifactId>datavec-api</artifactId>
-            <version>${dl4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.3.5</version>
-        </dependency>
-
-
-    </dependencies>
-
-    <properties>
-        <dl4j.version>1.0.0-beta4</dl4j.version>
-    </properties>
-
-</project>
\ No newline at end of file
diff --git a/msf4j/README.md b/msf4j/README.md
index b7f2c5a546..7655addbc5 100644
--- a/msf4j/README.md
+++ b/msf4j/README.md
@@ -1,3 +1,7 @@
+## MSF4J
+
+This module contains articles about MSF4J.
+
 ### Relevant Articles:
 
 - [Introduction to Java Microservices with MSF4J](https://www.baeldung.com/msf4j)
diff --git a/muleesb/README.md b/muleesb/README.md
index 555a10b5cc..8e45d8bc53 100644
--- a/muleesb/README.md
+++ b/muleesb/README.md
@@ -1,3 +1,7 @@
+## Mule ESB
+
+This module contains articles about the Mule Enterprise Service Bus (ESB).
+
 ### Relevant Articles:
 
 - [Getting Started With Mule ESB](https://www.baeldung.com/mule-esb)
diff --git a/mustache/README.md b/mustache/README.md
index c36080b56f..e0fd642fda 100644
--- a/mustache/README.md
+++ b/mustache/README.md
@@ -1,3 +1,7 @@
+## Mustache
+
+This module contains articles about Mustache.
+
 ### Relevant Articles:
 - [Introduction to Mustache](https://www.baeldung.com/mustache)
 - [Guide to Mustache with Spring Boot](https://www.baeldung.com/spring-boot-mustache)
diff --git a/mybatis/README.md b/mybatis/README.md
index 57687d3da1..2c3a9085e4 100644
--- a/mybatis/README.md
+++ b/mybatis/README.md
@@ -1,2 +1,6 @@
+## MyBatis
+
+This module contains articles about MyBatis.
+
 ### Relevant Articles: 
 - [Quick Guide to MyBatis](https://www.baeldung.com/mybatis)
diff --git a/oauth2-framework-impl/README.md b/oauth2-framework-impl/README.md
index 60fefe3415..ea9686b451 100644
--- a/oauth2-framework-impl/README.md
+++ b/oauth2-framework-impl/README.md
@@ -1,3 +1,7 @@
+## OAuth 2.0 Implementation
+
+This module contains articles about the implementation of OAuth2 with Java EE.
+
 ### Relevant Articles
 
 - [Implementing The OAuth 2.0 Authorization Framework Using Java EE](https://www.baeldung.com/java-ee-oauth2-implementation)
diff --git a/oauth2-framework-impl/oauth2-authorization-server/pom.xml b/oauth2-framework-impl/oauth2-authorization-server/pom.xml
index 25927c9f1a..8793eefe78 100644
--- a/oauth2-framework-impl/oauth2-authorization-server/pom.xml
+++ b/oauth2-framework-impl/oauth2-authorization-server/pom.xml
@@ -3,7 +3,6 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>oauth2-authorization-server</artifactId>
     <packaging>war</packaging>
     <name>oauth2-authorization-server</name>
@@ -14,15 +13,6 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <properties>
-        <h2.version>1.4.199</h2.version>
-        <httpPort>9080</httpPort>
-        <httpsPort>9443</httpsPort>
-        <nimbus-jose-jwt.version>7.3</nimbus-jose-jwt.version>
-        <bcprov-jdk15on.version>1.62</bcprov-jdk15on.version>
-        <bcpkix-jdk15on.version>1.62</bcpkix-jdk15on.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.nimbusds</groupId>
@@ -73,4 +63,13 @@
             </plugin>
         </plugins>
     </build>
+
+    <properties>
+        <h2.version>1.4.199</h2.version>
+        <httpPort>9080</httpPort>
+        <httpsPort>9443</httpsPort>
+        <nimbus-jose-jwt.version>7.3</nimbus-jose-jwt.version>
+        <bcprov-jdk15on.version>1.62</bcprov-jdk15on.version>
+        <bcpkix-jdk15on.version>1.62</bcpkix-jdk15on.version>
+    </properties>
 </project>
diff --git a/oauth2-framework-impl/oauth2-client/pom.xml b/oauth2-framework-impl/oauth2-client/pom.xml
index 9b2f05c483..4f12095d30 100644
--- a/oauth2-framework-impl/oauth2-client/pom.xml
+++ b/oauth2-framework-impl/oauth2-client/pom.xml
@@ -13,11 +13,6 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <properties>
-        <httpPort>9180</httpPort>
-        <httpsPort>9543</httpsPort>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -26,4 +21,9 @@
             </plugin>
         </plugins>
     </build>
+
+    <properties>
+        <httpPort>9180</httpPort>
+        <httpsPort>9543</httpsPort>
+    </properties>
 </project>
diff --git a/oauth2-framework-impl/oauth2-resource-server/pom.xml b/oauth2-framework-impl/oauth2-resource-server/pom.xml
index 5e5cd087ed..4c82668547 100644
--- a/oauth2-framework-impl/oauth2-resource-server/pom.xml
+++ b/oauth2-framework-impl/oauth2-resource-server/pom.xml
@@ -13,14 +13,6 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <properties>
-        <httpPort>9280</httpPort>
-        <httpsPort>8643</httpsPort>
-        <jwt.issuer>http://localhost:9080</jwt.issuer>
-        <jwt.resourceId>http://localhost:9280</jwt.resourceId>
-        <microprofile-jwt-auth-api.version>1.1</microprofile-jwt-auth-api.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.eclipse.microprofile.jwt</groupId>
@@ -39,4 +31,12 @@
         </plugins>
     </build>
 
+    <properties>
+        <httpPort>9280</httpPort>
+        <httpsPort>8643</httpsPort>
+        <jwt.issuer>http://localhost:9080</jwt.issuer>
+        <jwt.resourceId>http://localhost:9280</jwt.resourceId>
+        <microprofile-jwt-auth-api.version>1.1</microprofile-jwt-auth-api.version>
+    </properties>
+
 </project>
diff --git a/oauth2-framework-impl/pom.xml b/oauth2-framework-impl/pom.xml
index fd1a2c926f..3c98b45112 100644
--- a/oauth2-framework-impl/pom.xml
+++ b/oauth2-framework-impl/pom.xml
@@ -9,15 +9,11 @@
     <packaging>pom</packaging>
     <name>oauth2-framework-impl</name>
 
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <failOnMissingWebXml>false</failOnMissingWebXml>
-        <openliberty.version>RELEASE</openliberty.version>
-        <openliberty.maven.version>2.6.4</openliberty.maven.version>
-        <javaee-web-api.version>8.0</javaee-web-api.version>
-        <microprofile-config-api.version>1.3</microprofile-config-api.version>
-    </properties>
+    <modules>
+        <module>oauth2-authorization-server</module>
+        <module>oauth2-resource-server</module>
+        <module>oauth2-client</module>
+    </modules>
 
     <dependencies>
         <dependency>
@@ -88,9 +84,14 @@
             </plugins>
         </pluginManagement>
     </build>
-    <modules>
-        <module>oauth2-authorization-server</module>
-        <module>oauth2-resource-server</module>
-        <module>oauth2-client</module>
-    </modules>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <failOnMissingWebXml>false</failOnMissingWebXml>
+        <openliberty.version>RELEASE</openliberty.version>
+        <openliberty.maven.version>2.6.4</openliberty.maven.version>
+        <javaee-web-api.version>8.0</javaee-web-api.version>
+        <microprofile-config-api.version>1.3</microprofile-config-api.version>
+    </properties>
 </project>
diff --git a/optaplanner/README.md b/optaplanner/README.md
index 1568a615c0..b7a2dbe14b 100644
--- a/optaplanner/README.md
+++ b/optaplanner/README.md
@@ -1,3 +1,7 @@
+## OptaPlanner
+
+This module contains articles about OptaPlanner.
+
 ### Relevant articles
 
 - [A Guide to OptaPlanner](https://www.baeldung.com/opta-planner)
diff --git a/orika/README.md b/orika/README.md
index 0096793507..094a60aa51 100644
--- a/orika/README.md
+++ b/orika/README.md
@@ -1,2 +1,6 @@
+## Orika
+
+This module contains articles about Orika.
+
 ### Relevant Articles:
 - [Mapping with Orika](https://www.baeldung.com/orika-mapping)
diff --git a/osgi/readme.md b/osgi/README.md
similarity index 94%
rename from osgi/readme.md
rename to osgi/README.md
index ee5d7d66c4..732f624302 100644
--- a/osgi/readme.md
+++ b/osgi/README.md
@@ -1,5 +1,9 @@
-OSGi
-====
+## OSGi
+
+This module contains articles about OSGi.
+
+### Relevant articles:
+ - [Introduction to OSGi](https://www.baeldung.com/osgi)
 
 Info
 ---
@@ -84,11 +88,7 @@ Oxygen.1 	Wed, 6 Sep 2017 -- 17:00 (-0400)
 
 org.eclipse.osgi_3.12.1.v20170821-1548.jar
 
- = = NOT GOOD = =
- 
- ## Relevant articles:
- - [Introduction to OSGi](https://www.baeldung.com/osgi)
- 
+ = = NOT GOOD = = 
 
 
 
diff --git a/parent-java/pom.xml b/parent-java/pom.xml
index 09e2596d0a..fd3028680d 100644
--- a/parent-java/pom.xml
+++ b/parent-java/pom.xml
@@ -1,7 +1,6 @@
 <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>parent-java</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>parent-java</name>
diff --git a/parent-kotlin/pom.xml b/parent-kotlin/pom.xml
index d993fad3c6..bda5fb70e7 100644
--- a/parent-kotlin/pom.xml
+++ b/parent-kotlin/pom.xml
@@ -56,18 +56,15 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-stdlib-jdk8</artifactId>
-			<version>${kotlin.version}</version>
-		</dependency>
+			</dependency>
 		 <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
+            </dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-reflect</artifactId>
-			<version>${kotlin.version}</version>
-		</dependency>
+			</dependency>
 
 		<dependency>
 			<groupId>org.jetbrains.kotlinx</groupId>
@@ -93,7 +90,6 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-test-junit</artifactId>
-			<version>${kotlin.version}</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/parent-spring-4/pom.xml b/parent-spring-4/pom.xml
index 390934ca7b..b98d962580 100644
--- a/parent-spring-4/pom.xml
+++ b/parent-spring-4/pom.xml
@@ -1,7 +1,6 @@
 <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>parent-spring-4</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>parent-spring-4</name>
diff --git a/parent-spring-5/pom.xml b/parent-spring-5/pom.xml
index e43e129c7f..f126006bcb 100644
--- a/parent-spring-5/pom.xml
+++ b/parent-spring-5/pom.xml
@@ -2,7 +2,6 @@
     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>parent-spring-5</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>parent-spring-5</name>
diff --git a/patterns/README.md b/patterns/README.md
new file mode 100644
index 0000000000..bbc48e3f34
--- /dev/null
+++ b/patterns/README.md
@@ -0,0 +1,3 @@
+## Patterns
+
+This module contains articles about design patterns.
diff --git a/patterns/backoff-jitter/README.md b/patterns/design-patterns-cloud/README.md
similarity index 100%
rename from patterns/backoff-jitter/README.md
rename to patterns/design-patterns-cloud/README.md
diff --git a/patterns/backoff-jitter/pom.xml b/patterns/design-patterns-cloud/pom.xml
similarity index 95%
rename from patterns/backoff-jitter/pom.xml
rename to patterns/design-patterns-cloud/pom.xml
index 739aa87873..b5265a1f94 100644
--- a/patterns/backoff-jitter/pom.xml
+++ b/patterns/design-patterns-cloud/pom.xml
@@ -4,10 +4,10 @@
          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>backoff-jitter</artifactId>
+    <artifactId>design-patterns-cloud</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>backoff-jitter</name>
+    <name>design-patterns-cloud</name>
 
     <dependencies>
         <dependency>
@@ -52,4 +52,4 @@
         <resilience4j.version>0.16.0</resilience4j.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/patterns/backoff-jitter/src/test/java/com/baeldung/backoff/jitter/BackoffWithJitterTest.java b/patterns/design-patterns-cloud/src/test/java/com/baeldung/backoff/jitter/BackoffWithJitterTest.java
similarity index 100%
rename from patterns/backoff-jitter/src/test/java/com/baeldung/backoff/jitter/BackoffWithJitterTest.java
rename to patterns/design-patterns-cloud/src/test/java/com/baeldung/backoff/jitter/BackoffWithJitterTest.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Position.java b/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Position.java
new file mode 100644
index 0000000000..dd7694feb6
--- /dev/null
+++ b/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Position.java
@@ -0,0 +1,51 @@
+package com.baeldung.prototype;
+
+public final class Position {
+
+    private final int x;
+    private final int y;
+
+    public Position(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + x;
+        result = prime * result + y;
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Position other = (Position) obj;
+        if (x != other.x)
+            return false;
+        if (y != other.y)
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "Position [x=" + x + ", y=" + y + "]";
+    }
+
+}
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Tree.java b/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Tree.java
new file mode 100644
index 0000000000..f95d568647
--- /dev/null
+++ b/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Tree.java
@@ -0,0 +1,54 @@
+package com.baeldung.prototype;
+
+public class Tree implements Cloneable {
+
+    private double mass;
+    private double height;
+    private Position position;
+
+    public Tree(double mass, double height) {
+        this.mass = mass;
+        this.height = height;
+    }
+
+    public void setMass(double mass) {
+        this.mass = mass;
+    }
+
+    public void setHeight(double height) {
+        this.height = height;
+    }
+
+    public void setPosition(Position position) {
+        this.position = position;
+    }
+
+    public double getMass() {
+        return mass;
+    }
+
+    public double getHeight() {
+        return height;
+    }
+
+    public Position getPosition() {
+        return position;
+    }
+
+    @Override
+    public Tree clone() {
+        Tree tree = null;
+        try {
+            tree = (Tree) super.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return tree;
+    }
+
+    @Override
+    public String toString() {
+        return "Tree [mass=" + mass + ", height=" + height + ", position=" + position + "]";
+    }
+
+}
diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/prototype/TreePrototypeUnitTest.java b/patterns/design-patterns-creational/src/test/java/com/baeldung/prototype/TreePrototypeUnitTest.java
new file mode 100644
index 0000000000..0d06da53d6
--- /dev/null
+++ b/patterns/design-patterns-creational/src/test/java/com/baeldung/prototype/TreePrototypeUnitTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.prototype;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class TreePrototypeUnitTest {
+
+    @Test
+    public void givenATreePrototypeWhenClonedThenCreateA_Clone() {
+        double mass = 10.0;
+        double height = 3.7;
+        Position position = new Position(3, 7);
+        Position otherPosition = new Position(4, 8);
+
+        Tree tree = new Tree(mass, height);
+        tree.setPosition(position);
+        Tree anotherTree = tree.clone();
+        anotherTree.setPosition(otherPosition);
+
+        assertEquals(position, tree.getPosition());
+        assertEquals(otherPosition, anotherTree.getPosition());
+    }
+}
diff --git a/patterns/pom.xml b/patterns/pom.xml
index 196c3c3319..331415bf5b 100644
--- a/patterns/pom.xml
+++ b/patterns/pom.xml
@@ -24,7 +24,7 @@
         <module>design-patterns-structural</module>
         <module>solid</module>
         <module>dip</module>
-        <module>backoff-jitter</module>
+        <module>design-patterns-cloud</module>
     </modules>
 
     <dependencyManagement>
diff --git a/pdf/README.md b/pdf/README.md
index 8525dc4f69..8c7bd1fa26 100644
--- a/pdf/README.md
+++ b/pdf/README.md
@@ -1,3 +1,7 @@
+## PDF
+
+This module contains articles about PDF files.
+
 ### Relevant Articles:
 - [PDF Conversions in Java](https://www.baeldung.com/pdf-conversions-java)
 - [Creating PDF Files in Java](https://www.baeldung.com/java-pdf-creation)
diff --git a/pdf/src/main/java/com/baeldung/pdf/PDFSampleMain.java b/pdf/src/main/java/com/baeldung/pdf/PDFSampleMain.java
new file mode 100644
index 0000000000..195f49e962
--- /dev/null
+++ b/pdf/src/main/java/com/baeldung/pdf/PDFSampleMain.java
@@ -0,0 +1,77 @@
+package com.baeldung.pdf;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.stream.Stream;
+
+import com.itextpdf.text.BadElementException;
+import com.itextpdf.text.BaseColor;
+import com.itextpdf.text.Document;
+import com.itextpdf.text.Element;
+import com.itextpdf.text.Image;
+import com.itextpdf.text.Phrase;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
+import com.itextpdf.text.pdf.PdfWriter;
+
+public class PDFSampleMain {
+
+    public static void main(String[] args) {
+        
+        try {
+            
+            Document document = new Document();
+            PdfWriter.getInstance(document, new FileOutputStream("iTextTable.pdf"));
+
+            document.open();
+
+            PdfPTable table = new PdfPTable(3);
+            addTableHeader(table);
+            addRows(table);
+            addCustomRows(table);
+
+            document.add(table);
+            document.close();
+            
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void addTableHeader(PdfPTable table) {
+        Stream.of("column header 1", "column header 2", "column header 3")
+        .forEach(columnTitle -> {
+            PdfPCell header = new PdfPCell();
+            header.setBackgroundColor(BaseColor.LIGHT_GRAY);
+            header.setBorderWidth(2);
+            header.setPhrase(new Phrase(columnTitle));
+            table.addCell(header);
+        });
+    }
+
+    private static void addRows(PdfPTable table) {
+        table.addCell("row 1, col 1");
+        table.addCell("row 1, col 2");
+        table.addCell("row 1, col 3");
+    }
+
+    private static void addCustomRows(PdfPTable table) throws URISyntaxException, BadElementException, IOException {
+        Path path = Paths.get(ClassLoader.getSystemResource("Java_logo.png").toURI());
+        Image img = Image.getInstance(path.toAbsolutePath().toString());
+        img.scalePercent(10);
+
+        PdfPCell imageCell = new PdfPCell(img);
+        table.addCell(imageCell);
+
+        PdfPCell horizontalAlignCell = new PdfPCell(new Phrase("row 2, col 2"));
+        horizontalAlignCell.setHorizontalAlignment(Element.ALIGN_CENTER);
+        table.addCell(horizontalAlignCell);
+
+        PdfPCell verticalAlignCell = new PdfPCell(new Phrase("row 2, col 3"));
+        verticalAlignCell.setVerticalAlignment(Element.ALIGN_BOTTOM);
+        table.addCell(verticalAlignCell);
+    }
+}
diff --git a/pdf/src/main/resources/Java_logo.png b/pdf/src/main/resources/Java_logo.png
new file mode 100644
index 0000000000..383327b203
Binary files /dev/null and b/pdf/src/main/resources/Java_logo.png differ
diff --git a/performance-tests/README.md b/performance-tests/README.md
index 918c81bb69..09ed26ae19 100644
--- a/performance-tests/README.md
+++ b/performance-tests/README.md
@@ -1,3 +1,7 @@
+## Performance Tests
+
+This module contains articles about performance testing.
+
 ### Relevant Articles: 
 
 - [Performance of Java Mapping Frameworks](https://www.baeldung.com/java-performance-mapping-frameworks)
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 956c0ccfa8..4dc480ef86 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -1,11 +1,11 @@
 <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>performance-tests</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
+    <name>performance-tests</name>
 
     <parent>
         <artifactId>parent-modules</artifactId>
@@ -13,8 +13,6 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <name>performance-tests</name>
-
     <dependencies>
         <dependency>
             <groupId>ma.glasnost.orika</groupId>
diff --git a/persistence-modules/README.md b/persistence-modules/README.md
new file mode 100644
index 0000000000..f6abc5782a
--- /dev/null
+++ b/persistence-modules/README.md
@@ -0,0 +1,3 @@
+## Persistence Modules
+
+This module contains articles about persistence. Actual articles go into its submodules. 
diff --git a/persistence-modules/elasticsearch/pom.xml b/persistence-modules/elasticsearch/pom.xml
index f7bfdb44de..943cfa6a23 100644
--- a/persistence-modules/elasticsearch/pom.xml
+++ b/persistence-modules/elasticsearch/pom.xml
@@ -16,7 +16,6 @@
     </parent>
 
     <dependencies>
-
         <dependency>
             <groupId>io.searchbox</groupId>
             <artifactId>jest</artifactId>
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/wherejointable/Group.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/wherejointable/Group.java
new file mode 100644
index 0000000000..04684eceac
--- /dev/null
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/wherejointable/Group.java
@@ -0,0 +1,56 @@
+package com.baeldung.hibernate.wherejointable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+
+@Entity(name = "e_group")
+public class Group {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    private String name;
+
+    @ManyToMany(mappedBy = "groups")
+    private List<User> users = new ArrayList<>();
+
+    public Group(String name) {
+        this.name = 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;
+    }
+
+    public List<User> getUsers() {
+        return users;
+    }
+
+    public void setUsers(List<User> users) {
+        this.users = users;
+    }
+
+    @Override
+    public String toString() {
+        return "Group [name=" + name + "]";
+    }
+
+}
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/wherejointable/User.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/wherejointable/User.java
new file mode 100644
index 0000000000..7fc077eeb2
--- /dev/null
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/wherejointable/User.java
@@ -0,0 +1,74 @@
+package com.baeldung.hibernate.wherejointable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+
+import org.hibernate.annotations.WhereJoinTable;
+
+@Entity
+public class User {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    private String name;
+
+    @ManyToMany
+    @JoinTable(name = "r_user_group", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "group_id"))
+    private List<Group> groups = new ArrayList<>();
+
+    @WhereJoinTable(clause = "role='MODERATOR'")
+    @ManyToMany
+    @JoinTable(name = "r_user_group", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "group_id"))
+    private List<Group> moderatorGroups = new ArrayList<>();
+
+    public User(String name) {
+        this.name = 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;
+    }
+
+    public List<Group> getGroups() {
+        return groups;
+    }
+
+    public void setGroups(List<Group> groups) {
+        this.groups = groups;
+    }
+
+    public void setModeratorGroups(List<Group> moderatorGroups) {
+        this.moderatorGroups = moderatorGroups;
+    }
+
+    public List<Group> getModeratorGroups() {
+        return moderatorGroups;
+    }
+
+    @Override
+    public String toString() {
+        return "User [name=" + name + "]";
+    }
+
+}
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/wherejointable/UserGroupRelation.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/wherejointable/UserGroupRelation.java
new file mode 100644
index 0000000000..00dd19699c
--- /dev/null
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/wherejointable/UserGroupRelation.java
@@ -0,0 +1,31 @@
+package com.baeldung.hibernate.wherejointable;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Id;
+
+@Entity(name = "r_user_group")
+public class UserGroupRelation implements Serializable {
+
+    @Id
+    @Column(name = "user_id", insertable = false, updatable = false)
+    private final Long userId;
+
+    @Id
+    @Column(name = "group_id", insertable = false, updatable = false)
+    private final Long groupId;
+
+    @Enumerated(EnumType.STRING)
+    private final UserGroupRole role;
+
+    public UserGroupRelation(Long userId, Long groupId, UserGroupRole role) {
+        this.userId = userId;
+        this.groupId = groupId;
+        this.role = role;
+    }
+
+}
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/wherejointable/UserGroupRole.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/wherejointable/UserGroupRole.java
new file mode 100644
index 0000000000..62d9cb28ea
--- /dev/null
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/wherejointable/UserGroupRole.java
@@ -0,0 +1,7 @@
+package com.baeldung.hibernate.wherejointable;
+
+public enum UserGroupRole {
+
+    MEMBER, MODERATOR
+
+}
diff --git a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/wherejointable/HibernateWhereJoinTableIntegrationTest.java b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/wherejointable/HibernateWhereJoinTableIntegrationTest.java
new file mode 100644
index 0000000000..93783216ce
--- /dev/null
+++ b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/wherejointable/HibernateWhereJoinTableIntegrationTest.java
@@ -0,0 +1,118 @@
+package com.baeldung.hibernate.wherejointable;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.service.ServiceRegistry;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class HibernateWhereJoinTableIntegrationTest {
+
+    private static SessionFactory sessionFactory;
+
+    private Session session;
+
+    /**
+     * Test data
+     */
+    private User user1;
+    private User user2;
+    private User user3;
+    private Group group1;
+    private Group group2;
+
+    @BeforeClass
+    public static void beforeTests() {
+        Configuration configuration = new Configuration().addAnnotatedClass(User.class)
+            .addAnnotatedClass(Group.class)
+            .addAnnotatedClass(UserGroupRelation.class)
+            .setProperty("hibernate.dialect", H2Dialect.class.getName())
+            .setProperty("hibernate.connection.driver_class", org.h2.Driver.class.getName())
+            .setProperty("hibernate.connection.url", "jdbc:h2:mem:test")
+            .setProperty("hibernate.connection.username", "sa")
+            .setProperty("hibernate.connection.password", "")
+            .setProperty("hibernate.hbm2ddl.auto", "update");
+        
+        ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
+            .applySettings(configuration.getProperties())
+            .build();
+        
+        sessionFactory = configuration.buildSessionFactory(serviceRegistry);
+    }
+
+    @Before
+    public void setUp() {
+        session = sessionFactory.openSession();
+        session.beginTransaction();
+
+        user1 = new User("user1");
+        user2 = new User("user2");
+        user3 = new User("user3");
+
+        group1 = new Group("group1");
+        group2 = new Group("group2");
+
+        session.save(group1);
+        session.save(group2);
+
+        session.save(user1);
+        session.save(user2);
+        session.save(user3);
+
+        saveRelation(user1, group1, UserGroupRole.MODERATOR);
+        saveRelation(user2, group1, UserGroupRole.MODERATOR);
+        saveRelation(user3, group1, UserGroupRole.MEMBER);
+
+        saveRelation(user1, group2, UserGroupRole.MEMBER);
+        saveRelation(user2, group2, UserGroupRole.MODERATOR);
+    }
+
+    @After
+    public void tearDown() {
+        session.getTransaction().commit();
+        session.close();
+    }
+
+    @AfterClass
+    public static void afterTests() {
+        sessionFactory.close();
+    }
+
+    @Test
+    public void givenUser1_getGroups_returnsAllGroups() {
+        List<Group> groups = user1.getGroups();
+        assertEquals(2, groups.size());
+
+        assertTrue(groups.contains(group1));
+        assertTrue(groups.contains(group2));
+    }
+
+    @Test
+    public void givenUser1_getModeratorGroups_returnsOnlyModeratorGroups() {
+        List<Group> groups = user1.getModeratorGroups();
+        assertEquals(1, groups.size());
+
+        assertTrue(groups.contains(group1));
+    }
+
+    private void saveRelation(User user, Group group, UserGroupRole role) {
+        UserGroupRelation relation = new UserGroupRelation(user.getId(), group.getId(), role);
+
+        session.save(relation);
+        session.flush();
+        session.refresh(user);
+        session.refresh(group);
+    }
+
+}
diff --git a/persistence-modules/hibernate5-2/pom.xml b/persistence-modules/hibernate5-2/pom.xml
new file mode 100644
index 0000000000..ef091c331e
--- /dev/null
+++ b/persistence-modules/hibernate5-2/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<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>hibernate5-2</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>hibernate5-2</name>
+    <packaging>jar</packaging>
+    <description>Hibernate tutorial illustrating the use of named parameters</description>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>5.4.7.Final</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.200</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+    </properties>
+
+</project>
diff --git a/persistence-modules/hibernate5-2/src/main/java/com/baeldung/hibernateparameters/Event.java b/persistence-modules/hibernate5-2/src/main/java/com/baeldung/hibernateparameters/Event.java
new file mode 100644
index 0000000000..7912659a09
--- /dev/null
+++ b/persistence-modules/hibernate5-2/src/main/java/com/baeldung/hibernateparameters/Event.java
@@ -0,0 +1,30 @@
+package com.baeldung.hibernateparameters;
+
+public class Event {
+    private Long id;
+
+    private String title;
+
+    public Event() {
+    }
+
+    public Event(String title) {
+        this.title = title;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    private void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+}
\ No newline at end of file
diff --git a/persistence-modules/hibernate5-2/src/main/resources/com/baeldung/hibernateparameters/Event.hbm.xml b/persistence-modules/hibernate5-2/src/main/resources/com/baeldung/hibernateparameters/Event.hbm.xml
new file mode 100644
index 0000000000..c485080879
--- /dev/null
+++ b/persistence-modules/hibernate5-2/src/main/resources/com/baeldung/hibernateparameters/Event.hbm.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="com.baeldung.hibernateparameters">
+
+    <class name="Event" table="EVENTS">
+        <id name="id" column="EVENT_ID">
+            <generator class="increment"/>
+        </id>
+        <property name="title"/>
+    </class>
+
+</hibernate-mapping>
diff --git a/persistence-modules/hibernate5-2/src/main/resources/hibernate.cfg.xml b/persistence-modules/hibernate5-2/src/main/resources/hibernate.cfg.xml
new file mode 100644
index 0000000000..be564aaf5a
--- /dev/null
+++ b/persistence-modules/hibernate5-2/src/main/resources/hibernate.cfg.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE hibernate-configuration PUBLIC
+        "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+        "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+
+    <session-factory>
+        <property name="connection.driver_class">org.h2.Driver</property>
+        <property name="connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1</property>
+        <property name="connection.username">sa</property>
+        <property name="connection.password"/>
+
+        <property name="connection.pool_size">1</property>
+
+        <property name="dialect">org.hibernate.dialect.H2Dialect</property>
+
+        <property name="cache.provider_class">org.hibernate.cache.internal.NoCacheProvider</property>
+
+        <property name="show_sql">true</property>
+
+        <property name="hbm2ddl.auto">create</property>
+
+        <mapping resource="com/baeldung/hibernateparameters/Event.hbm.xml"/>
+
+    </session-factory>
+
+</hibernate-configuration>
\ No newline at end of file
diff --git a/persistence-modules/hibernate5-2/src/test/java/com/baeldung/hibernateparameters/NamedParameterUnitTest.java b/persistence-modules/hibernate5-2/src/test/java/com/baeldung/hibernateparameters/NamedParameterUnitTest.java
new file mode 100644
index 0000000000..4efa1e1f68
--- /dev/null
+++ b/persistence-modules/hibernate5-2/src/test/java/com/baeldung/hibernateparameters/NamedParameterUnitTest.java
@@ -0,0 +1,73 @@
+package com.baeldung.hibernateparameters;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.query.Query;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class NamedParameterUnitTest {
+    private SessionFactory sessionFactory;
+
+    @Before
+    public void setUp() throws Exception {
+        final StandardServiceRegistry registry = new StandardServiceRegistryBuilder()
+                .configure()
+                .build();
+        try {
+            sessionFactory = new MetadataSources(registry).buildMetadata().buildSessionFactory();
+            Session session = sessionFactory.openSession();
+            session.beginTransaction();
+            session.save(new Event("Event 1"));
+            session.save(new Event("Event 2"));
+            session.getTransaction().commit();
+            session.close();
+        } catch (Exception e) {
+            fail(e);
+            StandardServiceRegistryBuilder.destroy(registry);
+        }
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        if (sessionFactory != null) {
+            sessionFactory.close();
+        }
+    }
+
+    @Test
+    public void whenNamedParameterProvided_thenCorrect() {
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
+        Query<Event> query = session.createQuery("from Event E WHERE E.title = :eventTitle", Event.class);
+
+        // This binds the value "Event1" to the parameter :eventTitle
+        query.setParameter("eventTitle", "Event 1");
+
+        assertEquals(1, query.list().size());
+        session.getTransaction().commit();
+        session.close();
+    }
+
+    @Test(expected = org.hibernate.QueryException.class)
+    public void whenNamedParameterMissing_thenThrowsQueryException() {
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
+        Query<Event> query = session.createQuery("from Event E WHERE E.title = :eventTitle", Event.class);
+
+        try {
+            query.list();
+            fail("We are expecting an exception!");
+        } finally {
+            session.getTransaction().commit();
+            session.close();
+        }
+    }
+}
diff --git a/persistence-modules/java-jpa-2/pom.xml b/persistence-modules/java-jpa-2/pom.xml
index fdd482f833..2488c5ccdf 100644
--- a/persistence-modules/java-jpa-2/pom.xml
+++ b/persistence-modules/java-jpa-2/pom.xml
@@ -1,15 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
@@ -47,6 +48,13 @@
             <version>${postgres.version}</version>
             <scope>runtime</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -79,7 +87,6 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -101,11 +108,13 @@
             </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>
+        <assertj.version>3.11.1</assertj.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/AllergensAsEntity.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/AllergensAsEntity.java
new file mode 100644
index 0000000000..e5e228d013
--- /dev/null
+++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/AllergensAsEntity.java
@@ -0,0 +1,73 @@
+package com.baeldung.jpa.multipletables.multipleentities;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.Table;
+
+import com.baeldung.jpa.multipletables.secondarytable.MealAsSingleEntity;
+
+@Entity
+@Table(name = "allergens")
+public class AllergensAsEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "meal_id")
+    private Long mealId;
+
+    @OneToOne
+    @PrimaryKeyJoinColumn(name = "meal_id")
+    private MealAsSingleEntity meal;
+
+    @Column(name = "peanuts")
+    private boolean peanuts;
+
+    @Column(name = "celery")
+    private boolean celery;
+
+    @Column(name = "sesame_seeds")
+    private boolean sesameSeeds;
+
+    public MealAsSingleEntity getMeal() {
+        return meal;
+    }
+
+    public void setMeal(MealAsSingleEntity meal) {
+        this.meal = meal;
+    }
+
+    public boolean isPeanuts() {
+        return peanuts;
+    }
+
+    public void setPeanuts(boolean peanuts) {
+        this.peanuts = peanuts;
+    }
+
+    public boolean isCelery() {
+        return celery;
+    }
+
+    public void setCelery(boolean celery) {
+        this.celery = celery;
+    }
+
+    public boolean isSesameSeeds() {
+        return sesameSeeds;
+    }
+
+    public void setSesameSeeds(boolean sesameSeeds) {
+        this.sesameSeeds = sesameSeeds;
+    }
+
+    @Override
+    public String toString() {
+        return "AllergensAsEntity [peanuts=" + peanuts + ", celery=" + celery + ", sesameSeeds=" + sesameSeeds + "]";
+    }
+
+}
diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/MealWithMultipleEntities.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/MealWithMultipleEntities.java
new file mode 100644
index 0000000000..74105f8f1f
--- /dev/null
+++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/MealWithMultipleEntities.java
@@ -0,0 +1,75 @@
+package com.baeldung.jpa.multipletables.multipleentities;
+
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "meal")
+public class MealWithMultipleEntities {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "description")
+    private String description;
+
+    @Column(name = "price")
+    private BigDecimal price;
+
+    @OneToOne(mappedBy = "meal")
+    private AllergensAsEntity allergens;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public AllergensAsEntity getAllergens() {
+        return allergens;
+    }
+
+    public void setAllergens(AllergensAsEntity allergens) {
+        this.allergens = allergens;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public String toString() {
+        return "MealWithMultipleEntities [id=" + id + ", name=" + name + ", description=" + description + ", price=" + price + ", allergens=" + allergens + "]";
+    }
+
+}
diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/MealAsSingleEntity.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/MealAsSingleEntity.java
new file mode 100644
index 0000000000..2929f391a4
--- /dev/null
+++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/MealAsSingleEntity.java
@@ -0,0 +1,99 @@
+package com.baeldung.jpa.multipletables.secondarytable;
+
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.SecondaryTable;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "meal")
+@SecondaryTable(name = "allergens", pkJoinColumns = @PrimaryKeyJoinColumn(name = "meal_id"))
+public class MealAsSingleEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "description")
+    private String description;
+
+    @Column(name = "price")
+    private BigDecimal price;
+
+    @Column(name = "peanuts", table = "allergens")
+    private boolean peanuts;
+
+    @Column(name = "celery", table = "allergens")
+    private boolean celery;
+
+    @Column(name = "sesame_seeds", table = "allergens")
+    private boolean sesameSeeds;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public boolean isPeanuts() {
+        return peanuts;
+    }
+
+    public void setPeanuts(boolean peanuts) {
+        this.peanuts = peanuts;
+    }
+
+    public boolean isCelery() {
+        return celery;
+    }
+
+    public void setCelery(boolean celery) {
+        this.celery = celery;
+    }
+
+    public boolean isSesameSeeds() {
+        return sesameSeeds;
+    }
+
+    public void setSesameSeeds(boolean sesameSeeds) {
+        this.sesameSeeds = sesameSeeds;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public String toString() {
+        return "MealAsSingleEntity [id=" + id + ", name=" + name + ", description=" + description + ", price=" + price + ", peanuts=" + peanuts + ", celery=" + celery + ", sesameSeeds=" + sesameSeeds + "]";
+    }
+
+}
diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/AllergensAsEmbeddable.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/AllergensAsEmbeddable.java
new file mode 100644
index 0000000000..1c1f05890b
--- /dev/null
+++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/AllergensAsEmbeddable.java
@@ -0,0 +1,47 @@
+package com.baeldung.jpa.multipletables.secondarytable.embeddable;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class AllergensAsEmbeddable {
+
+    @Column(name = "peanuts", table = "allergens")
+    private boolean peanuts;
+
+    @Column(name = "celery", table = "allergens")
+    private boolean celery;
+
+    @Column(name = "sesame_seeds", table = "allergens")
+    private boolean sesameSeeds;
+
+    public boolean isPeanuts() {
+        return peanuts;
+    }
+
+    public void setPeanuts(boolean peanuts) {
+        this.peanuts = peanuts;
+    }
+
+    public boolean isCelery() {
+        return celery;
+    }
+
+    public void setCelery(boolean celery) {
+        this.celery = celery;
+    }
+
+    public boolean isSesameSeeds() {
+        return sesameSeeds;
+    }
+
+    public void setSesameSeeds(boolean sesameSeeds) {
+        this.sesameSeeds = sesameSeeds;
+    }
+
+    @Override
+    public String toString() {
+        return "AllergensAsEmbeddable [peanuts=" + peanuts + ", celery=" + celery + ", sesameSeeds=" + sesameSeeds + "]";
+    }
+
+}
diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/MealWithEmbeddedAllergens.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/MealWithEmbeddedAllergens.java
new file mode 100644
index 0000000000..87a83157d7
--- /dev/null
+++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/MealWithEmbeddedAllergens.java
@@ -0,0 +1,78 @@
+package com.baeldung.jpa.multipletables.secondarytable.embeddable;
+
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.SecondaryTable;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "meal")
+@SecondaryTable(name = "allergens", pkJoinColumns = @PrimaryKeyJoinColumn(name = "meal_id"))
+public class MealWithEmbeddedAllergens {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "description")
+    private String description;
+
+    @Column(name = "price")
+    private BigDecimal price;
+
+    @Embedded
+    private AllergensAsEmbeddable allergens;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public AllergensAsEmbeddable getAllergens() {
+        return allergens;
+    }
+
+    public void setAllergens(AllergensAsEmbeddable allergens) {
+        this.allergens = allergens;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public String toString() {
+        return "MealWithEmbeddedAllergens [id=" + id + ", name=" + name + ", description=" + description + ", price=" + price + ", allergens=" + allergens + "]";
+    }
+
+}
diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/Exam.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/Exam.java
new file mode 100644
index 0000000000..8bea8e0121
--- /dev/null
+++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/Exam.java
@@ -0,0 +1,103 @@
+package com.baeldung.jpa.text;
+
+import javax.persistence.*;
+
+@Entity
+public class Exam {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    @Lob
+    private String description;
+    @Column(columnDefinition = "text")
+    private String text;
+    @Column(length = 20)
+    private String shortText;
+
+    public Exam() {
+
+    }
+
+    public Exam(String description, String text, String shortText) {
+        this.description = description;
+        this.text = text;
+        this.shortText = shortText;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getShortText() {
+        return shortText;
+    }
+
+    public void setShortText(String shortText) {
+        this.shortText = shortText;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((description == null) ? 0 : description.hashCode());
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((shortText == null) ? 0 : shortText.hashCode());
+        result = prime * result + ((text == null) ? 0 : text.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Exam other = (Exam) obj;
+        if (description == null) {
+            if (other.description != null)
+                return false;
+        } else if (!description.equals(other.description))
+            return false;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        if (shortText == null) {
+            if (other.shortText != null)
+                return false;
+        } else if (!shortText.equals(other.shortText))
+            return false;
+        if (text == null) {
+            if (other.text != null)
+                return false;
+        } else if (!text.equals(other.text))
+            return false;
+        return true;
+    }
+
+}
diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/ExamRepository.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/ExamRepository.java
new file mode 100644
index 0000000000..2ee502bf4c
--- /dev/null
+++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/ExamRepository.java
@@ -0,0 +1,39 @@
+package com.baeldung.jpa.text;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+public class ExamRepository {
+
+    private EntityManagerFactory emf = null;
+
+    public ExamRepository() {
+        emf = Persistence.createEntityManagerFactory("jpa-h2-text");
+    }
+
+    public Exam find(Long id) {
+        EntityManager entityManager = emf.createEntityManager();
+        Exam exam = entityManager.find(Exam.class, id);
+        entityManager.close();
+        return exam;
+    }
+
+    public Exam save(Exam exam) {
+
+        EntityManager entityManager = emf.createEntityManager();
+        entityManager.getTransaction()
+            .begin();
+        exam = entityManager.merge(exam);
+        entityManager.getTransaction()
+            .commit();
+        entityManager.close();
+
+        return exam;
+    }
+
+    public void clean() {
+        emf.close();
+    }
+
+}
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
index 62d7ce0f5e..11e007973f 100644
--- 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
@@ -1,41 +1,150 @@
 <?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
+	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">
+	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-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-unit name="entity-default-values">
+
+	<persistence-unit name="jpa-h2-text">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<class>com.baeldung.jpa.text.Exam</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" />
+		</properties>
+	</persistence-unit>
+
+	<persistence-unit name="entity-default-values">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<class>com.baeldung.jpa.defaultvalues.User</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" />
+		</properties>
+	</persistence-unit>
+
+	<persistence-unit name="jpa-query-types">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<class>com.baeldung.jpa.querytypes.UserEntity</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="users.sql" />
+		</properties>
+	</persistence-unit>
+
+	<persistence-unit name="jpa-projections">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<class>com.baeldung.jpa.projections.Product</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="products_jpa.sql" />
+		</properties>
+	</persistence-unit>
+
+	<persistence-unit name="jpa-h2-criteria">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<class>com.baeldung.jpa.criteria.Item</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="item.sql" />
+		</properties>
+	</persistence-unit>
+
+    <persistence-unit name="jpa-h2-multipltables">
         <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.defaultvalues.User</class>
+        <class>com.baeldung.jpa.multipletables.multipleentities.MealWithMultipleEntities</class>
+        <class>com.baeldung.jpa.multipletables.multipleentities.AllergensAsEntity</class>
+        
+        <class>com.baeldung.jpa.multipletables.secondarytable.MealAsSingleEntity</class>
+        
+        <class>com.baeldung.jpa.multipletables.secondarytable.embeddable.MealWithEmbeddedAllergens</class>
+        <class>com.baeldung.jpa.multipletables.secondarytable.embeddable.AllergensAsEmbeddable</class>
+
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
             <property name="javax.persistence.jdbc.driver"
@@ -46,77 +155,12 @@
             <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="hibernate.hbm2ddl.auto" value="create" />
+            <property name="hibernate.hbm2ddl.import_files" value="multipletables.sql" />
             <property name="show_sql" value="true" />
             <property name="hibernate.temp.use_jdbc_metadata_defaults"
                       value="false" />
         </properties>
     </persistence-unit>
 
-    <persistence-unit name="jpa-query-types">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.querytypes.UserEntity</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="users.sql" />
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="jpa-projections">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.projections.Product</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="products_jpa.sql" />
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="jpa-h2-criteria">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.criteria.Item</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="item.sql" />
-        </properties>
-    </persistence-unit>
-
 </persistence>
\ No newline at end of file
diff --git a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/multipletables/MultipleTablesIntegrationTest.java b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/multipletables/MultipleTablesIntegrationTest.java
new file mode 100644
index 0000000000..99b2cd69ee
--- /dev/null
+++ b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/multipletables/MultipleTablesIntegrationTest.java
@@ -0,0 +1,79 @@
+package com.baeldung.jpa.multipletables;
+
+import static org.assertj.core.api.Assertions.*;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.baeldung.jpa.multipletables.multipleentities.MealWithMultipleEntities;
+import com.baeldung.jpa.multipletables.secondarytable.MealAsSingleEntity;
+import com.baeldung.jpa.multipletables.secondarytable.embeddable.MealWithEmbeddedAllergens;
+
+public class MultipleTablesIntegrationTest {
+
+    private static EntityManagerFactory emf;
+    private static EntityManager em;
+
+    @BeforeClass
+    public static void setup() {
+        emf = Persistence.createEntityManagerFactory("jpa-h2-multipltables");
+        em = emf.createEntityManager();
+    }
+
+    @Test
+    public void entityManager_shouldLoadMealAsSingleEntity() {
+        // given
+        
+        // when
+        MealAsSingleEntity meal = em.find(MealAsSingleEntity.class, 1L);
+        
+        // then
+        assertThat(meal).isNotNull();
+        assertThat(meal.getId()).isEqualTo(1L);
+        assertThat(meal.isPeanuts()).isFalse();
+        assertThat(meal.isCelery()).isTrue();
+    }
+
+    @Test
+    public void entityManager_shouldLoadMealWithEmbeddedAllergens() {
+        // given
+        
+        // when
+        MealWithEmbeddedAllergens meal = em.find(MealWithEmbeddedAllergens.class, 1L);
+        
+        // then
+        assertThat(meal).isNotNull();
+        assertThat(meal.getId()).isEqualTo(1L);
+        assertThat(meal.getAllergens()).isNotNull();
+        assertThat(meal.getAllergens().isPeanuts()).isFalse();
+        assertThat(meal.getAllergens().isCelery()).isTrue();
+    }
+
+    @Test
+    public void entityManager_shouldLoadMealWithAllergensEntity() {
+        // given
+        
+        // when
+        MealWithMultipleEntities meal = em.find(MealWithMultipleEntities.class, 1L);
+        
+        // then
+        assertThat(meal).isNotNull();
+        assertThat(meal.getId()).isEqualTo(1L);
+        assertThat(meal.getAllergens()).isNotNull();
+        assertThat(meal.getAllergens().isPeanuts()).isFalse();
+        assertThat(meal.getAllergens().isCelery()).isTrue();
+    }
+
+    @AfterClass
+    public static void teardown() {
+        if (emf != null) {
+            emf.close();
+        }
+    }
+
+}
diff --git a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/text/JPATextUnitTest.java b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/text/JPATextUnitTest.java
new file mode 100644
index 0000000000..f9f355c464
--- /dev/null
+++ b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/text/JPATextUnitTest.java
@@ -0,0 +1,41 @@
+package com.baeldung.jpa.text;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.persistence.PersistenceException;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class JPATextUnitTest {
+
+    private static ExamRepository examRepository = null;
+
+    @BeforeClass
+    public static void once() {
+        examRepository = new ExamRepository();
+    }
+
+    @Test
+    public void givenExam_whenSaveExam_thenReturnExpectedExam() {
+        Exam exam = new Exam();
+        exam.setDescription("This is a description. Sometimes the description can be very very long! ");
+        exam.setText("This is a text. Sometimes the text can be very very long!");
+        exam.setShortText("A short text");
+
+        exam = examRepository.save(exam);
+
+        assertEquals(examRepository.find(exam.getId()), exam);
+    }
+
+    @Test(expected = PersistenceException.class)
+    public void givenExamWithVeryLongShortText_whenSaveExam_thenThrowPersistenceException() {
+        Exam exam = new Exam();
+        exam.setDescription("This is a very long text");
+        exam.setText("This is a long text");
+        exam.setShortText("This is a very long long short text. Maybe this can cause problems!!");
+
+        examRepository.save(exam);
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/java-jpa-2/src/test/resources/multipletables.sql b/persistence-modules/java-jpa-2/src/test/resources/multipletables.sql
new file mode 100644
index 0000000000..226e63258b
--- /dev/null
+++ b/persistence-modules/java-jpa-2/src/test/resources/multipletables.sql
@@ -0,0 +1,8 @@
+drop table if exists allergens;
+drop table if exists meal;
+
+create table meal (id bigint auto_increment, name varchar(255) not null, description varchar(255) not null, price decimal(19, 2) not null, primary key (id));
+create table allergens (meal_id bigint auto_increment, peanuts number(1) not null, celery number(1) not null, sesame_seeds number(1) not null, primary key (meal_id));
+
+insert into meal (id, name, description, price) values (1, 'Pizza', 'Delicious', 5);
+insert into allergens (meal_id, peanuts, celery, sesame_seeds) values (1, 0, 1, 0);
diff --git a/persistence-modules/java-mongodb/README.md b/persistence-modules/java-mongodb/README.md
index f1542e3ee9..41d0ad63f8 100644
--- a/persistence-modules/java-mongodb/README.md
+++ b/persistence-modules/java-mongodb/README.md
@@ -1,4 +1,8 @@
-## Relevant articles:
+## MongoDB
+
+This module contains articles about MongoDB in Java. 
+
+### Relevant articles:
 
 - [A Guide to MongoDB with Java](http://www.baeldung.com/java-mongodb)
 - [A Simple Tagging Implementation with MongoDB](http://www.baeldung.com/mongodb-tagging)
diff --git a/persistence-modules/jnosql/README.md b/persistence-modules/jnosql/README.md
index d580cbc920..cb126914e9 100644
--- a/persistence-modules/jnosql/README.md
+++ b/persistence-modules/jnosql/README.md
@@ -1,2 +1,6 @@
+## JNoSQL
+
+This module contains articles about JNoSQL. 
+
 ### Relevant Articles: 
 - [A Guide to Eclipse JNoSQL](http://www.baeldung.com/eclipse-jnosql)
diff --git a/persistence-modules/jpa-hibernate-cascade-type/pom.xml b/persistence-modules/jpa-hibernate-cascade-type/pom.xml
index 8cfc2a5fa2..bc6307efb0 100644
--- a/persistence-modules/jpa-hibernate-cascade-type/pom.xml
+++ b/persistence-modules/jpa-hibernate-cascade-type/pom.xml
@@ -2,6 +2,10 @@
 <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">
+    <artifactId>jpa-hibernate-cascade-type</artifactId>
+    <modelVersion>4.0.0</modelVersion>
+    <version>1.0.0-SNAPSHOT</version>
+
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
@@ -9,10 +13,6 @@
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>jpa-hibernate-cascade-type</artifactId>
-    <modelVersion>4.0.0</modelVersion>
-    <version>1.0.0-SNAPSHOT</version>
-
     <dependencies>
         <dependency>
             <groupId>org.hibernate</groupId>
diff --git a/persistence-modules/persistence-libraries/pom.xml b/persistence-modules/persistence-libraries/pom.xml
index cce051f303..273db34ec4 100644
--- a/persistence-modules/persistence-libraries/pom.xml
+++ b/persistence-modules/persistence-libraries/pom.xml
@@ -4,18 +4,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>persistence-libraries</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <name>java-sql2o</name>
 
     <parent>
@@ -45,6 +33,19 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <hsqldb.version>2.4.0</hsqldb.version>
         <junit.version>4.12</junit.version>
diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index 932b62a235..de20b135fa 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -23,7 +23,7 @@
         <module>hibernate5</module>
         <module>hibernate-ogm</module>
         <module>hibernate-mapping</module>
-        <module>hibernate-parameters</module>
+        <module>hibernate5-2</module>
         <module>influxdb</module>
         <module>java-cassandra</module>
         <module>java-cockroachdb</module>
@@ -48,7 +48,9 @@
         <module>spring-data-eclipselink</module>
         <module>spring-data-elasticsearch</module>
         <module>spring-data-gemfire</module>
+        <module>spring-data-geode</module>
         <module>spring-data-jpa</module>
+        <module>spring-data-jpa-3</module>
         <module>spring-data-keyvalue</module>
         <module>spring-data-mongodb</module> <!-- long -->
         <module>spring-data-neo4j</module>
@@ -60,7 +62,7 @@
         <module>spring-jpa</module>
         <module>spring-persistence-simple</module>
         <module>jpa-hibernate-cascade-type</module>
-				<module>r2dbc</module>
+        <module>r2dbc</module>
         <module>spring-boot-jdbi</module>
     </modules>
 </project>
diff --git a/persistence-modules/r2dbc/pom.xml b/persistence-modules/r2dbc/pom.xml
index fd48a47f12..4256da659e 100644
--- a/persistence-modules/r2dbc/pom.xml
+++ b/persistence-modules/r2dbc/pom.xml
@@ -1,91 +1,92 @@
 <?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>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.6.RELEASE</version>
-		<relativePath /> <!-- lookup parent from repository -->
-	</parent>
-	<groupId>org.baeldung.examples.r2dbc</groupId>
-	<artifactId>r2dbc-example</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>r2dbc-example</name>
-	<description>Sample R2DBC Project</description>
+    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>org.baeldung.examples.r2dbc</groupId>
+    <artifactId>r2dbc-example</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>r2dbc-example</name>
+    <description>Sample R2DBC Project</description>
 
-	<properties>
-		<java.version>1.8</java.version>
-		<r2dbc-h2.version>0.8.0.M8</r2dbc-h2.version>
-	</properties>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.1.6.RELEASE</version>
+        <relativePath /> <!-- lookup parent from repository -->
+    </parent>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-webflux</artifactId>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-test</artifactId>
-			<scope>test</scope>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
 
-		<!-- R2DBC H2 Driver -->
-		<dependency>
-			<groupId>io.r2dbc</groupId>
-			<artifactId>r2dbc-h2</artifactId>
-			<version>${r2dbc-h2.version}</version>
-		</dependency>
+        <!-- R2DBC H2 Driver -->
+        <dependency>
+            <groupId>io.r2dbc</groupId>
+            <artifactId>r2dbc-h2</artifactId>
+            <version>${r2dbc-h2.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
-	<!-- Extra repositories for R2DBC-H2 -->
-	<repositories>
+    <!-- Extra repositories for R2DBC-H2 -->
+    <repositories>
 
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
 
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
 
-	</repositories>
+    </repositories>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <r2dbc-h2.version>0.8.0.M8</r2dbc-h2.version>
+    </properties>
 
 </project>
diff --git a/persistence-modules/sirix/README.md b/persistence-modules/sirix/README.md
index b0f6f8d04b..161e60c2cb 100644
--- a/persistence-modules/sirix/README.md
+++ b/persistence-modules/sirix/README.md
@@ -1,3 +1,5 @@
 ## Relevant articles:
 
-- [Introduction to Sirix](https://www.baeldung.com/introduction-to-sirix)
\ No newline at end of file
+- [Introduction to Sirix](https://www.baeldung.com/introduction-to-sirix)
+- [A Guide to SirixDB](https://www.baeldung.com/sirix)
+
diff --git a/persistence-modules/spring-boot-jdbi/pom.xml b/persistence-modules/spring-boot-jdbi/pom.xml
index 3f9bc8ab10..e8904492ac 100644
--- a/persistence-modules/spring-boot-jdbi/pom.xml
+++ b/persistence-modules/spring-boot-jdbi/pom.xml
@@ -1,107 +1,102 @@
 <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.baeldung.boot.jdbi</groupId>
-	<artifactId>spring-boot-jdbi</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>spring-boot-jdbi</name>
-	<description>Sample SpringBoot JDBI Project</description>
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.boot.jdbi</groupId>
+    <artifactId>spring-boot-jdbi</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-boot-jdbi</name>
+    <description>Sample SpringBoot JDBI Project</description>
 
-	<parent>
-		<artifactId>parent-modules</artifactId>
-		<groupId>com.baeldung</groupId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.1.8.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
 
-	<properties>
-		<java.version>1.8</java.version>
-		<jdbi.version>3.9.1</jdbi.version>
-	</properties>
+            <dependency>
+                <groupId>org.jdbi</groupId>
+                <artifactId>jdbi3-spring4</artifactId>
+                <version>${jdbi.version}</version>
+            </dependency>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-dependencies</artifactId>
-				<version>2.1.8.RELEASE</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
+            <dependency>
+                <groupId>org.jdbi</groupId>
+                <artifactId>jdbi3-sqlobject</artifactId>
+                <version>${jdbi.version}</version>
+            </dependency>
 
-			<dependency>
-				<groupId>org.jdbi</groupId>
-				<artifactId>jdbi3-spring4</artifactId>
-				<version>${jdbi.version}</version>
-			</dependency>
+        </dependencies>
+    </dependencyManagement>
 
-			<dependency>
-				<groupId>org.jdbi</groupId>
-				<artifactId>jdbi3-sqlobject</artifactId>
-				<version>${jdbi.version}</version>
-			</dependency>
+    <dependencies>        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.jdbi</groupId>
+            <artifactId>jdbi3-spring4</artifactId>
+        </dependency>
 
-		</dependencies>
-	</dependencyManagement>
+        <dependency>
+            <groupId>org.jdbi</groupId>
+            <artifactId>jdbi3-sqlobject</artifactId>
+        </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-	<dependencies>		
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-jdbc</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.jdbi</groupId>
-			<artifactId>jdbi3-spring4</artifactId>
-		</dependency>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
-		<dependency>
-			<groupId>org.jdbi</groupId>
-			<artifactId>jdbi3-sqlobject</artifactId>
-		</dependency>
-
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+    <properties>
+        <java.version>1.8</java.version>
+        <jdbi.version>3.9.1</jdbi.version>
+    </properties>
 
 </project>
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springbootdatasourceconfig/application/datasources/DataSourceBean.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springbootdatasourceconfig/application/datasources/DataSourceConfig.java
similarity index 92%
rename from persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springbootdatasourceconfig/application/datasources/DataSourceBean.java
rename to persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springbootdatasourceconfig/application/datasources/DataSourceConfig.java
index 9ef9b77aed..52792d3a23 100644
--- a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springbootdatasourceconfig/application/datasources/DataSourceBean.java
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springbootdatasourceconfig/application/datasources/DataSourceConfig.java
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-public class DataSourceBean {
+public class DataSourceConfig {
     
     @Bean
     public DataSource getDataSource() {
diff --git a/persistence-modules/spring-data-eclipselink/pom.xml b/persistence-modules/spring-data-eclipselink/pom.xml
index 61c28dc26f..5ca827db7b 100644
--- a/persistence-modules/spring-data-eclipselink/pom.xml
+++ b/persistence-modules/spring-data-eclipselink/pom.xml
@@ -63,7 +63,6 @@
         </plugins>
     </build>
 
-
     <properties>
         <spring.version>1.5.9.RELEASE</spring.version>
         <eclipselink.version>2.7.0</eclipselink.version>
diff --git a/persistence-modules/spring-data-geode/pom.xml b/persistence-modules/spring-data-geode/pom.xml
new file mode 100644
index 0000000000..abd3049755
--- /dev/null
+++ b/persistence-modules/spring-data-geode/pom.xml
@@ -0,0 +1,94 @@
+<?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-data-geode</artifactId>
+    <name>spring-data-geode</name>
+    <packaging>jar</packaging>
+    <description>Intro to Spring Data Geode</description>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>2.1.9.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot-version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.geode</groupId>
+            <artifactId>spring-geode-starter</artifactId>
+            <version>${spring-geode-starter-version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <version>${spring-boot-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot-version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>com.mysema.maven</groupId>
+                <artifactId>maven-apt-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/generated-sources</outputDirectory>
+                            <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot-version}</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+    	<spring-boot-version>2.1.9.RELEASE</spring-boot-version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <start-class>com.baeldung.springdatageode.app.ClientCacheApp</start-class>
+        <spring-geode-starter-version>1.1.1.RELEASE</spring-geode-starter-version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/app/ClientCacheApp.java b/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/app/ClientCacheApp.java
new file mode 100644
index 0000000000..6e9a33e953
--- /dev/null
+++ b/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/app/ClientCacheApp.java
@@ -0,0 +1,32 @@
+package com.baeldung.springdatageode.app;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.data.gemfire.config.annotation.ClientCacheApplication;
+import org.springframework.data.gemfire.config.annotation.EnableClusterConfiguration;
+import org.springframework.data.gemfire.config.annotation.EnableContinuousQueries;
+import org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions;
+import org.springframework.data.gemfire.config.annotation.EnableIndexing;
+import org.springframework.data.gemfire.repository.config.EnableGemfireRepositories;
+
+import com.baeldung.springdatageode.controller.AppController;
+import com.baeldung.springdatageode.domain.Author;
+import com.baeldung.springdatageode.repo.AuthorRepository;
+import com.baeldung.springdatageode.service.AuthorService;
+
+@SpringBootApplication
+@ClientCacheApplication(subscriptionEnabled = true)
+@EnableEntityDefinedRegions(basePackageClasses = Author.class)
+@EnableIndexing
+@EnableGemfireRepositories(basePackageClasses = AuthorRepository.class)
+@ComponentScan(basePackageClasses = {AppController.class, AuthorService.class})
+@EnableClusterConfiguration(useHttp = true, requireHttps=false)
+@EnableContinuousQueries
+public class ClientCacheApp {
+    
+    public static void main(String[] args) {
+        SpringApplication.run(ClientCacheApp.class, args);
+    }
+    
+}
diff --git a/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/controller/AppController.java b/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/controller/AppController.java
new file mode 100644
index 0000000000..32f931820a
--- /dev/null
+++ b/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/controller/AppController.java
@@ -0,0 +1,37 @@
+package com.baeldung.springdatageode.controller;
+
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baeldung.springdatageode.domain.Author;
+import com.baeldung.springdatageode.repo.AuthorRepository;
+
+@RestController
+@CrossOrigin
+public class AppController {
+
+    @Autowired
+    private AuthorRepository authorRepositoryImpl;
+
+    @PostMapping(path = "/author" )
+    public ResponseEntity<String> addAuthor(@RequestBody Author author) throws Exception {       
+        authorRepositoryImpl.save(author);
+        return new ResponseEntity<>("OK", HttpStatus.OK);
+    }
+    
+    @GetMapping(path = "/author" )
+    public ResponseEntity<Author> getAuthor(@RequestParam("id") String id) throws Exception {
+        Optional<Author> author = authorRepositoryImpl.findById(Long.parseLong(id));
+        return new ResponseEntity<>(author.isPresent() ? author.get() : null, HttpStatus.OK);
+    }
+
+}
diff --git a/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/domain/Author.java b/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/domain/Author.java
new file mode 100644
index 0000000000..4a2e58ff34
--- /dev/null
+++ b/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/domain/Author.java
@@ -0,0 +1,58 @@
+package com.baeldung.springdatageode.domain;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.gemfire.mapping.annotation.Indexed;
+import org.springframework.data.gemfire.mapping.annotation.Region;
+
+@Region(name = "Authors")
+public class Author {
+    
+    @Id
+    private Long id;
+
+    private String firstName;
+
+    private String lastName;
+
+    @Indexed
+    private int age;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    @Override
+    public String toString() {
+        return this.firstName + " " + this.lastName + ", " + this.age + " years old";
+    }
+
+}
+
diff --git a/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/repo/AuthorRepository.java b/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/repo/AuthorRepository.java
new file mode 100644
index 0000000000..92f4165343
--- /dev/null
+++ b/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/repo/AuthorRepository.java
@@ -0,0 +1,11 @@
+package com.baeldung.springdatageode.repo;
+
+import com.baeldung.springdatageode.domain.Author;
+
+import java.util.Optional;
+
+import org.springframework.data.repository.CrudRepository;
+
+public interface AuthorRepository extends CrudRepository<Author, Long> {
+
+}
diff --git a/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/service/AuthorService.java b/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/service/AuthorService.java
new file mode 100644
index 0000000000..1bf4cbaba1
--- /dev/null
+++ b/persistence-modules/spring-data-geode/src/main/java/com/baeldung/springdatageode/service/AuthorService.java
@@ -0,0 +1,14 @@
+package com.baeldung.springdatageode.service;
+
+import org.apache.geode.cache.query.CqEvent;
+import org.springframework.data.gemfire.listener.annotation.ContinuousQuery;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AuthorService {
+    
+    @ContinuousQuery(query = "SELECT * FROM /Authors a WHERE a.id = 1")
+    public void process(CqEvent event) {
+        System.out.println("Author #" + event.getKey() + " updated to " + event.getNewValue());
+    }
+}
diff --git a/persistence-modules/spring-data-geode/src/main/resources/application.properties b/persistence-modules/spring-data-geode/src/main/resources/application.properties
new file mode 100644
index 0000000000..7b7cb5a37b
--- /dev/null
+++ b/persistence-modules/spring-data-geode/src/main/resources/application.properties
@@ -0,0 +1 @@
+server.port=9091
\ No newline at end of file
diff --git a/ml/src/main/resources/logback.xml b/persistence-modules/spring-data-geode/src/main/resources/logback.xml
similarity index 100%
rename from ml/src/main/resources/logback.xml
rename to persistence-modules/spring-data-geode/src/main/resources/logback.xml
diff --git a/persistence-modules/spring-data-jpa-3/pom.xml b/persistence-modules/spring-data-jpa-3/pom.xml
new file mode 100644
index 0000000000..f743fce2a3
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-3/pom.xml
@@ -0,0 +1,78 @@
+<?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-data-jpa-3</artifactId>
+    <name>spring-data-jpa-3</name>
+
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+
+        <!-- Prod Dependencies -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgresql.version}</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>${junit-platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <testcontainers.version>1.12.2</testcontainers.version>
+        <postgresql.version>42.2.8</postgresql.version>
+    </properties>
+
+</project>
diff --git a/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/Application.java b/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/Application.java
new file mode 100644
index 0000000000..c0490d50c6
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/Application.java
@@ -0,0 +1,12 @@
+package com.baeldung;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/tx/Payment.java b/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/tx/Payment.java
new file mode 100644
index 0000000000..37f3d09381
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-3/src/main/java/com/baeldung/tx/Payment.java
@@ -0,0 +1,55 @@
+package com.baeldung.tx;
+
+import javax.persistence.*;
+
+@Entity
+public class Payment {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    private Long amount;
+
+    @Column(unique = true)
+    private String referenceNumber;
+
+    @Enumerated(EnumType.STRING)
+    private State state;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Long amount) {
+        this.amount = amount;
+    }
+
+    public String getReferenceNumber() {
+        return referenceNumber;
+    }
+
+    public void setReferenceNumber(String referenceNumber) {
+        this.referenceNumber = referenceNumber;
+    }
+
+    public State getState() {
+        return state;
+    }
+
+    public void setState(State state) {
+        this.state = state;
+    }
+
+    public enum State {
+        STARTED, FAILED, SUCCESSFUL
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-3/src/test/java/com/baeldung/tx/ManualTransactionIntegrationTest.java b/persistence-modules/spring-data-jpa-3/src/test/java/com/baeldung/tx/ManualTransactionIntegrationTest.java
new file mode 100644
index 0000000000..62d64d4372
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-3/src/test/java/com/baeldung/tx/ManualTransactionIntegrationTest.java
@@ -0,0 +1,171 @@
+package com.baeldung.tx;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import javax.persistence.EntityManager;
+
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace.NONE;
+import static org.springframework.transaction.annotation.Propagation.NOT_SUPPORTED;
+
+@DataJpaTest
+@Testcontainers
+@ActiveProfiles("test")
+@AutoConfigureTestDatabase(replace = NONE)
+@Transactional(propagation = NOT_SUPPORTED)
+class ManualTransactionIntegrationTest {
+
+    @Container
+    private static PostgreSQLContainer<?> pg = initPostgres();
+
+    @Autowired
+    private PlatformTransactionManager transactionManager;
+
+    @Autowired
+    private EntityManager entityManager;
+
+    private TransactionTemplate transactionTemplate;
+
+    @BeforeEach
+    void setUp() {
+        transactionTemplate = new TransactionTemplate(transactionManager);
+    }
+
+    @AfterEach
+    void flushDb() {
+        transactionTemplate.execute(status -> entityManager
+                .createQuery("delete from Payment")
+                .executeUpdate());
+    }
+
+    @Test
+    void givenAPayment_WhenNotDuplicate_ThenShouldCommit() {
+        Long id = transactionTemplate.execute(status -> {
+            Payment payment = new Payment();
+            payment.setAmount(1000L);
+            payment.setReferenceNumber("Ref-1");
+            payment.setState(Payment.State.SUCCESSFUL);
+
+            entityManager.persist(payment);
+
+            return payment.getId();
+        });
+
+        Payment payment = entityManager.find(Payment.class, id);
+        assertThat(payment).isNotNull();
+    }
+
+    @Test
+    void givenAPayment_WhenMarkAsRollback_ThenShouldRollback() {
+        transactionTemplate.execute(status -> {
+            Payment payment = new Payment();
+            payment.setAmount(1000L);
+            payment.setReferenceNumber("Ref-1");
+            payment.setState(Payment.State.SUCCESSFUL);
+
+            entityManager.persist(payment);
+            status.setRollbackOnly();
+
+            return payment.getId();
+        });
+
+        assertThat(entityManager
+                .createQuery("select p from Payment p")
+                .getResultList()).isEmpty();
+    }
+
+    @Test
+    void givenTwoPayments_WhenRefIsDuplicate_ThenShouldRollback() {
+        try {
+            transactionTemplate.execute(s -> {
+                Payment first = new Payment();
+                first.setAmount(1000L);
+                first.setReferenceNumber("Ref-1");
+                first.setState(Payment.State.SUCCESSFUL);
+
+                Payment second = new Payment();
+                second.setAmount(2000L);
+                second.setReferenceNumber("Ref-1");
+                second.setState(Payment.State.SUCCESSFUL);
+
+                entityManager.persist(first);
+                entityManager.persist(second);
+
+                return "Ref-1";
+            });
+        } catch (Exception ignored) {
+        }
+
+        assertThat(entityManager
+                .createQuery("select p from Payment p")
+                .getResultList()).isEmpty();
+    }
+
+    @Test
+    void givenAPayment_WhenNotExpectingAnyResult_ThenShouldCommit() {
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                Payment payment = new Payment();
+                payment.setReferenceNumber("Ref-1");
+                payment.setState(Payment.State.SUCCESSFUL);
+
+                entityManager.persist(payment);
+            }
+        });
+
+        assertThat(entityManager
+                .createQuery("select p from Payment p")
+                .getResultList()).hasSize(1);
+    }
+
+    @Test
+    void givenAPayment_WhenUsingTxManager_ThenShouldCommit() {
+        DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
+        definition.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ);
+        definition.setTimeout(3);
+
+        TransactionStatus status = transactionManager.getTransaction(definition);
+        try {
+            Payment payment = new Payment();
+            payment.setReferenceNumber("Ref-1");
+            payment.setState(Payment.State.SUCCESSFUL);
+
+            entityManager.persist(payment);
+            transactionManager.commit(status);
+        } catch (Exception ex) {
+            transactionManager.rollback(status);
+        }
+
+        assertThat(entityManager
+                .createQuery("select p from Payment p")
+                .getResultList()).hasSize(1);
+    }
+
+    private static PostgreSQLContainer<?> initPostgres() {
+        PostgreSQLContainer<?> pg = new PostgreSQLContainer<>("postgres:11.1")
+                .withDatabaseName("baeldung")
+                .withUsername("test")
+                .withPassword("test");
+        pg.setPortBindings(singletonList("54320:5432"));
+
+        return pg;
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-3/src/test/resources/application-test.properties b/persistence-modules/spring-data-jpa-3/src/test/resources/application-test.properties
new file mode 100644
index 0000000000..aa7093f751
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-3/src/test/resources/application-test.properties
@@ -0,0 +1,4 @@
+spring.jpa.hibernate.ddl-auto=update
+spring.datasource.url=jdbc:postgresql://localhost:54320/baeldung
+spring.datasource.username=test
+spring.datasource.password=test
diff --git a/persistence-modules/spring-hibernate4/README.md b/persistence-modules/spring-hibernate4/README.md
index 020e867c82..c9e2b5abfc 100644
--- a/persistence-modules/spring-hibernate4/README.md
+++ b/persistence-modules/spring-hibernate4/README.md
@@ -1,6 +1,6 @@
-=========
+## Spring with Hibernate 4
 
-## Spring with Hibernate 4 Example Project
+This module contains articles about Spring with Hibernate 4
 
 ### Relevant Articles: 
 - [Guide to Hibernate 4 with Spring](http://www.baeldung.com/hibernate-4-spring)
@@ -20,5 +20,6 @@ cd REST
 mvn install
 mvn cargo:run
 ```
+
 - **note**: starts on port `8082`
 
diff --git a/persistence-modules/spring-mybatis/README.md b/persistence-modules/spring-mybatis/README.md
index 5be328285f..b88fd1c672 100644
--- a/persistence-modules/spring-mybatis/README.md
+++ b/persistence-modules/spring-mybatis/README.md
@@ -1,3 +1,7 @@
-##Relevant Articles
+## Spring MyBatis
+
+This module contains articles about Spring with MyBatis
+
+## Relevant Articles
 
 - [MyBatis with Spring](https://www.baeldung.com/spring-mybatis)
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/persistence/service/transactional/FooTransactionalUnitTest.java b/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/persistence/service/transactional/FooTransactionalUnitTest.java
new file mode 100644
index 0000000000..6f2a499bc5
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/persistence/service/transactional/FooTransactionalUnitTest.java
@@ -0,0 +1,250 @@
+package com.baeldung.persistence.service.transactional;
+
+import com.baeldung.persistence.model.Foo;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Service;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.transaction.IllegalTransactionStateException;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceTransactionalTestConfig.class }, loader = AnnotationConfigContextLoader.class)
+@DirtiesContext
+public class FooTransactionalUnitTest {
+
+    static abstract class BasicFooDao {
+        @PersistenceContext private EntityManager entityManager;
+
+        public Foo findOne(final long id) {
+            return entityManager.find(Foo.class, id);
+        }
+
+        public Foo create(final Foo entity) {
+            entityManager.persist(entity);
+            return entity;
+        }
+    }
+
+    @Repository
+    static class RequiredTransactionalFooDao extends BasicFooDao {
+        @Override
+        @Transactional(propagation = Propagation.REQUIRED)
+        public Foo create(Foo entity) {
+            return super.create(entity);
+        }
+    }
+
+    @Repository
+    static class RequiresNewTransactionalFooDao extends BasicFooDao {
+        @Override
+        @Transactional(propagation = Propagation.REQUIRES_NEW)
+        public Foo create(Foo entity) {
+            return super.create(entity);
+        }
+    }
+
+    @Repository
+    static class SupportTransactionalFooDao extends BasicFooDao {
+        @Override
+        @Transactional(propagation = Propagation.SUPPORTS)
+        public Foo create(Foo entity) {
+            return super.create(entity);
+        }
+    }
+
+    @Repository
+    static class MandatoryTransactionalFooDao extends BasicFooDao {
+        @Override
+        @Transactional(propagation = Propagation.MANDATORY)
+        public Foo create(Foo entity) {
+            return super.create(entity);
+        }
+    }
+
+    @Repository
+    static class SupportTransactionalFooService {
+        @Transactional(propagation = Propagation.SUPPORTS)
+        public Foo identity(Foo entity) {
+            return entity;
+        }
+    }
+
+    @Service
+    static class MandatoryTransactionalFooService {
+        @Transactional(propagation = Propagation.MANDATORY)
+        public Foo identity(Foo entity) {
+            return entity;
+        }
+    }
+
+    @Service
+    static class NotSupportedTransactionalFooService {
+        @Transactional(propagation = Propagation.NOT_SUPPORTED)
+        public Foo identity(Foo entity) {
+            return entity;
+        }
+    }
+
+    @Service
+    static class NeverTransactionalFooService {
+        @Transactional(propagation = Propagation.NEVER)
+        public Foo identity(Foo entity) {
+            return entity;
+        }
+    }
+
+    @Autowired private TransactionTemplate transactionTemplate;
+
+    @Autowired private RequiredTransactionalFooDao requiredTransactionalFooDao;
+
+    @Autowired private RequiresNewTransactionalFooDao requiresNewTransactionalFooDao;
+
+    @Autowired private SupportTransactionalFooDao supportTransactionalFooDao;
+
+    @Autowired private MandatoryTransactionalFooDao mandatoryTransactionalFooDao;
+
+    @Autowired private MandatoryTransactionalFooService mandatoryTransactionalFooService;
+
+    @Autowired private NeverTransactionalFooService neverTransactionalFooService;
+
+    @Autowired private NotSupportedTransactionalFooService notSupportedTransactionalFooService;
+
+    @Autowired private SupportTransactionalFooService supportTransactionalFooService;
+
+    @After
+    public void tearDown(){
+        PersistenceTransactionalTestConfig.clearSpy();
+    }
+
+    @Test
+    public void givenRequiredWithNoActiveTransaction_whenCallCreate_thenExpect1NewAnd0Suspend() {
+        requiredTransactionalFooDao.create(new Foo("baeldung"));
+        PersistenceTransactionalTestConfig.TransactionSynchronizationAdapterSpy transactionSpy = PersistenceTransactionalTestConfig.getSpy();
+        Assert.assertEquals(0, transactionSpy.getSuspend());
+        Assert.assertEquals(1, transactionSpy.getCreate());
+    }
+
+
+
+    @Test
+    public void givenRequiresNewWithNoActiveTransaction_whenCallCreate_thenExpect1NewAnd0Suspend() {
+        requiresNewTransactionalFooDao.create(new Foo("baeldung"));
+        PersistenceTransactionalTestConfig.TransactionSynchronizationAdapterSpy transactionSpy = PersistenceTransactionalTestConfig.getSpy();
+        Assert.assertEquals(0, transactionSpy.getSuspend());
+        Assert.assertEquals(1, transactionSpy.getCreate());
+    }
+
+    @Test
+    public void givenSupportWithNoActiveTransaction_whenCallService_thenExpect0NewAnd0Suspend() {
+        supportTransactionalFooService.identity(new Foo("baeldung"));
+        PersistenceTransactionalTestConfig.TransactionSynchronizationAdapterSpy transactionSpy = PersistenceTransactionalTestConfig.getSpy();
+        Assert.assertEquals(0, transactionSpy.getSuspend());
+        Assert.assertEquals(0, transactionSpy.getCreate());
+    }
+
+    @Test(expected = IllegalTransactionStateException.class)
+    public void givenMandatoryWithNoActiveTransaction_whenCallService_thenExpectIllegalTransactionStateExceptionWith0NewAnd0Suspend() {
+        mandatoryTransactionalFooService.identity(new Foo("baeldung"));
+        PersistenceTransactionalTestConfig.TransactionSynchronizationAdapterSpy transactionSpy = PersistenceTransactionalTestConfig.getSpy();
+        Assert.assertEquals(0, transactionSpy.getSuspend());
+        Assert.assertEquals(0, transactionSpy.getCreate());
+    }
+
+    @Test
+    public void givenNotSupportWithNoActiveTransaction_whenCallService_thenExpect0NewAnd0Suspend() {
+        notSupportedTransactionalFooService.identity(new Foo("baeldung"));
+        PersistenceTransactionalTestConfig.TransactionSynchronizationAdapterSpy transactionSpy = PersistenceTransactionalTestConfig.getSpy();
+        Assert.assertEquals(0, transactionSpy.getSuspend());
+        Assert.assertEquals(0, transactionSpy.getCreate());
+    }
+
+    @Test
+    public void givenNeverWithNoActiveTransaction_whenCallService_thenExpect0NewAnd0Suspend() {
+        neverTransactionalFooService.identity(new Foo("baeldung"));
+        PersistenceTransactionalTestConfig.TransactionSynchronizationAdapterSpy transactionSpy = PersistenceTransactionalTestConfig.getSpy();
+        Assert.assertEquals(0, transactionSpy.getSuspend());
+        Assert.assertEquals(0, transactionSpy.getCreate());
+    }
+
+    @Test
+    public void givenRequiredWithActiveTransaction_whenCallCreate_thenExpect0NewAnd0Suspend() {
+        transactionTemplate.execute(status -> {
+            Foo foo = new Foo("baeldung");
+            return requiredTransactionalFooDao.create(foo);
+        });
+        PersistenceTransactionalTestConfig.TransactionSynchronizationAdapterSpy transactionSpy = PersistenceTransactionalTestConfig.getSpy();
+        Assert.assertEquals(0, transactionSpy.getSuspend());
+        Assert.assertEquals(1, transactionSpy.getCreate());
+    }
+
+    @Test
+    public void givenRequiresNewWithActiveTransaction_whenCallCreate_thenExpect1NewAnd1Suspend() {
+        transactionTemplate.execute(status -> {
+            Foo foo = new Foo("baeldung");
+            return requiresNewTransactionalFooDao.create(foo);
+        });
+        PersistenceTransactionalTestConfig.TransactionSynchronizationAdapterSpy transactionSpy = PersistenceTransactionalTestConfig.getSpy();
+        Assert.assertEquals(1, transactionSpy.getSuspend());
+        Assert.assertEquals(2, transactionSpy.getCreate());
+    }
+
+    @Test
+    public void givenSupportWithActiveTransaction_whenCallCreate_thenExpect0NewAnd0Suspend() {
+        transactionTemplate.execute(status -> {
+            Foo foo = new Foo("baeldung");
+            return supportTransactionalFooDao.create(foo);
+        });
+        PersistenceTransactionalTestConfig.TransactionSynchronizationAdapterSpy transactionSpy = PersistenceTransactionalTestConfig.getSpy();
+        Assert.assertEquals(0, transactionSpy.getSuspend());
+        Assert.assertEquals(1, transactionSpy.getCreate());
+    }
+
+    @Test
+    public void givenMandatoryWithActiveTransaction_whenCallCreate_thenExpect0NewAnd0Suspend() {
+
+        transactionTemplate.execute(status -> {
+            Foo foo = new Foo("baeldung");
+            return mandatoryTransactionalFooDao.create(foo);
+        });
+
+        PersistenceTransactionalTestConfig.TransactionSynchronizationAdapterSpy transactionSpy = PersistenceTransactionalTestConfig.getSpy();
+        Assert.assertEquals(0, transactionSpy.getSuspend());
+        Assert.assertEquals(1, transactionSpy.getCreate());
+    }
+
+    @Test
+    public void givenNotSupportWithActiveTransaction_whenCallCreate_thenExpect0NewAnd1Suspend() {
+        transactionTemplate.execute(status -> {
+            Foo foo = new Foo("baeldung");
+            return notSupportedTransactionalFooService.identity(foo);
+        });
+
+        PersistenceTransactionalTestConfig.TransactionSynchronizationAdapterSpy transactionSpy = PersistenceTransactionalTestConfig.getSpy();
+        Assert.assertEquals(1, transactionSpy.getSuspend());
+        Assert.assertEquals(1, transactionSpy.getCreate());
+    }
+
+    @Test(expected = IllegalTransactionStateException.class)
+    public void givenNeverWithActiveTransaction_whenCallCreate_thenExpectIllegalTransactionStateExceptionWith0NewAnd0Suspend() {
+        transactionTemplate.execute(status -> {
+            Foo foo = new Foo("baeldung");
+            return neverTransactionalFooService.identity(foo);
+        });
+        PersistenceTransactionalTestConfig.TransactionSynchronizationAdapterSpy transactionSpy = PersistenceTransactionalTestConfig.getSpy();
+        Assert.assertEquals(0, transactionSpy.getSuspend());
+        Assert.assertEquals(1, transactionSpy.getCreate());
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/persistence/service/transactional/PersistenceTransactionalTestConfig.java b/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/persistence/service/transactional/PersistenceTransactionalTestConfig.java
new file mode 100644
index 0000000000..fde1857ca2
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/persistence/service/transactional/PersistenceTransactionalTestConfig.java
@@ -0,0 +1,148 @@
+package com.baeldung.persistence.service.transactional;
+
+import com.google.common.base.Preconditions;
+import java.util.Properties;
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+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.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.support.DefaultTransactionStatus;
+import org.springframework.transaction.support.TransactionSynchronizationAdapter;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.transaction.support.TransactionTemplate;
+
+@Configuration
+@EnableTransactionManagement
+@PropertySource({ "classpath:persistence-h2.properties" })
+@ComponentScan({ "com.baeldung.persistence","com.baeldung.jpa.dao" })
+@EnableJpaRepositories(basePackages = "com.baeldung.jpa.dao")
+public class PersistenceTransactionalTestConfig {
+
+    public static class TransactionSynchronizationAdapterSpy extends TransactionSynchronizationAdapter {
+        private int create, suspend;
+
+        public int getSuspend() {
+            return suspend;
+        }
+
+        public int getCreate() {
+            return create;
+        }
+
+        public void create() {
+           create++;
+        }
+
+        @Override
+        public void suspend() {
+            suspend++;
+            super.suspend();
+        }
+    }
+
+
+    public static class JpaTransactionManagerSpy extends JpaTransactionManager {
+        @Override
+        protected void prepareSynchronization(DefaultTransactionStatus status, TransactionDefinition definition) {
+            super.prepareSynchronization(status, definition);
+            if (status.isNewTransaction()) {
+                if ( adapterSpyThreadLocal.get() == null ){
+                    TransactionSynchronizationAdapterSpy spy = new TransactionSynchronizationAdapterSpy();
+                    TransactionSynchronizationManager.registerSynchronization(spy);
+                    adapterSpyThreadLocal.set(spy);
+                }
+                adapterSpyThreadLocal.get().create();
+            }
+        }
+    }
+
+    private static ThreadLocal<TransactionSynchronizationAdapterSpy> adapterSpyThreadLocal = new ThreadLocal<>();
+
+    @Autowired
+    private Environment env;
+
+    public PersistenceTransactionalTestConfig() {
+        super();
+    }
+
+    public static TransactionSynchronizationAdapterSpy getSpy(){
+        if ( adapterSpyThreadLocal.get() == null )
+            return new TransactionSynchronizationAdapterSpy();
+        return adapterSpyThreadLocal.get();
+    }
+
+    public static void clearSpy(){
+       adapterSpyThreadLocal.set(null);
+    }
+
+    // beans
+
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() {
+        final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(dataSource());
+        em.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
+
+        final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+        em.setJpaVendorAdapter(vendorAdapter);
+        em.setJpaProperties(additionalProperties());
+
+        return em;
+    }
+
+    @Bean
+    public DataSource dataSource() {
+        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
+        dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
+        dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user")));
+        dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass")));
+
+        return dataSource;
+    }
+
+
+
+    @Bean
+    public PlatformTransactionManager transactionManager(final EntityManagerFactory emf) {
+        final JpaTransactionManagerSpy transactionManager = new JpaTransactionManagerSpy();
+        transactionManager.setEntityManagerFactory(emf);
+        return transactionManager;
+    }
+
+    @Bean
+    public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
+        return new PersistenceExceptionTranslationPostProcessor();
+    }
+
+    final Properties additionalProperties() {
+        final Properties hibernateProperties = new Properties();
+        hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
+        hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
+        hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", "false");
+        return hibernateProperties;
+    }
+
+
+    @Bean
+    public TransactionTemplate transactionTemplate(PlatformTransactionManager transactionManager){
+        TransactionTemplate template = new TransactionTemplate(transactionManager);
+        template.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        return template;
+    }
+
+
+}
\ No newline at end of file
diff --git a/play-framework/README.md b/play-framework/README.md
index 2309b67422..a28c3f7ad7 100644
--- a/play-framework/README.md
+++ b/play-framework/README.md
@@ -1,4 +1,8 @@
-###Relevant Articles:
+## Play Framework
+
+This module contains articles about the Play Framework.
+
+### Relevant Articles:
 - [REST API with Play Framework in Java](https://www.baeldung.com/rest-api-with-play)
 - [Routing In Play Applications in Java](https://www.baeldung.com/routing-in-play)
 - [Introduction To Play In Java](https://www.baeldung.com/java-intro-to-the-play-framework)
diff --git a/pom.xml b/pom.xml
index d15e7f22ff..5404c908d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,415 +1,416 @@
 <?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>
+         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>parent-modules</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<name>parent-modules</name>
-	<packaging>pom</packaging>
+    <groupId>com.baeldung</groupId>
+    <artifactId>parent-modules</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <name>parent-modules</name>
+    <packaging>pom</packaging>
 
-	<dependencies>
-		<!-- logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${org.slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-			<version>${logback.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${org.slf4j.version}</version>
-		</dependency>
+    <dependencies>
+        <!-- logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
 
-		<!-- test -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
-			<version>${junit-jupiter.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-params</artifactId>
-			<version>${junit-jupiter.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>${junit-jupiter.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-core</artifactId>
-			<version>${org.hamcrest.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.hamcrest</groupId>
-			<artifactId>hamcrest-all</artifactId>
-			<version>${org.hamcrest.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>${mockito.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.surefire</groupId>
-			<artifactId>surefire-logger-api</artifactId>
-			<version>${maven-surefire-plugin.version}</version>
-			<!-- to get around bug https://github.com/junit-team/junit5/issues/801 -->
-			<scope>test</scope>
-			<optional>true</optional>
-		</dependency>
-	</dependencies>
+        <!-- test -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <version>${org.hamcrest.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.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>${org.hamcrest.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-logger-api</artifactId>
+            <version>${maven-surefire-plugin.version}</version>
+            <!-- to get around bug https://github.com/junit-team/junit5/issues/801 -->
+            <scope>test</scope>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<version>${exec-maven-plugin.version}</version>
-				<configuration>
-					<executable>maven</executable>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven-surefire-plugin.version}</version>
-				<configuration>
-					<forkCount>3</forkCount>
-					<reuseForks>true</reuseForks>
-					<excludes>
-						<exclude>**/*IntegrationTest.java</exclude>
-						<exclude>**/*IntTest.java</exclude>
-						<exclude>**/*LongRunningUnitTest.java</exclude>
-						<exclude>**/*ManualTest.java</exclude>
-						<exclude>**/JdbcTest.java</exclude>
-						<exclude>**/*LiveTest.java</exclude>
-					</excludes>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.junit.platform</groupId>
-						<artifactId>junit-platform-surefire-provider</artifactId>
-						<version>${junit-platform.version}</version>
-					</dependency>
-					<dependency>
-						<groupId>org.junit.jupiter</groupId>
-						<artifactId>junit-jupiter-engine</artifactId>
-						<version>${junit-jupiter.version}</version>
-					</dependency>
-					<dependency>
-						<groupId>org.junit.vintage</groupId>
-						<artifactId>junit-vintage-engine</artifactId>
-						<version>${junit-jupiter.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<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>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<version>${maven-pmd-plugin.version}</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.baeldung.pmd</groupId>
-						<artifactId>custom-pmd</artifactId>
-						<version>${custom-pmd.version}</version>
-					</dependency>
-				</dependencies>
-				<configuration>
-					<failurePriority>5</failurePriority>
-					<aggregate>false</aggregate>
-					<failOnViolation>true</failOnViolation>
-					<verbose>true</verbose>
-					<linkXRef>true</linkXRef>
-					<includeTests>true</includeTests>
-					<sourceEncoding>UTF-8</sourceEncoding>
-					<targetJdk>${java.version}</targetJdk>
-					<rulesets>
-						<ruleset>${tutorialsproject.basedir}/baeldung-pmd-rules.xml</ruleset>
-					</rulesets>
-					<excludeRoots>
-						<excludeRoot>target/generated-sources</excludeRoot>
-					</excludeRoots>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.commonjava.maven.plugins</groupId>
-				<artifactId>directory-maven-plugin</artifactId>
-				<version>${directory-maven-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>directories</id>
-						<goals>
-							<goal>directory-of</goal>
-						</goals>
-						<phase>validate</phase>
-						<configuration>
-							<property>tutorialsproject.basedir</property>
-							<project>
-								<groupId>com.baeldung</groupId>
-								<artifactId>parent-modules</artifactId>
-							</project>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-install-plugin</artifactId>
-				<version>${maven-install-plugin.version}</version>
-				<configuration>
-					<groupId>org.baeldung.pmd</groupId>
-					<artifactId>custom-pmd</artifactId>
-					<version>${custom-pmd.version}</version>
-					<packaging>jar</packaging>
-					<file>${tutorialsproject.basedir}/custom-pmd-${custom-pmd.version}.jar</file>
-					<generatePom>true</generatePom>
-				</configuration>
-				<executions>
-					<execution>
-						<id>install-jar-lib</id>
-						<goals>
-							<goal>install-file</goal>
-						</goals>
-						<phase>validate</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>${maven-war-plugin.version}</version>
-			</plugin>
-		</plugins>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>${exec-maven-plugin.version}</version>
+                <configuration>
+                    <executable>maven</executable>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <forkCount>3</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*IntTest.java</exclude>
+                        <exclude>**/*LongRunningUnitTest.java</exclude>
+                        <exclude>**/*ManualTest.java</exclude>
+                        <exclude>**/JdbcTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.platform</groupId>
+                        <artifactId>junit-platform-surefire-provider</artifactId>
+                        <version>${junit-platform.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit-jupiter.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.vintage</groupId>
+                        <artifactId>junit-vintage-engine</artifactId>
+                        <version>${junit-jupiter.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <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>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>${maven-pmd-plugin.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.baeldung.pmd</groupId>
+                        <artifactId>custom-pmd</artifactId>
+                        <version>${custom-pmd.version}</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <failurePriority>5</failurePriority>
+                    <aggregate>false</aggregate>
+                    <failOnViolation>true</failOnViolation>
+                    <verbose>true</verbose>
+                    <linkXRef>true</linkXRef>
+                    <includeTests>true</includeTests>
+                    <sourceEncoding>UTF-8</sourceEncoding>
+                    <targetJdk>${java.version}</targetJdk>
+                    <rulesets>
+                        <ruleset>${tutorialsproject.basedir}/baeldung-pmd-rules.xml</ruleset>
+                    </rulesets>
+                    <excludeRoots>
+                        <excludeRoot>target/generated-sources</excludeRoot>
+                    </excludeRoots>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.commonjava.maven.plugins</groupId>
+                <artifactId>directory-maven-plugin</artifactId>
+                <version>${directory-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>directories</id>
+                        <goals>
+                            <goal>directory-of</goal>
+                        </goals>
+                        <phase>validate</phase>
+                        <configuration>
+                            <property>tutorialsproject.basedir</property>
+                            <project>
+                                <groupId>com.baeldung</groupId>
+                                <artifactId>parent-modules</artifactId>
+                            </project>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>${maven-install-plugin.version}</version>
+                <configuration>
+                    <groupId>org.baeldung.pmd</groupId>
+                    <artifactId>custom-pmd</artifactId>
+                    <version>${custom-pmd.version}</version>
+                    <packaging>jar</packaging>
+                    <file>${tutorialsproject.basedir}/custom-pmd-${custom-pmd.version}.jar</file>
+                    <generatePom>true</generatePom>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>install-jar-lib</id>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <phase>validate</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+            </plugin>
+        </plugins>
 
-		<extensions>
-			<extension>
-				<groupId>com.vackosar.gitflowincrementalbuilder</groupId>
-				<artifactId>gitflow-incremental-builder</artifactId>
-				<version>${gitflow-incremental-builder.version}</version>
-			</extension>
-		</extensions>
-		<pluginManagement>
-			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings
-					only. It has no influence on the Maven build itself. -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.commonjava.maven.plugins
-										</groupId>
-										<artifactId>
-											directory-maven-plugin
-										</artifactId>
-										<versionRange>
-											[0.3.1,)
-										</versionRange>
-										<goals>
-											<goal>directory-of</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.apache.maven.plugins
-										</groupId>
-										<artifactId>
-											maven-install-plugin
-										</artifactId>
-										<versionRange>
-											[2.5.1,)
-										</versionRange>
-										<goals>
-											<goal>install-file</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
+        <extensions>
+            <extension>
+                <groupId>com.vackosar.gitflowincrementalbuilder</groupId>
+                <artifactId>gitflow-incremental-builder</artifactId>
+                <version>${gitflow-incremental-builder.version}</version>
+            </extension>
+        </extensions>
+        <pluginManagement>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse m2e settings
+                    only. It has no influence on the Maven build itself. -->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.commonjava.maven.plugins
+                                        </groupId>
+                                        <artifactId>
+                                            directory-maven-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [0.3.1,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>directory-of</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.apache.maven.plugins
+                                        </groupId>
+                                        <artifactId>
+                                            maven-install-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [2.5.1,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>install-file</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
-	<profiles>
+    <profiles>
 
-		<profile>
-			<id>default-first</id>
-			<build>
-				<plugins>
+        <profile>
+            <id>default-first</id>
+            <build>
+                <plugins>
 
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<version>${maven-surefire-plugin.version}</version>
-						<configuration>
-							<forkCount>3</forkCount>
-							<reuseForks>true</reuseForks>
-							<includes>
-								<include>SpringContextTest</include>
-								<include>**/*UnitTest</include>
-							</includes>
-							<excludes>
-								<exclude>**/*IntegrationTest.java</exclude>
-								<exclude>**/*IntTest.java</exclude>
-								<exclude>**/*LongRunningUnitTest.java</exclude>
-								<exclude>**/*ManualTest.java</exclude>
-								<exclude>**/JdbcTest.java</exclude>
-								<exclude>**/*LiveTest.java</exclude>
-							</excludes>
-						</configuration>
-					</plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                        <configuration>
+                            <forkCount>3</forkCount>
+                            <reuseForks>true</reuseForks>
+                            <includes>
+                                <include>SpringContextTest</include>
+                                <include>**/*UnitTest</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/*IntegrationTest.java</exclude>
+                                <exclude>**/*IntTest.java</exclude>
+                                <exclude>**/*LongRunningUnitTest.java</exclude>
+                                <exclude>**/*ManualTest.java</exclude>
+                                <exclude>**/JdbcTest.java</exclude>
+                                <exclude>**/*LiveTest.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
 
-				</plugins>
-			</build>
+                </plugins>
+            </build>
 
-			<modules>
-				<module>parent-boot-1</module>
-				<module>parent-boot-2</module>
-				<module>parent-spring-4</module>
-				<module>parent-spring-5</module>
-				<module>parent-java</module>
-				<module>parent-kotlin</module>
-				<!-- <module>akka-http</module> --> <!-- Unit test is failing -->
-				<module>akka-streams</module>
-				<module>algorithms-genetic</module>
-				<module>algorithms-miscellaneous-1</module>
-				<module>algorithms-miscellaneous-2</module>
-				<module>algorithms-miscellaneous-3</module>
-				<module>algorithms-miscellaneous-4</module>
-				<module>algorithms-miscellaneous-5</module>
-				<module>algorithms-sorting</module>
-				<module>animal-sniffer-mvn-plugin</module>
-				<module>annotations</module>
-				<module>antlr</module>
-				<module>apache-avro</module>
-				<module>apache-bval</module>
-				<module>apache-curator</module>
-				<module>apache-cxf</module>
-				<module>apache-fop</module>
-				<module>apache-geode</module>
-				<module>apache-meecrowave</module>
-				<module>apache-olingo/olingo2</module>
-				<module>apache-opennlp</module>
-				<module>apache-poi</module>
-				<module>apache-pulsar</module>
-				<module>apache-shiro</module>
-				<module>apache-solrj</module>
-				<module>apache-spark</module>
-				<module>apache-thrift</module>
-				<module>apache-tika</module>
-				<module>apache-velocity</module>
-				<module>apache-zookeeper</module>
-				<module>asciidoctor</module>
-				<module>asm</module>
-				<module>atomix</module>
-				<module>aws</module>
-				<module>aws-lambda</module>
-				<module>axon</module>
-				<module>azure</module>
+            <modules>
+                <module>parent-boot-1</module>
+                <module>parent-boot-2</module>
+                <module>parent-spring-4</module>
+                <module>parent-spring-5</module>
+                <module>parent-java</module>
+                <module>parent-kotlin</module>
+                <!-- <module>akka-http</module> --> <!-- Unit test is failing -->
+                <module>akka-streams</module>
+                <module>algorithms-genetic</module>
+                <module>algorithms-miscellaneous-1</module>
+                <module>algorithms-miscellaneous-2</module>
+                <module>algorithms-miscellaneous-3</module>
+                <module>algorithms-miscellaneous-4</module>
+                <module>algorithms-miscellaneous-5</module>
+                <module>algorithms-sorting</module>
+                <module>animal-sniffer-mvn-plugin</module>
+                <module>annotations</module>
+                <module>antlr</module>
+                <module>apache-avro</module>
+                <module>apache-bval</module>
+                <module>apache-curator</module>
+                <module>apache-cxf</module>
+                <module>apache-fop</module>
+                <module>apache-geode</module>
+                <module>apache-meecrowave</module>
+                <module>apache-olingo/olingo2</module>
+                <module>apache-opennlp</module>
+                <module>apache-poi</module>
+                <module>apache-pulsar</module>
+                <module>apache-shiro</module>
+                <module>apache-solrj</module>
+                <module>apache-spark</module>
+                <module>apache-thrift</module>
+                <module>apache-tika</module>
+                <module>apache-velocity</module>
+                <module>apache-zookeeper</module>
+                <module>asciidoctor</module>
+                <module>asm</module>
+                <module>atomix</module>
+                <module>aws</module>
+                <module>aws-lambda</module>
+                <module>axon</module>
+                <module>azure</module>
 
-				<module>bazel</module>
-				<module>blade</module>
-				<module>bootique</module>
+                <module>bazel</module>
+                <module>blade</module>
+                <module>bootique</module>
 
-				<module>cas</module>
-				<module>cdi</module>
-				<module>checker-plugin</module>
-				<module>cloud-foundry-uaa/cf-uaa-oauth2-client</module>
-				<module>cloud-foundry-uaa/cf-uaa-oauth2-resource-server</module>
-				<module>code-generation</module>
+                <module>cas</module>
+                <module>cdi</module>
+                <module>checker-plugin</module>
+                <module>cloud-foundry-uaa/cf-uaa-oauth2-client</module>
+                <module>cloud-foundry-uaa/cf-uaa-oauth2-resource-server</module>
+                <module>code-generation</module>
 				<module>core-groovy</module>
-				<module>core-groovy-2</module>
-				<module>core-groovy-collections</module>
-				<!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
-				<!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
-				<!-- <module>core-java-modules/core-java-12</module> --> <!-- We haven't upgraded to java 12. Fixing in BAEL-10841 -->
-				<module>core-java-modules/core-java-8</module>
-				<module>core-java-modules/core-java-8-2</module>
-				<module>core-java-modules/core-java-annotations</module>
-				<module>core-java-modules/core-java-streams</module>
-				<module>core-java-modules/core-java-function</module>
-				<module>core-java-modules/core-java-lang-math</module>
-				<module>core-java-modules/core-java-datetime</module>
-				<module>core-java-modules/core-java-text</module>
-				<module>core-java-modules/core-java-lambdas</module>
+                <module>core-groovy-2</module>
+                <module>core-groovy-collections</module>
+                <!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
+                <!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
+                <!-- <module>core-java-modules/core-java-12</module> --> <!-- We haven't upgraded to java 12. Fixing in BAEL-10841 -->
+                <module>core-java-modules/core-java-8</module>
+                <module>core-java-modules/core-java-8-2</module>
+                <module>core-java-modules/core-java-annotations</module>
+                <module>core-java-modules/core-java-streams</module>
+                <module>core-java-modules/core-java-function</module>
+                <module>core-java-modules/core-java-lang-math</module>
+                <!--<module>core-java-modules/core-java-datetime-conversion</module>-->  <!-- We haven't upgraded to java 9.-->
+                <!--<module>core-java-modules/core-java-datetime-string</module>--> <!-- We haven't upgraded to java 9.-->
+                <module>core-java-modules/core-java-text</module>
+                <module>core-java-modules/core-java-lambdas</module>
                 <!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
                 <!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
                 <module>core-java-modules/core-java-arrays</module>
                 <module>core-java-modules/core-java-arrays-2</module>
                 <module>core-java-modules/core-java-collections</module>
-				<module>core-java-modules/core-java-collections-2</module>
-				<module>core-java-modules/core-java-collections-3</module>
+                <module>core-java-modules/core-java-collections-2</module>
+                <module>core-java-modules/core-java-collections-3</module>
                 <module>core-java-modules/core-java-collections-list</module>
                 <module>core-java-modules/core-java-collections-list-2</module>
                 <module>core-java-modules/core-java-collections-list-3</module>
                 <module>core-java-modules/core-java-collections-array-list</module>
                 <module>core-java-modules/core-java-collections-set</module>
                 <module>core-java-modules/core-java-concurrency-basic</module>
-				<module>core-java-modules/core-java-concurrency-basic-2</module>
+                <module>core-java-modules/core-java-concurrency-basic-2</module>
                 <module>core-java-modules/core-java-concurrency-collections</module>
                 <module>core-java-modules/core-java-io</module>
                 <module>core-java-modules/core-java-io-files</module>
@@ -419,15 +420,18 @@
                 <module>core-java-modules/core-java-lang-syntax</module>
                 <module>core-java-modules/core-java-lang-syntax-2</module>
                 <module>core-java-modules/core-java-lang</module>
-				<module>core-java-modules/core-java-lang-2</module>
+                <module>core-java-modules/core-java-lang-2</module>
                 <module>core-java-modules/core-java-lang-oop</module>
                 <module>core-java-modules/core-java-lang-oop-2</module>
-				<module>core-java-modules/core-java-lang-oop-3</module>
+                <module>core-java-modules/core-java-lang-oop-3</module>
                 <module>core-java-modules</module>
                 <module>core-java-modules/core-java-networking</module>
                 <module>core-java-modules/core-java-perf</module>
                 <module>core-java-modules/core-java-reflection</module>
                 <module>core-java-modules/core-java-sun</module>
+                <module>core-java-modules/core-java-string-conversions</module>
+                <module>core-java-modules/core-java-string-conversions-2</module>
+                <module>core-java-modules/core-java-string-apis</module>
                 <module>core-java-modules/core-java</module>
                 <module>core-java-modules/core-java-jvm</module>
                 <module>core-scala</module>
@@ -457,8 +461,768 @@
                 <module>grpc</module>
                 <module>gson</module>
                 <module>guava</module>
-				<module>guava-io</module>
+                <module>guava-io</module>
                 <module>guava-collections</module>
+                <module>guava-collections-map</module>
+				<module>guava-collections-set</module>
+                <module>guava-modules</module>
+                <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
+                <module>guice</module>
+
+                <module>hazelcast</module>
+                <module>helidon</module>
+                <module>httpclient</module>
+                <module>httpclient-simple</module>
+                <module>hystrix</module>
+
+                <module>image-processing</module>
+                <module>immutables</module>
+
+                <module>jackson</module>
+                <module>jackson-2</module>
+                <module>jackson-simple</module>
+                <module>java-collections-conversions</module>
+                <module>java-collections-maps</module>
+                <module>java-collections-maps-2</module>
+                <module>java-jdi</module>
+                <!--<module>java-dates</module>-->
+                <!-- <module>java-ee-8-security-api</module> --> <!-- long running -->
+                <module>java-lite</module>
+                <module>java-math</module>
+                <module>java-numbers</module>
+                <module>java-numbers-2</module>
+                <module>java-rmi</module>
+                <module>java-spi</module>
+                <module>java-streams</module>
+                <!-- <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>
+                <module>javax-servlets</module>
+                <module>javaxval</module>
+                <module>jaxb</module>
+                <!-- JIRA-10842
+                <module>jee-7</module> -->
+                <module>jee-7-security</module>
+                <module>jee-kotlin</module>
+                <module>jersey</module>
+                <module>jgit</module>
+                <module>jgroups</module>
+                <module>jhipster-5</module>
+                <module>jib</module>
+                <module>jjwt</module>
+                <module>jmeter</module>
+                <module>jmh</module>
+                <module>jni</module>
+                <module>jooby</module>
+                <module>jsf</module>
+                <module>json</module>
+                <module>json-path</module>
+                <module>jsoup</module>
+                <module>jta</module>
+
+                <!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
+                <module>kotlin-libraries</module>
+                <module>kotlin-libraries-2</module>
+
+                <!-- <module>lagom</module> --> <!-- Not a maven project -->
+                <module>libraries</module>
+                <module>libraries-2</module>
+                <module>libraries-data</module>
+                <module>libraries-data-2</module>
+                <module>libraries-data-db</module>
+				<module>libraries-data-io</module>
+				<module>libraries-apache-commons</module>
+                <module>libraries-apache-commons-collections</module>
+                <module>libraries-apache-commons-io</module>
+                <module>libraries-primitive</module>
+                <module>libraries-testing</module>
+                <module>libraries-security</module>
+                <module>libraries-server</module>
+                <module>libraries-http</module>
+                <module>libraries-io</module>
+                <module>linkrest</module>
+                <module>logging-modules</module>
+                <module>lombok</module>
+                <module>lucene</module>
+
+                <module>mapstruct</module>
+                <!-- <module>maven-all/compiler-plugin-java-9</module> --> <!-- We haven't upgraded to java 9. -->
+                <module>maven-all/maven</module>
+                <module>maven-all/maven-war-plugin</module>
+                <module>maven-all/profiles</module>
+                <module>maven-all/versions-maven-plugin</module>
+                <module>maven-archetype</module>
+                <!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->
+                <module>maven-polyglot/maven-polyglot-json-extension</module>
+                <!-- <module>maven-polyglot/maven-polyglot-yml-app</module> --> <!-- Not a maven project -->
+                <module>mesos-marathon</module>
+                <module>metrics</module>
+                <!-- <module>micronaut</module> --> <!-- Fixing in BAEL-10877 -->
+                <module>microprofile</module>
+                <module>msf4j</module>
+                <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
+                <module>mustache</module>
+                <module>mybatis</module>
+
+
+                <module>optaplanner</module>
+                <module>orika</module>
+                <module>osgi</module>
+
+                <module>patterns</module>
+                <module>pdf</module>
+                <module>performance-tests</module>
+                <!-- <module>play-framework</module> --> <!-- Not a maven project -->
+                <module>protobuffer</module>
+
+                <module>persistence-modules</module>
+                <module>quarkus</module>
+
+                <module>rabbitmq</module>
+                <!-- <module>raml</module> --> <!-- Not a maven project -->
+                <module>ratpack</module>
+                <module>reactor-core</module>
+                <module>resteasy</module>
+                <module>restx</module>
+                <!-- <module>rmi</module> --> <!-- Not a maven project -->
+                <module>rule-engines</module>
+                <module>rsocket</module>
+                <module>rxjava</module>
+                <module>rxjava-2</module>
+                <module>software-security/sql-injection-samples</module>
+
+                <module>tensorflow-java</module>
+                <module>spf4j</module>
+                <module>spring-boot-configuration</module>
+				<module>spring-boot-flowable</module>
+                <module>spring-boot-mvc-2</module>
+                <module>spring-boot-performance</module>
+                <module>spring-boot-properties</module>
+                <!-- <module>spring-mvc-basics</module> --> <!-- Compilation failure -->
+                <module>spring-security-kerberos</module>
+                <module>oauth2-framework-impl</module>
+
+                <module>spring-boot-nashorn</module>
+                <module>java-blockchain</module>
+<module>wildfly</module>
+            </modules>
+
+        </profile>
+
+        <profile>
+            <id>default-second</id>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                        <configuration>
+                            <forkCount>3</forkCount>
+                            <reuseForks>true</reuseForks>
+                            <includes>
+                                <include>SpringContextTest</include>
+                                <include>**/*UnitTest</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/*IntegrationTest.java</exclude>
+                                <exclude>**/*IntTest.java</exclude>
+                                <exclude>**/*LongRunningUnitTest.java</exclude>
+                                <exclude>**/*ManualTest.java</exclude>
+                                <exclude>**/*JdbcTest.java</exclude>
+                                <exclude>**/*LiveTest.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+
+                </plugins>
+            </build>
+
+            <modules>
+                <module>parent-boot-1</module>
+                <module>parent-boot-2</module>
+                <module>parent-spring-4</module>
+                <module>parent-spring-5</module>
+                <module>parent-java</module>
+                <module>parent-kotlin</module>
+
+                <module>saas</module>
+                <module>spark-java</module>
+
+                <module>spring-4</module>
+
+                <module>spring-5</module>
+                <module>spring-5-webflux</module>
+                <module>spring-5-data-reactive</module>
+                <module>spring-5-mvc</module>
+                <module>spring-5-reactive</module>
+                <module>spring-5-reactive-2</module>
+                <module>spring-5-reactive-client</module>
+                <module>spring-5-reactive-oauth</module>
+                <module>spring-5-reactive-security</module>
+                <module>spring-5-security</module>
+                <module>spring-5-security-oauth</module>
+                <module>spring-5-security-cognito</module>
+
+                <module>spring-activiti</module>
+                <module>spring-akka</module>
+                <module>spring-amqp</module>
+                <module>spring-aop</module>
+                <module>spring-apache-camel</module>
+                <module>spring-batch</module>
+                <module>spring-bom</module>
+
+                <module>spring-boot</module>
+                <module>spring-boot-admin</module>
+                <module>spring-boot-angular</module>
+                <module>spring-boot-autoconfiguration</module>
+                <module>spring-boot-bootstrap</module>
+                <module>spring-boot-camel</module>
+                <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
+                <module>spring-boot-configuration</module>
+				<module>spring-boot-client</module>
+
+                <module>spring-boot-crud</module>
+                <module>spring-boot-ctx-fluent</module>
+                <module>spring-boot-custom-starter</module>
+                <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
+                <module>spring-boot-jasypt</module>
+                <module>spring-boot-keycloak</module>
+                <module>spring-boot-kotlin</module>
+                <module>spring-boot-logging-log4j2</module>
+                <module>spring-boot-mvc</module>
+                <module>spring-boot-mvc-birt</module>
+                <module>spring-boot-environment</module>
+				<module>spring-boot-deployment</module>
+				<module>spring-boot-runtime</module>
+				<module>spring-boot-runtime/disabling-console-jul</module>
+				<module>spring-boot-runtime/disabling-console-log4j2</module>
+                <module>spring-boot-runtime/disabling-console-logback</module>
+                <module>spring-boot-artifacts</module>
+                <module>spring-boot-rest</module>
+                <module>spring-boot-data</module>
+                <module>spring-boot-parent</module>
+                <module>spring-boot-property-exp</module>
+                <module>spring-boot-security</module>
+                <module>spring-boot-testing</module>
+                <module>spring-boot-vue</module>
+                <module>spring-caching</module>
+				<module>spring-boot-libraries</module>
+
+
+                <module>spring-cloud</module>
+                <module>spring-cloud-bus</module>
+                <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
+                <module>spring-cloud-data-flow</module>
+
+                <module>spring-core</module>
+                <module>spring-core-2</module>
+                <module>spring-core-3</module>
+				<module>spring-cucumber</module>
+
+                <module>spring-data-rest</module>
+                <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>
+                <module>spring-exceptions</module>
+
+                <module>spring-freemarker</module>
+
+                <module>spring-groovy</module>
+
+                <module>spring-integration</module>
+
+                <module>spring-jenkins-pipeline</module>
+                <module>spring-jersey</module>
+                <module>spring-jinq</module>
+                <module>spring-jms</module>
+                <module>spring-jooq</module>
+
+                <module>spring-kafka</module>
+                <module>spring-katharsis</module>
+
+                <module>spring-ldap</module>
+
+                <module>spring-mobile</module>
+                <module>spring-mockito</module>
+                <module>spring-mvc-basics-2</module>
+				<module>spring-mvc-forms-jsp</module>
+                <module>spring-mvc-forms-thymeleaf</module>
+                <module>spring-mvc-java</module>
+                <module>spring-mvc-kotlin</module>
+                <module>spring-mvc-simple</module>
+                <module>spring-mvc-simple-2</module>
+                <module>spring-mvc-velocity</module>
+                <module>spring-mvc-webflow</module>
+                <module>spring-mvc-xml</module>
+
+                <module>spring-protobuf</module>
+                <!-- <module>spring-security-cors</module> -->  <!-- PMD violation -->
+
+                <module>spring-quartz</module>
+
+                <module>spring-reactive-kotlin</module>
+                <module>spring-reactor</module>
+                <module>spring-remoting</module>
+                <module>spring-rest</module>
+                <module>spring-rest-angular</module>
+                <module>spring-rest-compress</module>
+                <module>spring-rest-full</module>
+                <module>spring-rest-hal-browser</module>
+                <module>spring-rest-query-language</module>
+                <module>spring-rest-shell</module>
+                <module>spring-rest-simple</module>
+                <module>spring-resttemplate</module>
+                <module>spring-roo</module>
+                <module>spring-scheduling</module><module>spring-security-acl</module>
+                <module>spring-security-angular/server</module>
+                <module>spring-security-cache-control</module>
+
+                <module>spring-security-core</module>
+                <module>spring-security-mvc-boot</module>
+                <module>spring-security-mvc-custom</module>
+                <module>spring-security-mvc-digest-auth</module>
+                <module>spring-security-mvc-jsonview</module>
+                <module>spring-security-mvc-ldap</module>
+                <module>spring-security-mvc-login</module>
+                <module>spring-security-mvc-persisted-remember-me</module>
+                <module>spring-security-mvc</module>
+                <module>spring-security-mvc-socket</module>
+                <module>spring-security-openid</module>
+                <!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
+                <module>spring-security-rest</module>
+                <module>spring-security-rest-basic-auth</module>
+                <module>spring-security-rest-custom</module>
+                <module>spring-security-sso</module>
+                <module>spring-security-stormpath</module>
+                <module>spring-security-thymeleaf</module>
+                <module>spring-security-x509</module>
+                <module>spring-session</module>
+                <module>spring-shell</module>
+				<module>spring-sleuth</module>
+                <module>spring-soap</module>
+                <module>spring-social-login</module>
+                <module>spring-spel</module>
+                <module>spring-state-machine</module>
+                <module>spring-static-resources</module>
+                <module>spring-swagger-codegen</module>
+
+                <module>spring-thymeleaf</module>
+
+                <module>spring-vault</module>
+                <module>spring-vertx</module>
+
+                <module>spring-webflux-amqp</module> <!-- long -->
+
+                <module>spring-zuul</module>
+
+                <module>static-analysis</module>
+                <module>stripe</module>
+                <module>structurizr</module>
+                <module>struts-2</module>
+
+                <module>testing-modules</module>
+
+                <module>twilio</module>
+                <module>twitter4j</module>
+
+                <module>undertow</module>
+
+                <module>vertx</module>
+                <module>vertx-and-rxjava</module>
+                <module>video-tutorials</module>
+                <module>vraptor</module>
+
+                <module>wicket</module>
+
+                <module>xml</module>
+                <module>xstream</module>
+
+                <module>tensorflow-java</module>
+                <module>spring-boot-flowable</module>
+                <module>spring-security-kerberos</module>
+
+                <module>spring-boot-nashorn</module>
+                <module>java-blockchain</module>
+
+            </modules>
+
+        </profile>
+
+        <profile>
+            <id>spring-context</id>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                        <configuration>
+                            <forkCount>3</forkCount>
+                            <reuseForks>true</reuseForks>
+                            <includes>
+                                <include>**/*SpringContextIntegrationTest.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+
+                </plugins>
+            </build>
+
+            <modules>
+                <module>spring-5</module>
+                <module>spring-5-data-reactive</module>
+                <module>spring-5-reactive</module>
+                <module>spring-5-reactive-2</module>
+                <module>spring-5-reactive-client</module>
+                <module>spring-5-reactive-security</module>
+                <module>spring-5-security</module>
+                <module>spring-5-security-oauth</module>
+                <module>spring-5-security-cognito</module>
+                <module>spring-activiti</module>
+                <module>spring-akka</module>
+                <module>spring-aop</module>
+                <module>spring-apache-camel</module>
+                <module>spring-batch</module>
+                <module>spring-bom</module>
+                <module>spring-boot-admin</module>
+                <module>spring-boot-bootstrap</module>
+                <module>spring-boot-bootstrap</module>
+                <module>spring-boot-camel</module>
+                <module>spring-boot-client</module>
+                <module>spring-boot-custom-starter</module>
+                <module>spring-boot-di</module>
+                <module>greeter-spring-boot-autoconfigure</module>
+                <module>greeter-spring-boot-sample-app</module>
+                <module>persistence-modules/spring-boot-h2/spring-boot-h2-database</module>
+                <module>spring-boot-jasypt</module>
+                <module>spring-boot-keycloak</module>
+                <module>spring-boot-mvc</module>
+                <module>spring-boot-property-exp</module>
+                <module>spring-boot-vue</module>
+                <module>spring-cloud</module>
+                <module>spring-cloud/spring-cloud-archaius/basic-config</module>
+                <module>spring-cloud/spring-cloud-archaius/extra-configs</module>
+                <module>spring-cloud/spring-cloud-bootstrap/config</module>
+                <module>spring-cloud/spring-cloud-contract</module>
+                <module>spring-cloud/spring-cloud-gateway</module>
+                <module>spring-cloud/spring-cloud-kubernetes/demo-backend</module>
+                <module>spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server</module>
+                <module>spring-cloud/spring-cloud-ribbon-client                </module>
+                <module>spring-cloud/spring-cloud-security</module>
+                <module>spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit</module>
+                <module>spring-cloud/spring-cloud-task/springcloudtasksink</module>
+                <module>spring-cloud/spring-cloud-zookeeper                     </module>
+                <module>spring-cloud/spring-cloud-bus/spring-cloud-config-server</module>
+                <module>spring-cloud/spring-cloud-data-flow/log-sink</module>
+                <module>spring-cloud/spring-cloud-data-flow/time-processor</module>
+                <module>spring-cloud/spring-cloud-data-flow/time-source</module>
+                <module>spring-cucumber</module>
+                <module>persistence-modules/spring-data-keyvalue</module>
+                <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>
+                <module>spring-jinq</module>
+                <module>spring-jms</module>
+                <module>spring-kafka</module>
+                <module>spring-katharsis</module>
+                <module>spring-ldap</module>
+                <module>spring-mobile</module>
+                <module>spring-mockito</module>
+                <module>spring-mvc-forms-thymeleaf</module>
+                <module>spring-mvc-java</module>
+                <module>spring-mvc-velocity</module>
+                <module>spring-mvc-webflow</module>
+                <module>spring-protobuf</module>
+                <module>spring-quartz</module>
+                <module>remoting-hessian-burlap/spring-remoting-hessian-burlap-client</module>
+                <module>remoting-hessian-burlap/remoting-hessian-burlap-server</module>
+                <module>spring-reactor</module>
+                <module>spring-remoting/</module>
+                <module>spring-remoting/remoting-http/remoting-http-server</module>
+                <module>spring-remoting/remoting-jms/remoting-jms-client</module>
+                <module>spring-remoting/remoting-rmi/remoting-rmi-server</module>
+                <module>spring-rest</module>
+                <module>spring-rest-angular</module>
+                <module>spring-rest-compress</module>
+                <module>spring-rest-full</module>
+                <module>spring-rest-simple</module>
+                <module>spring-resttemplate</module>
+                <module>spring-security-acl</module>
+                <module>spring-security-angular</module>
+                <module>spring-security-cache-control</module>
+                <module>spring-security-core</module>
+                <module>spring-security-mvc-boot</module>
+                <module>spring-security-mvc-custom</module>
+                <module>spring-security-mvc-digest-auth</module>
+                <module>spring-security-mvc-ldap</module>
+                <module>spring-security-mvc-persisted-remember-me</module>
+                <module>spring-security-mvc</module>
+                <module>spring-security-mvc-socket</module>
+                <module>spring-security-rest</module>
+                <module>spring-security-sso</module>
+                <module>spring-security-thymeleaf/spring-security-thymeleaf-authentication</module>
+                <module>spring-security-thymeleaf/spring-security-thymeleaf-authorize</module>
+                <module>spring-security-thymeleaf/spring-security-thymeleaf-config</module>
+                <module>spring-security-x509</module>
+                <module>spring-session/spring-session-jdbc</module>
+                <module>spring-sleuth</module>
+                <module>spring-social-login</module>
+                <module>spring-spel</module>
+                <module>spring-state-machine</module>
+                <module>spring-swagger-codegen/spring-swagger-codegen-app</module>
+                <module>spring-thymeleaf</module>
+                <module>spring-vault</module>
+                <module>spring-vertx</module>
+                <module>spring-zuul/spring-zuul-foos-resource</module>
+                <module>persistence-modules/hibernate-mapping</module>
+                <module>persistence-modules/spring-data-dynamodb</module>
+                <module>persistence-modules/spring-data-eclipselink</module>
+                <module>persistence-modules/spring-data-solr</module>
+                <module>persistence-modules/spring-hibernate-5</module>
+
+                <module>spring-boot-flowable</module>
+                <module>spring-security-kerberos</module>
+                <module>spring-boot-nashorn</module>
+            </modules>
+
+        </profile>
+
+        <profile>
+            <id>default-heavy</id>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                        <configuration>
+                            <forkCount>3</forkCount>
+                            <reuseForks>true</reuseForks>
+                            <includes>
+                                <include>SpringContextTest</include>
+                                <include>**/*UnitTest</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/*IntegrationTest.java</exclude>
+                                <exclude>**/*IntTest.java</exclude>
+                                <exclude>**/*LongRunningUnitTest.java</exclude>
+                                <exclude>**/*ManualTest.java</exclude>
+                                <exclude>**/*JdbcTest.java</exclude>
+                                <exclude>**/*LiveTest.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+
+                </plugins>
+            </build>
+
+            <modules>
+                <module>parent-boot-1</module>
+                <module>parent-boot-2</module>
+                <module>parent-spring-4</module>
+                <module>parent-spring-5</module>
+                <module>parent-java</module>
+                <module>parent-kotlin</module>
+
+                <module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
+                <module>core-java-modules/core-java-concurrency-advanced-2</module>
+                <module>core-java-modules/core-java-concurrency-advanced-3</module>
+				<module>core-kotlin</module> <!-- long running? -->
+                <module>core-kotlin-2</module>
+                <module>core-kotlin-io</module>
+
+                <module>jenkins/plugins</module>
+                <module>jhipster</module>
+                <module>jws</module>
+
+                <module>libraries</module> <!-- very long running -->
+                <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>
+
+                <module>vaadin</module>
+                <module>vavr</module>
+            </modules>
+        </profile>
+
+        <profile>
+            <id>integration-lite-first</id>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/*ManualTest.java</exclude>
+                                <exclude>**/*LiveTest.java</exclude>
+                            </excludes>
+                            <includes>
+                                <include>**/*IntegrationTest.java</include>
+                                <include>**/*IntTest.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+
+            <modules>
+                <module>parent-boot-1</module>
+                <module>parent-boot-2</module>
+                <module>parent-spring-4</module>
+                <module>parent-spring-5</module>
+                <module>parent-java</module>
+                <module>parent-kotlin</module>
+                <!-- <module>akka-http</module> --> <!-- Unit test is failing -->
+                <module>akka-streams</module>
+                <module>algorithms-genetic</module>
+                <module>algorithms-miscellaneous-1</module>
+                <module>algorithms-miscellaneous-2</module>
+                <module>algorithms-miscellaneous-3</module>
+                <module>algorithms-miscellaneous-4</module>
+                <module>algorithms-miscellaneous-5</module>
+                <module>algorithms-sorting</module>
+                <module>animal-sniffer-mvn-plugin</module>
+                <module>annotations</module>
+                <module>antlr</module>
+                <module>apache-avro</module>
+                <module>apache-bval</module>
+                <module>apache-curator</module>
+                <module>apache-cxf</module>
+                <module>apache-fop</module>
+                <module>apache-geode</module>
+                <module>apache-meecrowave</module>
+                <module>apache-olingo/olingo2</module>
+                <module>apache-opennlp</module>
+                <module>apache-poi</module>
+                <module>apache-pulsar</module>
+                <module>apache-shiro</module>
+                <module>apache-solrj</module>
+                <module>apache-spark</module>
+                <module>apache-thrift</module>
+                <module>apache-tika</module>
+                <module>apache-velocity</module>
+                <module>apache-zookeeper</module>
+                <module>asciidoctor</module>
+                <module>asm</module>
+                <module>atomix</module>
+                <module>aws</module>
+                <module>aws-lambda</module>
+                <module>axon</module>
+                <module>azure</module>
+                <module>bazel</module>
+                <module>bootique</module>
+
+                <module>cas</module>
+                <module>cdi</module>
+                <module>checker-plugin</module>
+                <module>cloud-foundry-uaa/cf-uaa-oauth2-client</module>
+                <module>cloud-foundry-uaa/cf-uaa-oauth2-resource-server</module>
+                <module>code-generation</module>
+				<module>core-groovy</module>
+                <module>core-groovy-2</module>
+                <module>core-groovy-collections</module>
+                <!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
+                <!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
+                <module>core-java-modules/core-java-8</module>
+                <module>core-java-modules/core-java-8-2</module>
+                <module>core-java-modules/core-java-annotations</module>
+                <module>core-java-modules/core-java-streams</module>
+                <module>core-java-modules/core-java-function</module>
+                <module>core-java-modules/core-java-lang-math</module>
+                <!--<module>core-java-modules/core-java-datetime-conversion</module>-->  <!-- We haven't upgraded to java 9.-->
+                <!--<module>core-java-modules/core-java-datetime-string</module>--> <!-- We haven't upgraded to java 9.-->
+                <module>core-java-modules/core-java-text</module>
+                <!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+                <!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
+                <module>core-java-modules/core-java-arrays</module>
+                <module>core-java-modules/core-java-arrays-2</module>
+                <module>core-java-modules/core-java-collections</module>
+                <module>core-java-modules/core-java-collections-2</module>
+                <module>core-java-modules/core-java-collections-3</module>
+                <module>core-java-modules/core-java-collections-list</module>
+                <module>core-java-modules/core-java-collections-list-2</module>
+                <module>core-java-modules/core-java-collections-list-3</module>
+                <module>core-java-modules/core-java-collections-array-list</module>
+                <module>core-java-modules/core-java-collections-set</module>
+                <module>core-java-modules/core-java-concurrency-basic</module>
+                <module>core-java-modules/core-java-concurrency-basic-2</module>
+                <module>core-java-modules/core-java-concurrency-collections</module>
+                <module>core-java-modules/core-java-io</module>
+                <module>core-java-modules/core-java-io-files</module>
+                <module>core-java-modules/core-java-nio</module>
+                <module>core-java-modules/core-java-security</module>
+				<module>core-java-modules/core-java-exceptions</module>
+                <module>core-java-modules/core-java-lang-syntax</module>
+                <module>core-java-modules/core-java-lang-syntax-2</module>
+                <module>core-java-modules/core-java-lang</module>
+                <module>core-java-modules/core-java-lang-2</module>
+                <module>core-java-modules/core-java-lang-oop</module>
+                <module>core-java-modules/core-java-lang-oop-2</module>
+                <module>core-java-modules/core-java-lang-oop-3</module>
+                <module>core-java-modules</module>
+                <module>core-java-modules/core-java-networking</module>
+                <module>core-java-modules/core-java-perf</module>
+                <module>core-java-modules/core-java-sun</module>
+                <module>core-java-modules/core-java-string-conversions</module>
+				<module>core-java-modules/core-java-string-conversions-2</module>
+				<module>core-java-modules/core-java-string-apis</module>
+				<module>core-scala</module>
+                <module>couchbase</module>
+                <module>custom-pmd</module>
+
+                <module>dagger</module>
+                <module>data-structures</module>
+                <module>ddd</module>
+                <module>deeplearning4j</module>
+                <module>disruptor</module>
+                <module>dozer</module>
+                <module>drools</module>
+                <module>dubbo</module>
+
+                <module>ethereum</module>
+
+                <module>feign</module>
+                <module>flyway-cdi-extension</module>
+
+                <module>geotools</module>
+                <module>google-cloud</module>
+                <module>google-web-toolkit</module>
+                <!-- <module>gradle</module> --> <!-- Not a maven project -->
+                <!-- <module>grails</module> --> <!-- Not a maven project -->
+                <module>graphql/graphql-java</module>
+                <module>grpc</module>
+                <module>gson</module>
+                <module>guava</module>
+                <module>guava-io</module>
+                <module>guava-collections</module>
+                <module>guava-collections-map</module>
 				<module>guava-collections-set</module>
                 <module>guava-modules</module>
                 <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
@@ -481,10 +1245,9 @@
                 <module>java-collections-maps-2</module>
                 <module>java-jdi</module>
                 <!-- <module>java-dates</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
-                <!-- <module>java-dates-2</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
-                <!-- <module>java-ee-8-security-api</module> --> <!-- long running -->
+                <module>java-ee-8-security-api</module>
                 <module>java-lite</module>
-				<module>java-math</module>
+                <module>java-math</module>
                 <module>java-numbers</module>
                 <module>java-numbers-2</module>
                 <module>java-rmi</module>
@@ -503,1179 +1266,444 @@
                 <module>jaxb</module>
                 <!-- JIRA-10842
                 <module>jee-7</module> -->
-				<module>jee-7-security</module>
-				<module>jee-kotlin</module>
-				<module>jersey</module>
-				<module>jgit</module>
-				<module>jgroups</module>
-				<module>jhipster-5</module>
-				<module>jib</module>
-				<module>jjwt</module>
-				<module>jmeter</module>
-				<module>jmh</module>
-				<module>jni</module>
-				<module>jooby</module>
-				<module>jsf</module>
-				<module>json</module>
-				<module>json-path</module>
-				<module>jsoup</module>
-				<module>jta</module>
+                <module>jee-7-security</module>
+                <module>jee-kotlin</module>
+                <module>jersey</module>
+                <module>jgit</module>
+                <module>jgroups</module>
+                <module>jhipster-5</module>
+                <module>jib</module>
+                <module>jjwt</module>
+                <module>jmeter</module>
+                <module>jmh</module>
+                <module>jni</module>
+                <module>jooby</module>
+                <module>jsf</module>
+                <module>json</module>
+                <module>json-path</module>
+                <module>jsoup</module>
+                <module>jta</module>
 
-				<!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
-				<module>kotlin-libraries</module>
-				<module>kotlin-libraries-2</module>
+                <!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
+                <module>kotlin-libraries</module>
 
-				<!-- <module>lagom</module> --> <!-- Not a maven project -->
-				<module>libraries</module>
-				<module>libraries-2</module>
-				<module>libraries-data</module>
-				<module>libraries-data-2</module>
+                <!-- <module>lagom</module> --> <!-- Not a maven project -->
+                <module>libraries</module>
+                <module>libraries-data</module>
+                <module>libraries-data-2</module>
+                <module>libraries-data-db</module>
+				<module>libraries-data-io</module>
 				<module>libraries-apache-commons</module>
-				<module>libraries-apache-commons-collections</module>
-				<module>libraries-apache-commons-io</module>
-				<module>libraries-primitive</module>
-				<module>libraries-testing</module>
-				<module>libraries-security</module>
-				<module>libraries-server</module>
-				<module>libraries-http</module>
-				<module>libraries-io</module>
-				<module>linkrest</module>
-				<module>logging-modules</module>
-				<module>lombok</module>
-				<module>lucene</module>
+                <module>libraries-apache-commons-collections</module>
+                <module>libraries-apache-commons-io</module>
+                <module>libraries-testing</module>
+                <module>libraries-security</module>
+                <module>libraries-server</module>
+                <module>libraries-http</module>
+                <module>linkrest</module>
+                <module>logging-modules</module>
+                <module>lombok</module>
+                <module>lucene</module>
 
-				<module>mapstruct</module>
-				<!-- <module>maven-all/compiler-plugin-java-9</module> --> <!-- We haven't upgraded to java 9. -->
-				<module>maven-all/maven</module>
-				<module>maven-all/maven-war-plugin</module>
-				<module>maven-all/profiles</module>
-				<module>maven-all/versions-maven-plugin</module>
-				<module>maven-archetype</module>
-				<!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->
-				<module>maven-polyglot/maven-polyglot-json-extension</module>
-				<!-- <module>maven-polyglot/maven-polyglot-yml-app</module> --> <!-- Not a maven project -->
-				<module>mesos-marathon</module>
-				<module>metrics</module>
-				<!-- <module>micronaut</module> --> <!-- Fixing in BAEL-10877 -->
-				<module>microprofile</module>
-                <module>ml</module>
-				<module>msf4j</module>
-				<!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
-				<module>mustache</module>
-				<module>mybatis</module>
+                <module>mapstruct</module>
+                <!-- <module>maven-all/compiler-plugin-java-9</module> --> <!-- We haven't upgraded to java 9. -->
+                <module>maven-all/maven</module>
+                <module>maven-all/maven-war-plugin</module>
+                <module>maven-all/profiles</module>
+                <module>maven-all/versions-maven-plugin</module>
+                <!-- <module>maven-java-11</module> --> <!-- we haven't upgraded to Java 11 -->
+                <module>maven-archetype</module>
+                <!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->
+                <module>maven-polyglot/maven-polyglot-json-extension</module>
+                <!-- <module>maven-polyglot/maven-polyglot-yml-app</module> --> <!-- Not a maven project -->
+                <module>mesos-marathon</module>
+                <module>metrics</module>
+                <!-- <module>micronaut</module> --> <!-- Fixing in BAEL-10877 -->
+                <module>microprofile</module>
+                <module>msf4j</module>
+                <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
+                <module>mustache</module>
+                <module>mybatis</module>
 
 
-				<module>optaplanner</module>
-				<module>orika</module>
-				<module>osgi</module>
+                <module>optaplanner</module>
+                <module>orika</module>
+                <module>osgi</module>
 
-				<module>patterns</module>
-				<module>pdf</module>
-				<module>performance-tests</module>
-				<!-- <module>play-framework</module> --> <!-- Not a maven project -->
-				<module>protobuffer</module>
+                <module>patterns</module>
+                <module>pdf</module>
+                <module>performance-tests</module>
+                <!-- <module>play-framework</module> --> <!-- Not a maven project -->
+                <module>protobuffer</module>
 
-				<module>persistence-modules</module>
-				<module>quarkus</module>
+                <module>persistence-modules</module>
 
-				<module>rabbitmq</module>
-				<!-- <module>raml</module> --> <!-- Not a maven project -->
-				<module>ratpack</module>
-				<module>reactor-core</module>
-				<module>resteasy</module>
-				<module>restx</module>
-				<!-- <module>rmi</module> --> <!-- Not a maven project -->
-				<module>rule-engines</module>
-				<module>rsocket</module>
-				<module>rxjava</module>
-				<module>rxjava-2</module>
-				<module>software-security/sql-injection-samples</module>
+                <module>rabbitmq</module>
+                <!-- <module>raml</module> --> <!-- Not a maven project -->
+                <module>ratpack</module>
+                <module>reactor-core</module>
+                <module>resteasy</module>
+                <module>restx</module>
+                <!-- <module>rmi</module> --> <!-- Not a maven project -->
+                <module>rule-engines</module>
+                <module>rsocket</module>
+                <module>rxjava</module>
+                <module>rxjava-2</module>
+                <module>oauth2-framework-impl</module>
+                <module>spf4j</module>
+                <module>spring-boot-performance</module>
+                <module>spring-boot-properties</module>
+                <!-- <module>spring-mvc-basics</module> --> <!-- Compilation failure -->
+                <!-- <module>Twitter4J</module> --> <!-- Builds locally, but fails in Jenkins, Failed to parse POMs -->
 
-				<module>tensorflow-java</module>
-				<module>spf4j</module>
-				<module>spring-boot-flowable</module>
-				<module>spring-boot-mvc-2</module>
-				<module>spring-boot-performance</module>
-				<module>spring-boot-properties</module>
-				<!-- <module>spring-mvc-basics</module> --> <!-- Compilation failure -->
-				<module>spring-security-kerberos</module>
-				<module>oauth2-framework-impl</module>
-				
-				<module>spring-boot-nashorn</module>
-				<module>java-blockchain</module>
-			
-			</modules>
+            </modules>
 
-		</profile>
+        </profile>
 
-		<profile>
-			<id>default-second</id>
-			<build>
-				<plugins>
+        <profile>
+            <id>integration-lite-second</id>
 
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<version>${maven-surefire-plugin.version}</version>
-						<configuration>
-							<forkCount>3</forkCount>
-							<reuseForks>true</reuseForks>
-							<includes>
-								<include>SpringContextTest</include>
-								<include>**/*UnitTest</include>
-							</includes>
-							<excludes>
-								<exclude>**/*IntegrationTest.java</exclude>
-								<exclude>**/*IntTest.java</exclude>
-								<exclude>**/*LongRunningUnitTest.java</exclude>
-								<exclude>**/*ManualTest.java</exclude>
-								<exclude>**/*JdbcTest.java</exclude>
-								<exclude>**/*LiveTest.java</exclude>
-							</excludes>
-						</configuration>
-					</plugin>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/*ManualTest.java</exclude>
+                                <exclude>**/*LiveTest.java</exclude>
+                            </excludes>
+                            <includes>
+                                <include>**/*IntegrationTest.java</include>
+                                <include>**/*IntTest.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
 
-				</plugins>
-			</build>
+            <modules>
+                <module>parent-boot-1</module>
+                <module>parent-boot-2</module>
+                <module>parent-spring-4</module>
+                <module>parent-spring-5</module>
+                <module>parent-java</module>
+                <module>parent-kotlin</module>
 
-			<modules>
-				<module>parent-boot-1</module>
-				<module>parent-boot-2</module>
-				<module>parent-spring-4</module>
-				<module>parent-spring-5</module>
-				<module>parent-java</module>
-				<module>parent-kotlin</module>
+                <module>saas</module>
+                <module>spark-java</module>
 
-				<module>saas</module>
-				<module>spark-java</module>
+                <module>spring-4</module>
 
-				<module>spring-4</module>
+                <module>spring-5</module>
+                <module>spring-5-data-reactive</module>
+                <module>spring-5-mvc</module>
+                <module>spring-5-reactive</module>
+                <module>spring-5-reactive-2</module>
+                <module>spring-5-reactive-client</module>
+                <module>spring-5-reactive-oauth</module>
+                <module>spring-5-reactive-security</module>
+                <module>spring-5-security</module>
+                <module>spring-5-security-oauth</module>
+                <module>spring-5-security-cognito</module>
+                <module>spring-activiti</module>
+                <module>spring-akka</module>
+                <module>spring-amqp</module>
+                <module>spring-aop</module>
+                <module>spring-apache-camel</module>
+                <module>spring-batch</module>
+                <module>spring-bom</module>
 
-				<module>spring-5</module>
-				<module>spring-5-webflux</module>
-				<module>spring-5-data-reactive</module>
-				<module>spring-5-mvc</module>
-				<module>spring-5-reactive</module>
-				<module>spring-5-reactive-2</module>
-				<module>spring-5-reactive-client</module>
-				<module>spring-5-reactive-oauth</module>
-				<module>spring-5-reactive-security</module>
-				<module>spring-5-security</module>
-				<module>spring-5-security-oauth</module>
-				<module>spring-5-security-cognito</module>
+                <module>spring-boot</module>
+                <module>spring-boot-admin</module>
+                <module>spring-boot-angular</module>
+                <module>spring-boot-autoconfiguration</module>
+                <module>spring-boot-bootstrap</module>
+                <module>spring-boot-camel</module>
+                <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
+                <module>spring-boot-client</module>
+                <module>spring-boot-crud</module>
+                <module>spring-boot-ctx-fluent</module>
+                <module>spring-boot-custom-starter</module>
+                <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
+                <module>spring-boot-jasypt</module>
+                <module>spring-boot-keycloak</module>
+                <module>spring-boot-logging-log4j2</module>
+                <module>spring-boot-mvc</module>
+                <module>spring-boot-mvc-birt</module>
+                <module>spring-boot-environment</module>
+				<module>spring-boot-deployment</module>
+				<module>spring-boot-runtime</module>
+				<module>spring-boot-runtime/disabling-console-jul</module>
+				<module>spring-boot-runtime/disabling-console-log4j2</module>
+                <module>spring-boot-runtime/disabling-console-logback</module>
+                <module>spring-boot-artifacts</module>
+                <module>spring-boot-rest</module>
+                <module>spring-boot-data</module>
+                <module>spring-boot-parent</module>
+                <module>spring-boot-property-exp</module>
+                <module>spring-boot-security</module>
+                <module>spring-boot-vue</module>
+				<module>spring-caching</module>
+                <module>spring-cloud</module>
+                <module>spring-cloud-bus</module>
+                <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
+                <module>spring-cloud-data-flow</module>
 
-				<module>spring-activiti</module>
-				<module>spring-akka</module>
-				<module>spring-all</module>
-				<module>spring-amqp</module>
-				<module>spring-aop</module>
-				<module>spring-apache-camel</module>
-				<module>spring-batch</module>
-				<module>spring-bom</module>
-
-				<module>spring-boot</module>
-				<module>spring-boot-admin</module>
-				<module>spring-boot-angular</module>
-				<module>spring-boot-autoconfiguration</module>
-				<module>spring-boot-bootstrap</module>
-				<module>spring-boot-camel</module>
-				<!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
-				<module>spring-boot-client</module>
-
-				<module>spring-boot-crud</module>
-				<module>spring-boot-ctx-fluent</module>
-				<module>spring-boot-custom-starter</module>
-				<module>spring-boot-disable-console-logging</module>
-				<!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
-				<module>spring-boot-jasypt</module>
-				<module>spring-boot-keycloak</module>
-				<module>spring-boot-kotlin</module>
-				<module>spring-boot-logging-log4j2</module>
-				<module>spring-boot-management</module>
-				<module>spring-boot-mvc</module>
-				<module>spring-boot-mvc-birt</module>
-				<module>spring-boot-ops</module>
-				<module>spring-boot-ops-2</module>
-				<module>spring-boot-rest</module>
-				<module>spring-boot-data</module>
-				<module>spring-boot-parent</module>
-				<module>spring-boot-property-exp</module>
-				<module>spring-boot-security</module>
-				<module>spring-boot-testing</module>
-				<module>spring-boot-vue</module>
-				<module>spring-boot-libraries</module>
-
-				
-				<module>spring-cloud</module>
-				<module>spring-cloud-bus</module>
-				<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-				<module>spring-cloud-data-flow</module>
-
-				<module>spring-core</module>
-				<module>spring-core-2</module>
+                <module>spring-core</module>
+                <module>spring-core-2</module>
+                <module>spring-core-3</module>
 				<module>spring-cucumber</module>
 
-				<module>spring-data-rest</module>
-				<module>spring-data-rest-querydsl</module>
-				<module>spring-dispatcher-servlet</module>
-				<module>spring-drools</module>
-				<module>spring-di</module>
+                <module>spring-data-rest</module>
+                <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>
-				<module>spring-exceptions</module>
+                <module>spring-ehcache</module>
+                <module>spring-ejb</module>
+                <module>spring-exceptions</module>
 
-				<module>spring-freemarker</module>
+                <module>spring-freemarker</module>
 
-				<module>spring-groovy</module>
+                <module>spring-groovy</module>
 
-				<module>spring-integration</module>
+                <module>spring-integration</module>
 
-				<module>spring-jenkins-pipeline</module>
-				<module>spring-jersey</module>
-				<module>spring-jinq</module>
-				<module>spring-jms</module>
-				<module>spring-jooq</module>
+                <module>spring-jenkins-pipeline</module>
+                <module>spring-jersey</module>
+                <module>spring-jinq</module>
+                <module>spring-jms</module>
+                <module>spring-jooq</module>
 
-				<module>spring-kafka</module>
-				<module>spring-katharsis</module>
+                <module>spring-kafka</module>
+                <module>spring-katharsis</module>
 
-				<module>spring-ldap</module>
+                <module>spring-ldap</module>
 
-				<module>spring-mobile</module>
-				<module>spring-mockito</module>
+                <module>spring-mobile</module>
+                <module>spring-mockito</module>
+                <module>spring-mvc-basics-2</module>
 				<module>spring-mvc-forms-jsp</module>
-				<module>spring-mvc-forms-thymeleaf</module>
-				<module>spring-mvc-java</module>
-				<module>spring-mvc-kotlin</module>
-				<module>spring-mvc-simple</module>
-				<module>spring-mvc-simple-2</module>
-				<module>spring-mvc-velocity</module>
-				<module>spring-mvc-webflow</module>
-				<module>spring-mvc-xml</module>
+                <module>spring-mvc-forms-thymeleaf</module>
+                <module>spring-mvc-java</module>
+                <module>spring-mvc-kotlin</module>
+                <module>spring-mvc-simple</module>
+                <module>spring-mvc-simple-2</module>
+                <module>spring-mvc-velocity</module>
+                <module>spring-mvc-webflow</module>
+                <module>spring-mvc-xml</module>
 
-				<module>spring-protobuf</module>
-				<!-- <module>spring-security-cors</module> -->  <!-- PMD violation -->
+                <module>spring-protobuf</module>
+                <!-- <module>spring-security-cors</module> -->  <!-- PMD violation -->
 
-				<module>spring-quartz</module>
+                <module>spring-quartz</module>
 
-				<module>spring-reactive-kotlin</module>
-				<module>spring-reactor</module>
-				<module>spring-remoting</module>
-				<module>spring-rest</module>
-				<module>spring-rest-angular</module>
-				<module>spring-rest-compress</module>
-				<module>spring-rest-full</module>
-				<module>spring-rest-hal-browser</module>
-				<module>spring-rest-query-language</module>
-				<module>spring-rest-shell</module>
-				<module>spring-rest-simple</module>
-				<module>spring-resttemplate</module>
-				<module>spring-roo</module>
+                <module>spring-reactive-kotlin</module>
+                <module>spring-reactor</module>
+                <module>spring-remoting</module>
+                <module>spring-rest</module>
+                <module>spring-rest-angular</module>
+                <module>spring-rest-compress</module>
+                <module>spring-rest-full</module>
+                <module>spring-rest-hal-browser</module>
+                <module>spring-rest-query-language</module>
+                <module>spring-rest-shell</module>
+                <module>spring-rest-simple</module>
+                <module>spring-resttemplate</module>
+                <module>spring-roo</module>
+
+                <module>spring-scheduling</module>
 				<module>spring-security-acl</module>
-				<module>spring-security-angular/server</module>
-				<module>spring-security-cache-control</module>
+                <module>spring-security-angular/server</module>
+                <module>spring-security-cache-control</module>
+                <module>spring-security-core</module>
+                <module>spring-security-mvc-boot</module>
+                <module>spring-security-mvc-custom</module>
+                <module>spring-security-mvc-digest-auth</module>
+                <module>spring-security-mvc-ldap</module>
+                <module>spring-security-mvc-login</module>
+                <module>spring-security-mvc-persisted-remember-me</module>
+                <module>spring-security-mvc</module>
+                <module>spring-security-mvc-socket</module>
+                <module>spring-security-openid</module>
+                <!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
+                <module>spring-security-rest</module>
+                <module>spring-security-rest-basic-auth</module>
+                <module>spring-security-rest-custom</module>
+                <module>spring-security-sso</module>
+                <module>spring-security-stormpath</module>
+                <module>spring-security-thymeleaf</module>
+                <module>spring-security-x509</module>
+                <module>spring-session</module>
+				<module>spring-shell</module>
+                <module>spring-sleuth</module>
+                <module>spring-soap</module>
+                <module>spring-social-login</module>
+                <module>spring-spel</module>
+                <module>spring-state-machine</module>
+                <module>spring-static-resources</module>
+                <module>spring-swagger-codegen</module>
 
-				<module>spring-security-core</module>
-				<module>spring-security-mvc-boot</module>
-				<module>spring-security-mvc-custom</module>
-				<module>spring-security-mvc-digest-auth</module>
-				<module>spring-security-mvc-jsonview</module>
-				<module>spring-security-mvc-ldap</module>
-				<module>spring-security-mvc-login</module>
-				<module>spring-security-mvc-persisted-remember-me</module>
-				<module>spring-security-mvc</module>
-				<module>spring-security-mvc-socket</module>
-				<module>spring-security-openid</module>
-				<!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
-				<module>spring-security-rest</module>
-				<module>spring-security-rest-basic-auth</module>
-				<module>spring-security-rest-custom</module>
-				<module>spring-security-sso</module>
-				<module>spring-security-stormpath</module>
-				<module>spring-security-thymeleaf</module>
-				<module>spring-security-x509</module>
-				<module>spring-session</module>
-				<module>spring-sleuth</module>
-				<module>spring-soap</module>
-				<module>spring-social-login</module>
-				<module>spring-spel</module>
-				<module>spring-state-machine</module>
-				<module>spring-static-resources</module>
-				<module>spring-swagger-codegen</module>
+                <module>spring-thymeleaf</module>
 
-				<module>spring-thymeleaf</module>
+                <module>spring-vault</module>
+                <module>spring-vertx</module>
 
-				<module>spring-vault</module>
-				<module>spring-vertx</module>
+                <module>spring-webflux-amqp</module> <!-- long -->
 
-				<module>spring-webflux-amqp</module> <!-- long --> 
+                <module>spring-zuul</module>
 
-				<module>spring-zuul</module>
+                <module>static-analysis</module>
+                <module>stripe</module>
+                <module>structurizr</module>
+                <module>struts-2</module>
 
-				<module>static-analysis</module>
-				<module>stripe</module>
-				<module>structurizr</module>
-				<module>struts-2</module>
+                <module>testing-modules</module>
 
-				<module>testing-modules</module>
+                <module>twilio</module>
+                <module>twitter4j</module>
 
-				<module>twilio</module>
-				<module>twitter4j</module>
+                <module>undertow</module>
 
-				<module>undertow</module>
+                <module>vertx</module>
+                <module>vertx-and-rxjava</module>
+                <module>video-tutorials</module>
+                <module>vraptor</module>
 
-				<module>vertx</module>
-				<module>vertx-and-rxjava</module>
-				<module>video-tutorials</module>
-				<module>vraptor</module>
+                <module>wicket</module>
 
-				<module>wicket</module>
+                <module>xml</module>
+                <module>xstream</module>
+            </modules>
 
-				<module>xml</module>
-				<module>xstream</module>
+        </profile>
 
-				<module>tensorflow-java</module>
-				<module>spring-boot-flowable</module>
-				<module>spring-security-kerberos</module>
-				
-				<module>spring-boot-nashorn</module>
-				<module>java-blockchain</module>
+        <profile>
+            <id>integration-heavy</id>
 
-			</modules>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/*ManualTest.java</exclude>
+                                <exclude>**/*LiveTest.java</exclude>
+                            </excludes>
+                            <includes>
+                                <include>**/*IntegrationTest.java</include>
+                                <include>**/*IntTest.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
 
-		</profile>
+            <modules>
+                <module>parent-boot-1</module>
+                <module>parent-boot-2</module>
+                <module>parent-spring-4</module>
+                <module>parent-spring-5</module>
+                <module>parent-java</module>
+                <module>parent-kotlin</module>
 
-		<profile>
-			<id>spring-context</id>
-			<build>
-				<plugins>
-
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<version>${maven-surefire-plugin.version}</version>
-						<configuration>
-							<forkCount>3</forkCount>
-							<reuseForks>true</reuseForks>
-							<includes>
-								<include>**/*SpringContextIntegrationTest.java</include>
-							</includes>
-						</configuration>
-					</plugin>
-
-				</plugins>
-			</build>
-
-			<modules>
-				<module>spring-5</module>
-				<module>spring-5-data-reactive</module>
-				<module>spring-5-reactive</module>
-				<module>spring-5-reactive-2</module>
-				<module>spring-5-reactive-client</module>
-				<module>spring-5-reactive-security</module>
-				<module>spring-5-security</module>
-				<module>spring-5-security-oauth</module>
-				<module>spring-5-security-cognito</module>
-				<module>spring-activiti</module>
-				<module>spring-akka</module>
-				<module>spring-all</module>
-				<module>spring-aop</module>
-				<module>spring-apache-camel</module>
-				<module>spring-batch</module>
-				<module>spring-bom</module>
-				<module>spring-boot-admin</module>
-				<module>spring-boot-bootstrap</module>
-				<module>spring-boot-bootstrap</module>
-				<module>spring-boot-camel</module>
-				<module>spring-boot-client</module>
-				<module>spring-boot-custom-starter</module>
-				<module>spring-boot-di</module>
-		 		<module>greeter-spring-boot-autoconfigure</module>
-				<module>greeter-spring-boot-sample-app</module>
-				<module>persistence-modules/spring-boot-h2/spring-boot-h2-database</module>
-				<module>spring-boot-jasypt</module>
-				<module>spring-boot-keycloak</module>
-				<module>spring-boot-mvc</module>
-				<module>spring-boot-property-exp</module>
-				<module>spring-boot-vue</module>
-				<module>spring-cloud</module>
-				<module>spring-cloud/spring-cloud-archaius/basic-config</module>
-				<module>spring-cloud/spring-cloud-archaius/extra-configs</module>
-				<module>spring-cloud/spring-cloud-bootstrap/config</module>
-				<module>spring-cloud/spring-cloud-contract</module>
-				<module>spring-cloud/spring-cloud-gateway</module>
-				<module>spring-cloud/spring-cloud-kubernetes/demo-backend</module>
-				<module>spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server</module>
-				<module>spring-cloud/spring-cloud-ribbon-client                </module>
-				<module>spring-cloud/spring-cloud-security</module>
-				<module>spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit</module>
-				<module>spring-cloud/spring-cloud-task/springcloudtasksink</module>
-				<module>spring-cloud/spring-cloud-zookeeper                     </module>
-				<module>spring-cloud/spring-cloud-bus/spring-cloud-config-server</module>
-				<module>spring-cloud/spring-cloud-data-flow/log-sink</module>
-				<module>spring-cloud/spring-cloud-data-flow/time-processor</module>
-				<module>spring-cloud/spring-cloud-data-flow/time-source</module>
-				<module>spring-cucumber</module>
-				<module>persistence-modules/spring-data-keyvalue</module>
-				<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>
-				<module>spring-jinq</module>
-				<module>spring-jms</module>
-				<module>spring-kafka</module>
-				<module>spring-katharsis</module>
-				<module>spring-ldap</module>
-				<module>spring-mobile</module>
-				<module>spring-mockito</module>
-				<module>spring-mvc-forms-thymeleaf</module>
-				<module>spring-mvc-java</module>
-				<module>spring-mvc-velocity</module>
-				<module>spring-mvc-webflow</module>
-				<module>spring-protobuf</module>
-				<module>spring-quartz</module>
-				<module>remoting-hessian-burlap/spring-remoting-hessian-burlap-client</module>
-				<module>remoting-hessian-burlap/remoting-hessian-burlap-server</module>
-				<module>spring-reactor</module>
-				<module>spring-remoting/</module>
-				<module>spring-remoting/remoting-http/remoting-http-server</module>
-				<module>spring-remoting/remoting-jms/remoting-jms-client</module>
-				<module>spring-remoting/remoting-rmi/remoting-rmi-server</module>
-				<module>spring-rest</module>
-				<module>spring-rest-angular</module>
-				<module>spring-rest-compress</module>
-				<module>spring-rest-full</module>
-				<module>spring-rest-simple</module>
-				<module>spring-resttemplate</module>
-				<module>spring-security-acl</module>
-				<module>spring-security-angular</module>
-				<module>spring-security-cache-control</module>
-				<module>spring-security-core</module>
-				<module>spring-security-mvc-boot</module>
-				<module>spring-security-mvc-custom</module>
-				<module>spring-security-mvc-digest-auth</module>
-				<module>spring-security-mvc-ldap</module>
-				<module>spring-security-mvc-persisted-remember-me</module>
-				<module>spring-security-mvc</module>
-				<module>spring-security-mvc-socket</module>
-				<module>spring-security-rest</module>
-				<module>spring-security-sso</module>
-				<module>spring-security-thymeleaf/spring-security-thymeleaf-authentication</module>
-				<module>spring-security-thymeleaf/spring-security-thymeleaf-authorize</module>
-				<module>spring-security-thymeleaf/spring-security-thymeleaf-config</module>
-				<module>spring-security-x509</module>
-				<module>spring-session/spring-session-jdbc</module>
-				<module>spring-sleuth</module>
-				<module>spring-social-login</module>
-				<module>spring-spel</module>
-				<module>spring-state-machine</module>
-				<module>spring-swagger-codegen/spring-swagger-codegen-app</module>
-				<module>spring-thymeleaf</module>
-				<module>spring-vault</module>
-				<module>spring-vertx</module>
-				<module>spring-zuul/spring-zuul-foos-resource</module>
-				<module>persistence-modules/hibernate-mapping</module>
-				<module>persistence-modules/spring-data-dynamodb</module>
-				<module>persistence-modules/spring-data-eclipselink</module>
-				<module>persistence-modules/spring-data-solr</module>
-				<module>persistence-modules/spring-hibernate-5</module>
-
-				<module>spring-boot-flowable</module>
-				<module>spring-security-kerberos</module>
-				<module>spring-boot-nashorn</module>
-			</modules>
-
-		</profile>
-
-		<profile>
-			<id>default-heavy</id>
-			<build>
-				<plugins>
-
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<version>${maven-surefire-plugin.version}</version>
-						<configuration>
-							<forkCount>3</forkCount>
-							<reuseForks>true</reuseForks>
-							<includes>
-								<include>SpringContextTest</include>
-								<include>**/*UnitTest</include>
-							</includes>
-							<excludes>
-								<exclude>**/*IntegrationTest.java</exclude>
-								<exclude>**/*IntTest.java</exclude>
-								<exclude>**/*LongRunningUnitTest.java</exclude>
-								<exclude>**/*ManualTest.java</exclude>
-								<exclude>**/*JdbcTest.java</exclude>
-								<exclude>**/*LiveTest.java</exclude>
-							</excludes>
-						</configuration>
-					</plugin>
-
-				</plugins>
-			</build>
-
-			<modules>
-				<module>parent-boot-1</module>
-				<module>parent-boot-2</module>
-				<module>parent-spring-4</module>
-				<module>parent-spring-5</module>
-				<module>parent-java</module>
-				<module>parent-kotlin</module>
-
-				<module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
+                <module>core-java-modules/core-java</module>
+                <module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
+                <module>core-java-modules/core-java-concurrency-advanced-2</module>
+                <module>core-java-modules/core-java-concurrency-advanced-3</module>
 				<module>core-kotlin</module> <!-- long running? -->
-				<module>core-kotlin-2</module>
-				<module>core-kotlin-io</module>
-
-				<module>jenkins/plugins</module>
-				<module>jhipster</module>
-				<module>jws</module>
-
-				<module>libraries</module> <!-- very long running -->
-				<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>
-
-				<module>vaadin</module>
-				<module>vavr</module>
-			</modules>
-		</profile>
-
-		<profile>
-			<id>integration-lite-first</id>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<excludes>
-								<exclude>**/*ManualTest.java</exclude>
-								<exclude>**/*LiveTest.java</exclude>
-							</excludes>
-							<includes>
-								<include>**/*IntegrationTest.java</include>
-								<include>**/*IntTest.java</include>
-							</includes>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-
-			<modules>
-				<module>parent-boot-1</module>
-				<module>parent-boot-2</module>
-				<module>parent-spring-4</module>
-				<module>parent-spring-5</module>
-				<module>parent-java</module>
-				<module>parent-kotlin</module>
-				<!-- <module>akka-http</module> --> <!-- Unit test is failing -->
-				<module>akka-streams</module>
-				<module>algorithms-genetic</module>
-				<module>algorithms-miscellaneous-1</module>
-				<module>algorithms-miscellaneous-2</module>
-				<module>algorithms-miscellaneous-3</module>
-				<module>algorithms-miscellaneous-4</module>
-				<module>algorithms-miscellaneous-5</module>
-				<module>algorithms-sorting</module>
-				<module>animal-sniffer-mvn-plugin</module>
-				<module>annotations</module>
-				<module>antlr</module>
-				<module>apache-avro</module>
-				<module>apache-bval</module>
-				<module>apache-curator</module>
-				<module>apache-cxf</module>
-				<module>apache-fop</module>
-				<module>apache-geode</module>
-				<module>apache-meecrowave</module>
-				<module>apache-olingo/olingo2</module>
-				<module>apache-opennlp</module>
-				<module>apache-poi</module>
-				<module>apache-pulsar</module>
-				<module>apache-shiro</module>
-				<module>apache-solrj</module>
-				<module>apache-spark</module>
-				<module>apache-thrift</module>
-				<module>apache-tika</module>
-				<module>apache-velocity</module>
-				<module>apache-zookeeper</module>
-				<module>asciidoctor</module>
-				<module>asm</module>
-				<module>atomix</module>
-				<module>aws</module>
-				<module>aws-lambda</module>
-				<module>axon</module>
-				<module>azure</module>
-				<module>bazel</module>
-				<module>bootique</module>
-
-				<module>cas</module>
-				<module>cdi</module>
-				<module>checker-plugin</module>
-				<module>cloud-foundry-uaa/cf-uaa-oauth2-client</module>
-				<module>cloud-foundry-uaa/cf-uaa-oauth2-resource-server</module>
-				<module>code-generation</module>
-				<module>core-groovy</module>
-				<module>core-groovy-2</module>
-				<module>core-groovy-collections</module>
-				<!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
-				<!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
-				<module>core-java-modules/core-java-8</module>
-				<module>core-java-modules/core-java-8-2</module>
-				<module>core-java-modules/core-java-annotations</module>
-				<module>core-java-modules/core-java-streams</module>
-				<module>core-java-modules/core-java-function</module>
-				<module>core-java-modules/core-java-lang-math</module>
-				<module>core-java-modules/core-java-datetime</module>
-				<module>core-java-modules/core-java-text</module>
-				<!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
-				<!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
-				<module>core-java-modules/core-java-arrays</module>
-				<module>core-java-modules/core-java-arrays-2</module>
-				<module>core-java-modules/core-java-collections</module>
-				<module>core-java-modules/core-java-collections-2</module>
-				<module>core-java-modules/core-java-collections-3</module>
-				<module>core-java-modules/core-java-collections-list</module>
-				<module>core-java-modules/core-java-collections-list-2</module>
-				<module>core-java-modules/core-java-collections-list-3</module>
-				<module>core-java-modules/core-java-collections-array-list</module>
-				<module>core-java-modules/core-java-collections-set</module>
-				<module>core-java-modules/core-java-concurrency-basic</module>
-				<module>core-java-modules/core-java-concurrency-basic-2</module>
-				<module>core-java-modules/core-java-concurrency-collections</module>
-				<module>core-java-modules/core-java-io</module>
-				<module>core-java-modules/core-java-io-files</module>
-				<module>core-java-modules/core-java-nio</module>
-				<module>core-java-modules/core-java-security</module>
-				<module>core-java-modules/core-java-exceptions</module>
-				<module>core-java-modules/core-java-lang-syntax</module>
-				<module>core-java-modules/core-java-lang-syntax-2</module>
-				<module>core-java-modules/core-java-lang</module>
-				<module>core-java-modules/core-java-lang-2</module>
-				<module>core-java-modules/core-java-lang-oop</module>
-				<module>core-java-modules/core-java-lang-oop-2</module>
-				<module>core-java-modules/core-java-lang-oop-3</module>
-				<module>core-java-modules</module>
-				<module>core-java-modules/core-java-networking</module>
-				<module>core-java-modules/core-java-perf</module>
-				<module>core-java-modules/core-java-sun</module>
-				<module>core-scala</module>
-				<module>couchbase</module>
-				<module>custom-pmd</module>
-
-				<module>dagger</module>
-				<module>data-structures</module>
-				<module>ddd</module>
-				<module>deeplearning4j</module>
-				<module>disruptor</module>
-				<module>dozer</module>
-				<module>drools</module>
-				<module>dubbo</module>
-
-				<module>ethereum</module>
-
-				<module>feign</module>
-				<module>flyway-cdi-extension</module>
-
-				<module>geotools</module>
-				<module>google-cloud</module>
-				<module>google-web-toolkit</module>
-				<!-- <module>gradle</module> --> <!-- Not a maven project -->
-				<!-- <module>grails</module> --> <!-- Not a maven project -->
-				<module>graphql/graphql-java</module>
-				<module>grpc</module>
-				<module>gson</module>
-				<module>guava</module>
-				<module>guava-io</module>
-				<module>guava-collections</module>
-				<module>guava-collections-set</module>
-				<module>guava-modules</module>
-				<!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
-				<module>guice</module>
-
-				<module>hazelcast</module>
-				<module>helidon</module>
-				<module>httpclient</module>
-				<module>httpclient-simple</module>
-				<module>hystrix</module>
-
-				<module>image-processing</module>
-				<module>immutables</module>
-
-				<module>jackson</module>
-				<module>jackson-2</module>
-				<module>jackson-simple</module>
-				<module>java-collections-conversions</module>
-				<module>java-collections-maps</module>
-				<module>java-collections-maps-2</module>
-				<module>java-jdi</module>
-				<!-- <module>java-dates</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
-				<module>java-ee-8-security-api</module>
-				<module>java-lite</module>
-				<module>java-math</module>
-				<module>java-numbers</module>
-				<module>java-numbers-2</module>
-				<module>java-rmi</module>
-				<module>java-spi</module>
-				<module>java-streams</module>
-				<!-- <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>
-				<module>javax-servlets</module>
-				<module>javaxval</module>
-				<module>jaxb</module>
-				<!-- JIRA-10842
-                <module>jee-7</module> -->
-				<module>jee-7-security</module>
-				<module>jee-kotlin</module>
-				<module>jersey</module>
-				<module>jgit</module>
-				<module>jgroups</module>
-				<module>jhipster-5</module>
-				<module>jib</module>
-				<module>jjwt</module>
-				<module>jmeter</module>
-				<module>jmh</module>
-				<module>jni</module>
-				<module>jooby</module>
-				<module>jsf</module>
-				<module>json</module>
-				<module>json-path</module>
-				<module>jsoup</module>
-				<module>jta</module>
-
-				<!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
-				<module>kotlin-libraries</module>
-
-				<!-- <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-apache-commons-collections</module>
-				<module>libraries-apache-commons-io</module>
-				<module>libraries-testing</module>
-				<module>libraries-security</module>
-				<module>libraries-server</module>
-				<module>libraries-http</module>
-				<module>linkrest</module>
-				<module>logging-modules</module>
-				<module>lombok</module>
-				<module>lucene</module>
-
-				<module>mapstruct</module>
-				<!-- <module>maven-all/compiler-plugin-java-9</module> --> <!-- We haven't upgraded to java 9. -->
-				<module>maven-all/maven</module>
-				<module>maven-all/maven-war-plugin</module>
-				<module>maven-all/profiles</module>
-				<module>maven-all/versions-maven-plugin</module>
-				<!-- <module>maven-java-11</module> --> <!-- we haven't upgraded to Java 11 -->
-				<module>maven-archetype</module>
-				<!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->
-				<module>maven-polyglot/maven-polyglot-json-extension</module>
-				<!-- <module>maven-polyglot/maven-polyglot-yml-app</module> --> <!-- Not a maven project -->
-				<module>mesos-marathon</module>
-				<module>metrics</module>
-				<!-- <module>micronaut</module> --> <!-- Fixing in BAEL-10877 -->
-				<module>microprofile</module>
-                <module>ml</module>
-				<module>msf4j</module>
-				<!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
-				<module>mustache</module>
-				<module>mybatis</module>
-
-
-				<module>optaplanner</module>
-				<module>orika</module>
-				<module>osgi</module>
-
-				<module>patterns</module>
-				<module>pdf</module>
-				<module>performance-tests</module>
-				<!-- <module>play-framework</module> --> <!-- Not a maven project -->
-				<module>protobuffer</module>
-
-				<module>persistence-modules</module>
-
-				<module>rabbitmq</module>
-				<!-- <module>raml</module> --> <!-- Not a maven project -->
-				<module>ratpack</module>
-				<module>reactor-core</module>
-				<module>resteasy</module>
-				<module>restx</module>
-				<!-- <module>rmi</module> --> <!-- Not a maven project -->
-				<module>rule-engines</module>
-				<module>rsocket</module>
-				<module>rxjava</module>
-				<module>rxjava-2</module>
-				<module>oauth2-framework-impl</module>
-				<module>spf4j</module>
-				<module>spring-boot-performance</module>
-				<module>spring-boot-properties</module>
-				<!-- <module>spring-mvc-basics</module> --> <!-- Compilation failure -->
-				<!-- <module>Twitter4J</module> --> <!-- Builds locally, but fails in Jenkins, Failed to parse POMs -->
-
-			</modules>
-
-		</profile>
-
-		<profile>
-			<id>integration-lite-second</id>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<excludes>
-								<exclude>**/*ManualTest.java</exclude>
-								<exclude>**/*LiveTest.java</exclude>
-							</excludes>
-							<includes>
-								<include>**/*IntegrationTest.java</include>
-								<include>**/*IntTest.java</include>
-							</includes>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-
-			<modules>
-				<module>parent-boot-1</module>
-				<module>parent-boot-2</module>
-				<module>parent-spring-4</module>
-				<module>parent-spring-5</module>
-				<module>parent-java</module>
-				<module>parent-kotlin</module>
-
-				<module>saas</module>
-				<module>spark-java</module>
-
-				<module>spring-4</module>
-
-				<module>spring-5</module>
-				<module>spring-5-data-reactive</module>
-				<module>spring-5-mvc</module>
-				<module>spring-5-reactive</module>
-				<module>spring-5-reactive-2</module>
-				<module>spring-5-reactive-client</module>
-				<module>spring-5-reactive-oauth</module>
-				<module>spring-5-reactive-security</module>
-				<module>spring-5-security</module>
-				<module>spring-5-security-oauth</module>
-				<module>spring-5-security-cognito</module>
-				<module>spring-activiti</module>
-				<module>spring-akka</module>
-				<module>spring-all</module>
-				<module>spring-amqp</module>
-				<module>spring-aop</module>
-				<module>spring-apache-camel</module>
-				<module>spring-batch</module>
-				<module>spring-bom</module>
-
-				<module>spring-boot</module>
-				<module>spring-boot-admin</module>
-				<module>spring-boot-angular</module>
-				<module>spring-boot-autoconfiguration</module>
-				<module>spring-boot-bootstrap</module>
-				<module>spring-boot-camel</module>
-				<!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
-				<module>spring-boot-client</module>
-				<module>spring-boot-crud</module>
-				<module>spring-boot-ctx-fluent</module>
-				<module>spring-boot-custom-starter</module>
-				<module>spring-boot-disable-console-logging</module>
-				<!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
-				<module>spring-boot-jasypt</module>
-				<module>spring-boot-keycloak</module>
-				<module>spring-boot-logging-log4j2</module>
-				<module>spring-boot-management</module>
-				<module>spring-boot-mvc</module>
-				<module>spring-boot-mvc-birt</module>
-				<module>spring-boot-ops</module>
-				<module>spring-boot-ops-2</module>
-				<module>spring-boot-rest</module>
-				<module>spring-boot-data</module>
-				<module>spring-boot-parent</module>
-				<module>spring-boot-property-exp</module>
-				<module>spring-boot-security</module>
-				<module>spring-boot-vue</module>
-
-				<module>spring-cloud</module>
-				<module>spring-cloud-bus</module>
-				<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-				<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>
-				<module>spring-dispatcher-servlet</module>
-				<module>spring-drools</module>
-				<module>spring-di</module>
-
-				<module>spring-ehcache</module>
-				<module>spring-ejb</module>
-				<module>spring-exceptions</module>
-
-				<module>spring-freemarker</module>
-
-				<module>spring-groovy</module>
-
-				<module>spring-integration</module>
-
-				<module>spring-jenkins-pipeline</module>
-				<module>spring-jersey</module>
-				<module>spring-jinq</module>
-				<module>spring-jms</module>
-				<module>spring-jooq</module>
-
-				<module>spring-kafka</module>
-				<module>spring-katharsis</module>
-
-				<module>spring-ldap</module>
-
-				<module>spring-mobile</module>
-				<module>spring-mockito</module>
-				<module>spring-mvc-forms-jsp</module>
-				<module>spring-mvc-forms-thymeleaf</module>
-				<module>spring-mvc-java</module>
-				<module>spring-mvc-kotlin</module>
-				<module>spring-mvc-simple</module>
-				<module>spring-mvc-simple-2</module>
-				<module>spring-mvc-velocity</module>
-				<module>spring-mvc-webflow</module>
-				<module>spring-mvc-xml</module>
-
-				<module>spring-protobuf</module>
-				<!-- <module>spring-security-cors</module> -->  <!-- PMD violation -->
-
-				<module>spring-quartz</module>
-
-				<module>spring-reactive-kotlin</module>
-				<module>spring-reactor</module>
-				<module>spring-remoting</module>
-				<module>spring-rest</module>
-				<module>spring-rest-angular</module>
-				<module>spring-rest-compress</module>
-				<module>spring-rest-full</module>
-				<module>spring-rest-hal-browser</module>
-				<module>spring-rest-query-language</module>
-				<module>spring-rest-shell</module>
-				<module>spring-rest-simple</module>
-				<module>spring-resttemplate</module>
-				<module>spring-roo</module>
-
-				<module>spring-security-acl</module>
-				<module>spring-security-angular/server</module>
-				<module>spring-security-cache-control</module>
-				<module>spring-security-core</module>
-				<module>spring-security-mvc-boot</module>
-				<module>spring-security-mvc-custom</module>
-				<module>spring-security-mvc-digest-auth</module>
-				<module>spring-security-mvc-ldap</module>
-				<module>spring-security-mvc-login</module>
-				<module>spring-security-mvc-persisted-remember-me</module>
-				<module>spring-security-mvc</module>
-				<module>spring-security-mvc-socket</module>
-				<module>spring-security-openid</module>
-				<!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
-				<module>spring-security-rest</module>
-				<module>spring-security-rest-basic-auth</module>
-				<module>spring-security-rest-custom</module>
-				<module>spring-security-sso</module>
-				<module>spring-security-stormpath</module>
-				<module>spring-security-thymeleaf</module>
-				<module>spring-security-x509</module>
-				<module>spring-session</module>
-				<module>spring-sleuth</module>
-				<module>spring-soap</module>
-				<module>spring-social-login</module>
-				<module>spring-spel</module>
-				<module>spring-state-machine</module>
-				<module>spring-static-resources</module>
-				<module>spring-swagger-codegen</module>
-
-				<module>spring-thymeleaf</module>
-
-				<module>spring-vault</module>
-				<module>spring-vertx</module>
-
-				<module>spring-webflux-amqp</module> <!-- long -->
-
-				<module>spring-zuul</module>
-
-				<module>static-analysis</module>
-				<module>stripe</module>
-				<module>structurizr</module>
-				<module>struts-2</module>
-
-				<module>testing-modules</module>
-
-				<module>twilio</module>
-				<module>twitter4j</module>
-
-				<module>undertow</module>
-
-				<module>vertx</module>
-				<module>vertx-and-rxjava</module>
-				<module>video-tutorials</module>
-				<module>vraptor</module>
-
-				<module>wicket</module>
-
-				<module>xml</module>
-				<module>xstream</module>
-			</modules>
-
-		</profile>
-
-		<profile>
-			<id>integration-heavy</id>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<excludes>
-								<exclude>**/*ManualTest.java</exclude>
-								<exclude>**/*LiveTest.java</exclude>
-							</excludes>
-							<includes>
-								<include>**/*IntegrationTest.java</include>
-								<include>**/*IntTest.java</include>
-							</includes>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-
-			<modules>
-				<module>parent-boot-1</module>
-				<module>parent-boot-2</module>
-				<module>parent-spring-4</module>
-				<module>parent-spring-5</module>
-				<module>parent-java</module>
-				<module>parent-kotlin</module>
-
-				<module>core-java-modules/core-java</module>
-				<module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
-				<module>core-kotlin</module> <!-- long running? -->
-				<module>core-kotlin-2</module>
-
-				<module>jenkins/plugins</module>
-				<module>jhipster</module>
-				<module>jws</module>
-
-				<module>libraries</module> <!-- very long running -->
-
-				<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>
-
-				<module>vaadin</module>
-				<module>vavr</module>
-			</modules>
-
-		</profile>
-
-
-	</profiles>
-
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<version>${maven-jxr-plugin.version}</version>
-			</plugin>
-		</plugins>
-	</reporting>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<gib.referenceBranch>refs/remotes/origin/master</gib.referenceBranch>
-		<gib.skipTestsForUpstreamModules>true</gib.skipTestsForUpstreamModules>
-		<gib.buildUpstream>false</gib.buildUpstream>
-		<gib.failOnMissingGitDir>false</gib.failOnMissingGitDir>
-		<gib.failOnError>false</gib.failOnError>
-		<gib.enabled>false</gib.enabled>
-
-		<junit.version>4.12</junit.version>
-		<org.hamcrest.version>1.3</org.hamcrest.version>
-		<mockito.version>2.21.0</mockito.version>
-
-		<!-- logging -->
-		<org.slf4j.version>1.7.21</org.slf4j.version>
-		<logback.version>1.1.7</logback.version>
-
-		<!-- plugins -->
-		<!-- can't upgrade the plugin yet; as there is an issue with 2.22 no longer running all the tests-->
-		<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
-		<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
-		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
-		<java.version>1.8</java.version>
-		<log4j.version>1.2.17</log4j.version>
-		<moneta.version>1.1</moneta.version>
-		<esapi.version>2.1.0.1</esapi.version>
-		<jmh-core.version>1.19</jmh-core.version>
-		<jmh-generator.version>1.19</jmh-generator.version>
-		<hamcrest-all.version>1.3</hamcrest-all.version>
-		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
-		<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
-		<commons-io.version>2.5</commons-io.version>
-		<commons-lang.version>2.6</commons-lang.version>
-		<commons-lang3.version>3.5</commons-lang3.version>
-		<commons-cli.version>1.4</commons-cli.version>
-		<maven-war-plugin.version>3.0.0</maven-war-plugin.version>
-		<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
-		<jstl-api.version>1.2</jstl-api.version>
-		<javax.servlet.jsp-api.version>2.3.1</javax.servlet.jsp-api.version>
-		<jackson-mapper-asl.version>1.9.13</jackson-mapper-asl.version>
-		<jstl.version>1.2</jstl.version>
-		<jackson.version>2.9.8</jackson.version>
-		<commons-fileupload.version>1.3</commons-fileupload.version>
-		<junit-platform.version>1.2.0</junit-platform.version>
-		<junit-jupiter.version>5.2.0</junit-jupiter.version>
-		<directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
-		<maven-install-plugin.version>2.5.1</maven-install-plugin.version>
-		<custom-pmd.version>0.0.1</custom-pmd.version>
-		<gitflow-incremental-builder.version>3.8</gitflow-incremental-builder.version>
-		<maven-jxr-plugin.version>2.3</maven-jxr-plugin.version>
-		<!-- <maven-pmd-plugin.version>3.9.0</maven-pmd-plugin.version> -->
-		<maven-pmd-plugin.version>3.8</maven-pmd-plugin.version>
-		<lombok.version>1.16.12</lombok.version>
-		<h2.version>1.4.197</h2.version>
-	</properties>
+                <module>core-kotlin-2</module>
+
+                <module>jenkins/plugins</module>
+                <module>jhipster</module>
+                <module>jws</module>
+
+                <module>libraries</module> <!-- very long running -->
+
+                <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>
+
+                <module>vaadin</module>
+                <module>vavr</module>
+            </modules>
+
+        </profile>
+
+
+    </profiles>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>${maven-jxr-plugin.version}</version>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <gib.referenceBranch>refs/remotes/origin/master</gib.referenceBranch>
+        <gib.skipTestsForUpstreamModules>true</gib.skipTestsForUpstreamModules>
+        <gib.buildUpstream>false</gib.buildUpstream>
+        <gib.failOnMissingGitDir>false</gib.failOnMissingGitDir>
+        <gib.failOnError>false</gib.failOnError>
+        <gib.enabled>false</gib.enabled>
+
+        <junit.version>4.12</junit.version>
+        <org.hamcrest.version>1.3</org.hamcrest.version>
+        <mockito.version>2.21.0</mockito.version>
+
+        <!-- logging -->
+        <org.slf4j.version>1.7.21</org.slf4j.version>
+        <logback.version>1.1.7</logback.version>
+
+        <!-- plugins -->
+        <!-- can't upgrade the plugin yet; as there is an issue with 2.22 no longer running all the tests-->
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <java.version>1.8</java.version>
+        <log4j.version>1.2.17</log4j.version>
+        <moneta.version>1.1</moneta.version>
+        <esapi.version>2.1.0.1</esapi.version>
+        <jmh-core.version>1.19</jmh-core.version>
+        <jmh-generator.version>1.19</jmh-generator.version>
+        <hamcrest-all.version>1.3</hamcrest-all.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
+        <commons-io.version>2.5</commons-io.version>
+        <commons-lang.version>2.6</commons-lang.version>
+        <commons-lang3.version>3.5</commons-lang3.version>
+        <commons-cli.version>1.4</commons-cli.version>
+        <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
+        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
+        <jstl-api.version>1.2</jstl-api.version>
+        <javax.servlet.jsp-api.version>2.3.1</javax.servlet.jsp-api.version>
+        <jackson-mapper-asl.version>1.9.13</jackson-mapper-asl.version>
+        <jstl.version>1.2</jstl.version>
+        <jackson.version>2.9.8</jackson.version>
+        <commons-fileupload.version>1.3</commons-fileupload.version>
+        <junit-platform.version>1.2.0</junit-platform.version>
+        <junit-jupiter.version>5.2.0</junit-jupiter.version>
+        <directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
+        <maven-install-plugin.version>2.5.1</maven-install-plugin.version>
+        <custom-pmd.version>0.0.1</custom-pmd.version>
+        <gitflow-incremental-builder.version>3.8</gitflow-incremental-builder.version>
+        <maven-jxr-plugin.version>2.3</maven-jxr-plugin.version>
+        <!-- <maven-pmd-plugin.version>3.9.0</maven-pmd-plugin.version> -->
+        <maven-pmd-plugin.version>3.8</maven-pmd-plugin.version>
+        <lombok.version>1.16.12</lombok.version>
+        <h2.version>1.4.197</h2.version>
+    </properties>
 
 </project>
 
diff --git a/protobuffer/README.md b/protobuffer/README.md
index 4302418a8b..329ad0e071 100644
--- a/protobuffer/README.md
+++ b/protobuffer/README.md
@@ -1,3 +1,7 @@
+## Google Protocol Buffer
+
+This module contains articles about Google Protocol Buffer.
+
 ### Relevant articles
 
 - [Introduction to Google Protocol Buffer](https://www.baeldung.com/google-protocol-buffer)
diff --git a/rabbitmq/README.md b/rabbitmq/README.md
index 01e51bd784..218b1a4b14 100644
--- a/rabbitmq/README.md
+++ b/rabbitmq/README.md
@@ -1,3 +1,7 @@
+## RabbitMQ
+
+This module contains articles about RabbitMQ.
+
 ### Relevant articles
 - [Introduction to RabbitMQ](https://www.baeldung.com/rabbitmq)
 
diff --git a/raml/README.MD b/raml/README.MD
index fcf0b41a18..2a3b9771be 100644
--- a/raml/README.MD
+++ b/raml/README.MD
@@ -1,2 +1,3 @@
-###The Course
-The "REST With Spring" Classes: https://bit.ly/restwithspring
+## RAML
+
+This module contains articles about the RESTful API Modeling Language (RAML).
diff --git a/ratpack/README.md b/ratpack/README.md
index 706fd0c8c3..9c24670709 100644
--- a/ratpack/README.md
+++ b/ratpack/README.md
@@ -1,3 +1,7 @@
+## Ratpack
+
+This module contains articles about Ratpack.
+
 ### Relevant articles
 
 - [Introduction to Ratpack](https://www.baeldung.com/ratpack)
diff --git a/reactor-core/README.md b/reactor-core/README.md
index ba5b355d02..e3cca35f86 100644
--- a/reactor-core/README.md
+++ b/reactor-core/README.md
@@ -1,3 +1,7 @@
+## Reactor Core
+
+This module contains articles about Reactor Core.
+
 ### Relevant articles
 
 - [Intro To Reactor Core](https://www.baeldung.com/reactor-core)
diff --git a/resteasy/README.md b/resteasy/README.md
index 3f3c833256..b576fbdf41 100644
--- a/resteasy/README.md
+++ b/resteasy/README.md
@@ -1,7 +1,6 @@
-=========
-
-## A Guide to RESTEasy
+## RESTEasy
 
+This module contains articles about RESTEasy.
 
 ### Relevant Articles:
 - [A Guide to RESTEasy](https://www.baeldung.com/resteasy-tutorial)
diff --git a/restx/README.md b/restx/README.md
index 665f7ea82d..a8180c984d 100644
--- a/restx/README.md
+++ b/restx/README.md
@@ -1,4 +1,8 @@
-# Relevant Articles
+## RESTX
+
+This module contains articles about RESTX.
+
+### Relevant Articles
 
 * [Introduction to RESTX](https://www.baeldung.com/java-restx)
 
diff --git a/rsocket/README.md b/rsocket/README.md
index fa232bc515..b859842bf3 100644
--- a/rsocket/README.md
+++ b/rsocket/README.md
@@ -1,3 +1,7 @@
-Relevant articles
+## RSocket
+
+This module contains articles about RSocket.
+
+### Relevant articles
 
 - [Introduction to RSocket](https://www.baeldung.com/rsocket)
diff --git a/rule-engines/README.md b/rule-engines/README.md
index 37d419daf5..64b1ec020d 100644
--- a/rule-engines/README.md
+++ b/rule-engines/README.md
@@ -1,3 +1,7 @@
-## Relevant articles:
+## Rule Engines
+
+This module contains articles about rule engines. Articles specific to a given rule engine go in the relevant submodule.
+
+### Relevant articles:
 
 - [List of Rules Engines in Java](https://www.baeldung.com/java-rule-engines)
diff --git a/rxjava-2/README.md b/rxjava-2/README.md
index 43c1a9942b..87f606a323 100644
--- a/rxjava-2/README.md
+++ b/rxjava-2/README.md
@@ -1,4 +1,8 @@
-## Relevant articles:
+## RxJava
+
+This module contains articles about RxJava.
+
+### Relevant articles:
 
 - [RxJava and Error Handling](https://www.baeldung.com/rxjava-error-handling)
 - [RxJava 2 – Flowable](https://www.baeldung.com/rxjava-2-flowable)
@@ -7,3 +11,4 @@
 - [Combining RxJava Completables](https://www.baeldung.com/rxjava-completable)
 - [Converting Synchronous and Asynchronous APIs to Observables using RxJava2](https://www.baeldung.com/rxjava-apis-to-observables)
 - [RxJava Hooks](https://www.baeldung.com/rxjava-hooks)
+- More articles: [[<-- prev]](/rxjava)
diff --git a/rxjava/README.md b/rxjava/README.md
index f9b7e2ba0d..c9308ddcc6 100644
--- a/rxjava/README.md
+++ b/rxjava/README.md
@@ -1,4 +1,8 @@
-## Relevant articles:
+## RxJava
+
+This module contains articles about RxJava.
+
+### Relevant articles:
 
 - [Dealing with Backpressure with RxJava](https://www.baeldung.com/rxjava-backpressure)
 - [How to Test RxJava?](https://www.baeldung.com/rxjava-testing)
@@ -13,3 +17,4 @@
 - [Filtering Observables in RxJava](https://www.baeldung.com/rxjava-filtering)
 - [RxJava One Observable, Multiple Subscribers](https://www.baeldung.com/rxjava-multiple-subscribers-observable)
 - [Difference Between Flatmap and Switchmap in RxJava](https://www.baeldung.com/rxjava-flatmap-switchmap)
+- More articles: [[next -->]](/rxjava-2)
diff --git a/spf4j/README.md b/spf4j/README.md
index a39cd01b5e..5c7bcf6116 100644
--- a/spf4j/README.md
+++ b/spf4j/README.md
@@ -1,3 +1,7 @@
-## Relevant articles:
+## SPF4J
+
+This module contains articles about SPF4J.
+
+### Relevant articles:
 
 - [Introduction to SPF4J](https://www.baeldung.com/spf4j)
diff --git a/spring-4/README.md b/spring-4/README.md
index d44eed915e..46d9b71e5c 100644
--- a/spring-4/README.md
+++ b/spring-4/README.md
@@ -6,3 +6,4 @@ This module contains articles about Spring 4
 - [A Guide to Flips for Spring](https://www.baeldung.com/flips-spring)
 - [Configuring a Hikari Connection Pool with Spring Boot](https://www.baeldung.com/spring-boot-hikari)
 - [Spring JSON-P with Jackson](https://www.baeldung.com/spring-jackson-jsonp)
+- [What’s New in Spring 4.3?](https://www.baeldung.com/whats-new-in-spring-4-3)
diff --git a/spring-4/pom.xml b/spring-4/pom.xml
index 59b74782ec..6c282b76a0 100644
--- a/spring-4/pom.xml
+++ b/spring-4/pom.xml
@@ -67,6 +67,27 @@
             <artifactId>tomcat-embed-jasper</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>${easymock.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>${hsqldb.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -88,6 +109,8 @@
     <properties>
         <start-class>com.baeldung.flips.ApplicationConfig</start-class>
         <flips-web.version>1.0.1</flips-web.version>
+        <easymock.version>3.6</easymock.version>
+        <hsqldb.version>2.4.0</hsqldb.version>
     </properties>
 
 </project>
diff --git a/spring-all/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java b/spring-4/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
rename to spring-4/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java b/spring-4/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java
rename to spring-4/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/cache/Foo.java b/spring-4/src/main/java/org/baeldung/spring43/cache/Foo.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/cache/Foo.java
rename to spring-4/src/main/java/org/baeldung/spring43/cache/Foo.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/cache/FooService.java b/spring-4/src/main/java/org/baeldung/spring43/cache/FooService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/cache/FooService.java
rename to spring-4/src/main/java/org/baeldung/spring43/cache/FooService.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java b/spring-4/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java
rename to spring-4/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java b/spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java
rename to spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java b/spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java
rename to spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/ctor/FooRepository.java b/spring-4/src/main/java/org/baeldung/spring43/ctor/FooRepository.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/ctor/FooRepository.java
rename to spring-4/src/main/java/org/baeldung/spring43/ctor/FooRepository.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/ctor/FooService.java b/spring-4/src/main/java/org/baeldung/spring43/ctor/FooService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/ctor/FooService.java
rename to spring-4/src/main/java/org/baeldung/spring43/ctor/FooService.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java b/spring-4/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java
rename to spring-4/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java b/spring-4/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java
rename to spring-4/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java b/spring-4/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java
rename to spring-4/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/depresolution/FooService.java b/spring-4/src/main/java/org/baeldung/spring43/depresolution/FooService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/depresolution/FooService.java
rename to spring-4/src/main/java/org/baeldung/spring43/depresolution/FooService.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java b/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java
rename to spring-4/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java b/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java
rename to spring-4/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java b/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java
rename to spring-4/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java b/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java
rename to spring-4/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java b/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java
rename to spring-4/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java
diff --git a/spring-all/src/main/resources/defaultmethods-context.xml b/spring-4/src/main/resources/defaultmethods-context.xml
similarity index 100%
rename from spring-all/src/main/resources/defaultmethods-context.xml
rename to spring-4/src/main/resources/defaultmethods-context.xml
diff --git a/spring-all/src/main/resources/implicit-ctor-context.xml b/spring-4/src/main/resources/implicit-ctor-context.xml
similarity index 100%
rename from spring-all/src/main/resources/implicit-ctor-context.xml
rename to spring-4/src/main/resources/implicit-ctor-context.xml
diff --git a/spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
similarity index 91%
rename from spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
index 347dd399e2..97ae651473 100644
--- a/spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
+++ b/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
@@ -6,13 +6,13 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
 @Configuration
 @ComponentScan
 @EnableWebMvc
-public class AttributeAnnotationConfiguration implements WebMvcConfigurer {
+public class AttributeAnnotationConfiguration extends WebMvcConfigurerAdapter {
 
     @Bean
     public ViewResolver viewResolver() {
diff --git a/spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
similarity index 97%
rename from spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
index eddd56a11b..f1028ebefb 100644
--- a/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
+++ b/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
@@ -14,7 +14,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.context.annotation.Scope;
 
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.replay;
 
 @Configuration
 @ComponentScan
diff --git a/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java b/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
diff --git a/spring-5-data-reactive/README.md b/spring-5-data-reactive/README.md
index 683b493317..03bd323cb4 100644
--- a/spring-5-data-reactive/README.md
+++ b/spring-5-data-reactive/README.md
@@ -10,3 +10,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Spring Data Reactive Repositories with MongoDB](https://www.baeldung.com/spring-data-mongodb-reactive)
 - [Spring Data MongoDB Tailable Cursors](https://www.baeldung.com/spring-data-mongodb-tailable-cursors)
 - [A Quick Look at R2DBC with Spring Data](https://www.baeldung.com/spring-data-r2dbc)
+- [Spring Data Reactive Repositories with Couchbase](https://www.baeldung.com/spring-data-reactive-couchbase)
+
diff --git a/spring-5-reactive-client/README.md b/spring-5-reactive-client/README.md
index 90d12cad1c..221c333d5b 100644
--- a/spring-5-reactive-client/README.md
+++ b/spring-5-reactive-client/README.md
@@ -6,4 +6,6 @@ This module contains articles about reactive Spring 5 WebClient
 The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles
+- [Logging Spring WebClient Calls](https://www.baeldung.com/spring-log-webclient-calls)
+- [Simultaneous Spring WebClient Calls](https://www.baeldung.com/spring-webclient-simultaneous-calls)
 
diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java b/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java
index 9afe50af58..bbfc88322b 100644
--- a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java
+++ b/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java
@@ -41,28 +41,25 @@ public class Client {
             .bodyToMono(User.class);
     }
 
-    public List<User> fetchUsers(List<Integer> userIds) {
+    public Flux<User> fetchUsers(List<Integer> userIds) {
         return Flux.fromIterable(userIds)
             .parallel()
             .runOn(Schedulers.elastic())
             .flatMap(this::getUser)
-            .collectSortedList((u1, u2) -> u2.id() - u1.id())
-            .block();
+            .ordered((u1, u2) -> u2.id() - u1.id());
     }
 
-    public List<User> fetchUserAndOtherUser(int id) {
+    public Flux<User> fetchUserAndOtherUser(int id) {
         return Flux.merge(getUser(id), getOtherUser(id))
             .parallel()
             .runOn(Schedulers.elastic())
-            .collectSortedList((u1, u2) -> u2.id() - u1.id())
-            .block();
+            .ordered((u1, u2) -> u2.id() - u1.id());
     }
 
-    public UserWithItem fetchUserAndItem(int userId, int itemId) {
+    public Mono<UserWithItem> fetchUserAndItem(int userId, int itemId) {
         Mono<User> user = getUser(userId).subscribeOn(Schedulers.elastic());
         Mono<Item> item = getItem(itemId).subscribeOn(Schedulers.elastic());
 
-        return Mono.zip(user, item, UserWithItem::new)
-            .block();
+        return Mono.zip(user, item, UserWithItem::new);
     }
 }
diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java b/spring-5-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java
index 0acedf15b0..d74a64d9c9 100644
--- a/spring-5-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java
+++ b/spring-5-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java
@@ -56,7 +56,9 @@ public class ClientIntegrationTest {
 
         // Act
         long start = System.currentTimeMillis();
-        List<User> users = client.fetchUsers(userIds);
+        List<User> users = client.fetchUsers(userIds)
+          .collectList()
+          .block();
         long end = System.currentTimeMillis();
 
         // Assert
diff --git a/spring-5-security-cognito/pom.xml b/spring-5-security-cognito/pom.xml
index 431c9b8d9c..cc6a4a56fb 100644
--- a/spring-5-security-cognito/pom.xml
+++ b/spring-5-security-cognito/pom.xml
@@ -16,7 +16,6 @@
     </parent>
 
     <dependencies>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
diff --git a/spring-5/README.md b/spring-5/README.md
index 7588d23304..3f839a5bca 100644
--- a/spring-5/README.md
+++ b/spring-5/README.md
@@ -15,4 +15,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Spring ResponseStatusException](https://www.baeldung.com/spring-response-status-exception)
 - [Spring Assert Statements](https://www.baeldung.com/spring-assert)
 - [Configuring a Hikari Connection Pool with Spring Boot](https://www.baeldung.com/spring-boot-hikari)
-
+- [Difference between \<context:annotation-config\> vs \<context:component-scan\>](https://www.baeldung.com/spring-contextannotation-contextcomponentscan)
diff --git a/spring-all/README.md b/spring-all/README.md
deleted file mode 100644
index 1d6cb0bfad..0000000000
--- a/spring-all/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-## Spring General Example Project
-
-This project is used to replicate Spring Exceptions only.
-
-### The Course
-
-The "REST With Spring" Classes: http://bit.ly/restwithspring
-
-### Relevant articles:
-
-- [Guide to Spring @Autowired](https://www.baeldung.com/spring-autowire)
-- [Spring Profiles](https://www.baeldung.com/spring-profiles)
-- [A Spring Custom Annotation for a Better DAO](https://www.baeldung.com/spring-annotation-bean-pre-processor)
-- [What’s New in Spring 4.3?](https://www.baeldung.com/whats-new-in-spring-4-3)
-- [Running Setup Data on Startup in Spring](https://www.baeldung.com/running-setup-logic-on-startup-in-spring)
-- [Quick Guide to Spring Controllers](https://www.baeldung.com/spring-controllers)
-- [Quick Guide to Spring Bean Scopes](https://www.baeldung.com/spring-bean-scopes)
-- [Introduction To Ehcache](https://www.baeldung.com/ehcache)
-- [A Guide to the Spring Task Scheduler](https://www.baeldung.com/spring-task-scheduler)
-- [Guide to Spring Retry](https://www.baeldung.com/spring-retry)
-- [Custom Scope in Spring](https://www.baeldung.com/spring-custom-scope)
-- [A CLI with Spring Shell](https://www.baeldung.com/spring-shell-cli)
-- [JasperReports with Spring](https://www.baeldung.com/spring-jasper)
-- [Model, ModelMap, and ModelView in Spring MVC](https://www.baeldung.com/spring-mvc-model-model-map-model-view)
-- [A Guide To Caching in Spring](https://www.baeldung.com/spring-cache-tutorial)
-- [How To Do @Async in Spring](https://www.baeldung.com/spring-async)
-- [@Order in Spring](https://www.baeldung.com/spring-order)
-- [Spring Web Contexts](https://www.baeldung.com/spring-web-contexts)
-- [Spring Cache – Creating a Custom KeyGenerator](https://www.baeldung.com/spring-cache-custom-keygenerator)
-- [Spring @Primary Annotation](https://www.baeldung.com/spring-primary)
-- [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)
diff --git a/spring-all/pom.xml b/spring-all/pom.xml
deleted file mode 100644
index 8c88efb970..0000000000
--- a/spring-all/pom.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<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-all</artifactId>
-    <version>0.1-SNAPSHOT</version>
-    <name>spring-all</name>
-    <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>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <!-- Spring -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.retry</groupId>
-            <artifactId>spring-retry</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.shell</groupId>
-            <artifactId>spring-shell</artifactId>
-            <version>${org.springframework.shell.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-websocket</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-messaging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${annotation-api.version}</version>
-        </dependency>
-        <!-- aspectj -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aspects</artifactId>
-        </dependency>
-        <!-- persistence -->
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>${javassist.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-        </dependency>
-        <!-- validation -->
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>${hibernate.version}</version>
-        </dependency>
-        <!-- web -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <!-- util -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.jasperreports</groupId>
-            <artifactId>jasperreports</artifactId>
-            <version>${jasperreports.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- test scoped -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>${easymock.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
-
-        <!-- ShedLock -->
-        <dependency>
-            <groupId>net.javacrumbs.shedlock</groupId>
-            <artifactId>shedlock-spring</artifactId>
-            <version>${shedlock.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.javacrumbs.shedlock</groupId>
-            <artifactId>shedlock-provider-jdbc-template</artifactId>
-            <version>${shedlock.version}</version>
-        </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>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-thymeleaf</artifactId>
-                <version>${org.springframework.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <finalName>spring-all</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.sample.App</start-class>
-        <!-- Spring -->
-        <org.springframework.version>5.0.6.RELEASE</org.springframework.version>
-        <org.springframework.shell.version>1.2.0.RELEASE</org.springframework.shell.version>
-        <annotation-api.version>1.3.2</annotation-api.version>
-        <!-- persistence -->
-        <hibernate.version>5.2.5.Final</hibernate.version>
-
-        <!-- util -->
-        <guava.version>25.1-jre</guava.version>
-        <ehcache.version>3.5.2</ehcache.version>
-        <easymock.version>3.6</easymock.version>
-        <assertj.version>3.6.1</assertj.version>
-        <jasperreports.version>6.6.0</jasperreports.version>
-        <shedlock.version>2.1.0</shedlock.version>
-        <javassist.version>3.22.0-GA</javassist.version>
-    </properties>
-
-</project>
diff --git a/spring-all/src/main/resources/beanInjection-constructor.xml b/spring-all/src/main/resources/beanInjection-constructor.xml
deleted file mode 100644
index a0713fd9f8..0000000000
--- a/spring-all/src/main/resources/beanInjection-constructor.xml
+++ /dev/null
@@ -1,15 +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"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-	   					   http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	<bean id="ship" class="org.baeldung.bean.injection.Ship">
-		<constructor-arg>
-			<ref bean="helm" />
-		</constructor-arg>
-	</bean>
-
-	<bean id="helm" class="org.baeldung.bean.injection.Helm" />
-
-</beans>
\ No newline at end of file
diff --git a/spring-all/src/main/resources/beanInjection-setter.xml b/spring-all/src/main/resources/beanInjection-setter.xml
deleted file mode 100644
index b2d3a05594..0000000000
--- a/spring-all/src/main/resources/beanInjection-setter.xml
+++ /dev/null
@@ -1,14 +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"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-	   					   http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	<bean id="ship" class="org.baeldung.bean.injection.Ship">
-		<property name="helm">
-			<ref bean="helm" />
-		</property>
-	</bean>
-
-	<bean id="helm" class="org.baeldung.bean.injection.Helm" />
-</beans>
\ No newline at end of file
diff --git a/spring-all/src/main/resources/employeeEmailReport.jrxml b/spring-all/src/main/resources/employeeEmailReport.jrxml
deleted file mode 100644
index ad4aaaac90..0000000000
--- a/spring-all/src/main/resources/employeeEmailReport.jrxml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="employeeReport" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
-	<parameter name="idEmployee" class="java.lang.Integer" isForPrompting="false"/>
-	<queryString>
-		<![CDATA[SELECT * FROM EMAIL WHERE ID_EMPLOYEE = $P{idEmployee}]]>
-	</queryString>
-	<field name="ADDRESS" class="java.lang.String"/>
-	<detail>
-		<band height="20" splitType="Stretch">
-			<textField>
-				<reportElement x="0" y="0" width="156" height="20"/>
-				<textElement/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{ADDRESS}]]></textFieldExpression>
-			</textField>
-		</band>
-	</detail>
-</jasperReport>
diff --git a/spring-all/src/main/webapp/WEB-INF/greeting.xml b/spring-all/src/main/webapp/WEB-INF/greeting.xml
deleted file mode 100644
index 3f0ae83455..0000000000
--- a/spring-all/src/main/webapp/WEB-INF/greeting.xml
+++ /dev/null
@@ -1,11 +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"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans
-   http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-	
-	<bean id="greeting" class="com.baeldung.contexts.Greeting">
-		<property name="message" value="Hello World !!" />
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/normal-webapp-servlet.xml b/spring-all/src/main/webapp/WEB-INF/normal-webapp-servlet.xml
deleted file mode 100644
index 0a7a0919a8..0000000000
--- a/spring-all/src/main/webapp/WEB-INF/normal-webapp-servlet.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:context="http://www.springframework.org/schema/context"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   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.xsd">
-
-	<context:component-scan base-package="com.baeldung.contexts.normal" />
-
-	<bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
-		<property name="viewClass" value="org.springframework.web.servlet.view.JstlView" />
-		<property name="prefix" value="/WEB-INF/view/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/rootApplicationContext.xml b/spring-all/src/main/webapp/WEB-INF/rootApplicationContext.xml
deleted file mode 100644
index af03661ebc..0000000000
--- a/spring-all/src/main/webapp/WEB-INF/rootApplicationContext.xml
+++ /dev/null
@@ -1,14 +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"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-   http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-   http://www.springframework.org/schema/context
-   http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-
-	<context:component-scan base-package="com.baeldung.contexts.services" />
-	
-	<import resource="greeting.xml" />
-</beans>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/secure-webapp-servlet.xml b/spring-all/src/main/webapp/WEB-INF/secure-webapp-servlet.xml
deleted file mode 100644
index 6cdd3971bf..0000000000
--- a/spring-all/src/main/webapp/WEB-INF/secure-webapp-servlet.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:context="http://www.springframework.org/schema/context"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   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.xsd">
-
-	<context:component-scan base-package="com.baeldung.contexts.secure" />
-
-	<bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
-		<property name="viewClass" value="org.springframework.web.servlet.view.JstlView" />
-		<property name="prefix" value="/WEB-INF/secure/view/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/view/sample.jsp b/spring-all/src/main/webapp/WEB-INF/view/sample.jsp
deleted file mode 100644
index 7cc14b5dcd..0000000000
--- a/spring-all/src/main/webapp/WEB-INF/view/sample.jsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head></head>
-
-<body>
-	<h1>This is the body of the sample view</h1>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp b/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
deleted file mode 100644
index 0946f1b5ef..0000000000
--- a/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head></head>
-
-<body>
-	<h1>Bean Scopes Examples</h1>
-	<br> Previous Message: ${previousMessage }
-	<br> Current Message: ${currentMessage }
-	<br>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/view/welcome.jsp b/spring-all/src/main/webapp/WEB-INF/view/welcome.jsp
deleted file mode 100644
index 6a82fb1d5a..0000000000
--- a/spring-all/src/main/webapp/WEB-INF/view/welcome.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-	<title>Spring Web Contexts</title>
-</head>
-<body>
-	<br>
-	<div style="padding: 10px; border-radius: 10px; font-size: 30px; text-align: center;">
-		Normal Web Application : ${message}
-	</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-all/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java b/spring-all/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
deleted file mode 100644
index f24cdef917..0000000000
--- a/spring-all/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.baeldung.caching.test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.baeldung.caching.eviction.service.CachingService;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean;
-import org.springframework.cache.support.SimpleCacheManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
-public class CacheEvictAnnotationIntegrationTest {
-
-	@Configuration
-	@EnableCaching
-	static class ContextConfiguration {
-
-		@Bean
-		public CachingService cachingService() {
-			return new CachingService();
-		}
-		
-		@Bean
-		public CacheManager cacheManager(){
-			SimpleCacheManager cacheManager = new SimpleCacheManager();
-			List<Cache> caches = new ArrayList<>();
-			caches.add(cacheBean().getObject());
-			cacheManager.setCaches(caches );
-			return cacheManager;
-		}
-		
-		@Bean
-		public ConcurrentMapCacheFactoryBean cacheBean(){
-			ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean();
-			cacheFactoryBean.setName("first");
-			return cacheFactoryBean;
-		}
-	}
-
-	@Autowired
-	CachingService cachingService;
-
-	@Before
-	public void before() {
-		cachingService.putToCache("first", "key1", "Baeldung");
-		cachingService.putToCache("first", "key2", "Article");
-	}
-
-	@Test
-	public void givenFirstCache_whenSingleCacheValueEvictRequested_thenEmptyCacheValue() {
-		cachingService.evictSingleCacheValue("key1");
-		String key1 = cachingService.getFromCache("first", "key1");
-		assertThat(key1, is(nullValue()));
-	}
-
-	@Test
-	public void givenFirstCache_whenAllCacheValueEvictRequested_thenEmptyCache() {
-		cachingService.evictAllCacheValues();
-		String key1 = cachingService.getFromCache("first", "key1");
-		String key2 = cachingService.getFromCache("first", "key2");
-		assertThat(key1, is(nullValue()));
-		assertThat(key2, is(nullValue()));
-	}
-}
diff --git a/spring-batch/.gitignore b/spring-batch/.gitignore
index 0ef6d10b38..5c16bc1baf 100644
--- a/spring-batch/.gitignore
+++ b/spring-batch/.gitignore
@@ -1 +1,2 @@
-output.csv
\ No newline at end of file
+output.csv
+output.json
\ No newline at end of file
diff --git a/spring-batch/pom.xml b/spring-batch/pom.xml
index e81078568b..48d3baeae3 100644
--- a/spring-batch/pom.xml
+++ b/spring-batch/pom.xml
@@ -15,12 +15,30 @@
     </parent>
 
     <dependencies>
+    
+        <!-- JAXB APIs & runtime no longer provided in JDK 11 -->
+        <!-- see http://openjdk.java.net/jeps/320 -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxb.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        
         <!-- SQLite database driver -->
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
             <version>${sqlite.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
@@ -32,40 +50,67 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
             <version>${spring.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.springframework.batch</groupId>
             <artifactId>spring-batch-core</artifactId>
             <version>${spring.batch.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.springframework.batch</groupId>
             <artifactId>spring-batch-test</artifactId>
             <version>${spring.batch.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
             <version>${opencsv.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-batch</artifactId>
+            <version>${spring.boot.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>2.5.0</version>
+            <scope>runtime</scope>
+        </dependency>
         
         <dependency>
-    		<groupId>org.awaitility</groupId>
-    		<artifactId>awaitility</artifactId>
-    		<version>${awaitility.version}</version>
-    		<scope>test</scope>
-		</dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring.boot.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <properties>
-        <spring.version>5.0.3.RELEASE</spring.version>
-        <spring.batch.version>4.0.0.RELEASE</spring.batch.version>
+        <spring.version>5.2.0.RELEASE</spring.version>
+        <spring.batch.version>4.2.0.RELEASE</spring.batch.version>
+        <spring.boot.version>2.1.9.RELEASE</spring.boot.version>
         <sqlite.version>3.15.1</sqlite.version>
         <opencsv.version>4.1</opencsv.version>
+        <jaxb.version>2.3.1</jaxb.version>
         <awaitility.version>3.1.1</awaitility.version>
     </properties>
 
diff --git a/spring-batch/src/main/java/org/baeldung/batch/App.java b/spring-batch/src/main/java/org/baeldung/batch/App.java
index 749591aa03..91b99ba571 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/App.java
+++ b/spring-batch/src/main/java/org/baeldung/batch/App.java
@@ -1,5 +1,7 @@
 package org.baeldung.batch;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobParameters;
@@ -8,6 +10,9 @@ import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 public class App {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
+
     public static void main(final String[] args) {
         // Spring Java config
         final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
@@ -27,19 +32,16 @@ public class App {
         final JobLauncher jobLauncher = (JobLauncher) context.getBean("jobLauncher");
         final Job job = (Job) context.getBean(batchJobName);
 
-        System.out.println("----------------------------------------");
-        System.out.println("Starting the batch job: " + batchJobName);
+        LOGGER.info("Starting the batch job: {}", batchJobName);
         try {
-			// To enable multiple execution of a job with the same parameters
-			JobParameters jobParameters = new JobParametersBuilder()
-                    .addString("jobID", String.valueOf(System.currentTimeMillis()))
-                    .toJobParameters();
+            // To enable multiple execution of a job with the same parameters
+            JobParameters jobParameters = new JobParametersBuilder().addString("jobID", String.valueOf(System.currentTimeMillis()))
+                .toJobParameters();
             final JobExecution execution = jobLauncher.run(job, jobParameters);
-            System.out.println("Job Status : " + execution.getStatus());
-            System.out.println("Job succeeded");
+            LOGGER.info("Job Status : {}", execution.getStatus());
         } catch (final Exception e) {
             e.printStackTrace();
-            System.out.println("Job failed");
+            LOGGER.error("Job failed {}", e.getMessage());
         }
     }
 }
\ No newline at end of file
diff --git a/spring-batch/src/main/java/org/baeldung/batch/SpringBatchConfig.java b/spring-batch/src/main/java/org/baeldung/batch/SpringBatchConfig.java
index b318dda154..07dd65bcfd 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/SpringBatchConfig.java
+++ b/spring-batch/src/main/java/org/baeldung/batch/SpringBatchConfig.java
@@ -86,9 +86,14 @@ public class SpringBatchConfig {
     }
 
     @Bean
-    protected Step step1(@Qualifier("itemProcessor") ItemProcessor<Transaction, Transaction> processor,
-                         ItemWriter<Transaction> writer) throws ParseException {
-        return stepBuilderFactory.get("step1").<Transaction, Transaction>chunk(10).reader(itemReader(inputCsv)).processor(processor).writer(writer).build();
+    protected Step step1(@Qualifier("itemProcessor") ItemProcessor<Transaction, Transaction> processor, ItemWriter<Transaction> writer) throws ParseException {
+        return stepBuilderFactory
+                .get("step1")
+                .<Transaction, Transaction> chunk(10)
+                .reader(itemReader(inputCsv))
+                .processor(processor)
+                .writer(writer)
+                .build();
     }
 
     @Bean(name = "firstBatchJob")
diff --git a/spring-batch/src/main/java/org/baeldung/batch/partitioner/SpringbatchPartitionerApp.java b/spring-batch/src/main/java/org/baeldung/batch/partitioner/SpringbatchPartitionerApp.java
index e56afc591c..f456135058 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/partitioner/SpringbatchPartitionerApp.java
+++ b/spring-batch/src/main/java/org/baeldung/batch/partitioner/SpringbatchPartitionerApp.java
@@ -1,5 +1,7 @@
 package org.baeldung.batch.partitioner;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobParameters;
@@ -7,6 +9,9 @@ import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 public class SpringbatchPartitionerApp {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SpringbatchPartitionerApp.class);
+
     public static void main(final String[] args) {
         // Spring Java config
         final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
@@ -15,14 +20,13 @@ public class SpringbatchPartitionerApp {
 
         final JobLauncher jobLauncher = (JobLauncher) context.getBean("jobLauncher");
         final Job job = (Job) context.getBean("partitionerJob");
-        System.out.println("Starting the batch job");
+        LOGGER.info("Starting the batch job");
         try {
             final JobExecution execution = jobLauncher.run(job, new JobParameters());
-            System.out.println("Job Status : " + execution.getStatus());
-            System.out.println("Job succeeded");
+            LOGGER.info("Job Status : {}", execution.getStatus());
         } catch (final Exception e) {
             e.printStackTrace();
-            System.out.println("Job failed");
+            LOGGER.error("Job failed {}", e.getMessage());
         }
     }
 }
\ No newline at end of file
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchApplication.java b/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchApplication.java
new file mode 100644
index 0000000000..39bfdfbee7
--- /dev/null
+++ b/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchApplication.java
@@ -0,0 +1,43 @@
+package org.baeldung.batchtesting;
+
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
+
+@SpringBootApplication
+@PropertySource("classpath:batchtesting/application.properties")
+public class SpringBatchApplication implements CommandLineRunner {
+
+    @Autowired
+    private JobLauncher jobLauncher;
+
+    @Autowired
+    @Qualifier("transformBooksRecords")
+    private Job transformBooksRecordsJob;
+
+    @Value("${file.input}")
+    private String input;
+
+    @Value("${file.output}")
+    private String output;
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBatchApplication.class, args);
+    }
+
+    @Override
+    public void run(String... args) throws Exception {
+        JobParametersBuilder paramsBuilder = new JobParametersBuilder();
+        paramsBuilder.addString("file.input", input);
+        paramsBuilder.addString("file.output", output);
+        jobLauncher.run(transformBooksRecordsJob, paramsBuilder.toJobParameters());
+    }
+
+}
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchConfiguration.java b/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchConfiguration.java
new file mode 100644
index 0000000000..2d891ad7da
--- /dev/null
+++ b/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchConfiguration.java
@@ -0,0 +1,137 @@
+package org.baeldung.batchtesting;
+
+import java.io.IOException;
+
+import org.baeldung.batchtesting.model.Book;
+import org.baeldung.batchtesting.model.BookDetails;
+import org.baeldung.batchtesting.model.BookRecord;
+import org.baeldung.batchtesting.service.BookDetailsItemProcessor;
+import org.baeldung.batchtesting.service.BookItemProcessor;
+import org.baeldung.batchtesting.service.BookRecordFieldSetMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.Step;
+import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
+import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
+import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
+import org.springframework.batch.core.configuration.annotation.StepScope;
+import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.item.file.FlatFileItemReader;
+import org.springframework.batch.item.file.builder.FlatFileItemReaderBuilder;
+import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.json.JacksonJsonObjectMarshaller;
+import org.springframework.batch.item.json.JsonFileItemWriter;
+import org.springframework.batch.item.json.builder.JsonFileItemWriterBuilder;
+import org.springframework.batch.item.support.ListItemWriter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.FileSystemResource;
+
+
+@Configuration
+@EnableBatchProcessing
+public class SpringBatchConfiguration {
+
+    private static Logger LOGGER = LoggerFactory.getLogger(SpringBatchConfiguration.class);
+
+    private static final String[] TOKENS = { "bookname", "bookauthor", "bookformat", "isbn", "publishyear" };
+
+    @Autowired
+    private JobBuilderFactory jobBuilderFactory;
+
+    @Autowired
+    private StepBuilderFactory stepBuilderFactory;
+
+    @Bean
+    @StepScope
+    public FlatFileItemReader<BookRecord> csvItemReader(@Value("#{jobParameters['file.input']}") String input) {
+        FlatFileItemReaderBuilder<BookRecord> builder = new FlatFileItemReaderBuilder<>();
+        FieldSetMapper<BookRecord> bookRecordFieldSetMapper = new BookRecordFieldSetMapper();
+        LOGGER.info("Configuring reader to input {}", input);
+        // @formatter:off
+        return builder
+          .name("bookRecordItemReader")
+          .resource(new FileSystemResource(input))
+          .delimited()
+          .names(TOKENS)
+          .fieldSetMapper(bookRecordFieldSetMapper)
+          .build();
+        // @formatter:on
+    }
+
+    @Bean
+    @StepScope
+    public JsonFileItemWriter<Book> jsonItemWriter(@Value("#{jobParameters['file.output']}") String output) throws IOException {
+        JsonFileItemWriterBuilder<Book> builder = new JsonFileItemWriterBuilder<>();
+        JacksonJsonObjectMarshaller<Book> marshaller = new JacksonJsonObjectMarshaller<>();
+        LOGGER.info("Configuring writer to output {}", output);
+        // @formatter:off
+        return builder
+          .name("bookItemWriter")
+          .jsonObjectMarshaller(marshaller)
+          .resource(new FileSystemResource(output))
+          .build();
+        // @formatter:on
+    }
+
+    @Bean
+    @StepScope
+    public ListItemWriter<BookDetails> listItemWriter() {
+        return new ListItemWriter<BookDetails>();
+    }
+
+    @Bean
+    @StepScope
+    public BookItemProcessor bookItemProcessor() {
+        return new BookItemProcessor();
+    }
+
+    @Bean
+    @StepScope
+    public BookDetailsItemProcessor bookDetailsItemProcessor() {
+        return new BookDetailsItemProcessor();
+    }
+
+    @Bean
+    public Step step1(ItemReader<BookRecord> csvItemReader, ItemWriter<Book> jsonItemWriter) throws IOException {
+        // @formatter:off
+        return stepBuilderFactory
+          .get("step1")
+          .<BookRecord, Book> chunk(3)
+          .reader(csvItemReader)
+          .processor(bookItemProcessor())
+          .writer(jsonItemWriter)
+          .build();
+        // @formatter:on
+    }
+
+    @Bean
+    public Step step2(ItemReader<BookRecord> csvItemReader, ItemWriter<BookDetails> listItemWriter) {
+        // @formatter:off
+        return stepBuilderFactory
+          .get("step2")
+          .<BookRecord, BookDetails> chunk(3)
+          .reader(csvItemReader)
+          .processor(bookDetailsItemProcessor())
+          .writer(listItemWriter)
+          .build();
+        // @formatter:on
+    }
+
+    @Bean(name = "transformBooksRecords")
+    public Job transformBookRecords(Step step1, Step step2) throws IOException {
+        // @formatter:off
+        return jobBuilderFactory
+          .get("transformBooksRecords")
+          .flow(step1)
+          .next(step2)
+          .end()
+          .build();
+        // @formatter:on
+    }
+
+}
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/model/Book.java b/spring-batch/src/main/java/org/baeldung/batchtesting/model/Book.java
new file mode 100644
index 0000000000..3ea4a29e7f
--- /dev/null
+++ b/spring-batch/src/main/java/org/baeldung/batchtesting/model/Book.java
@@ -0,0 +1,33 @@
+package org.baeldung.batchtesting.model;
+
+public class Book {
+
+    private String author;
+
+    private String name;
+
+    public Book() {
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Book [author=" + author + ", name=" + name + "]";
+    }
+
+}
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookDetails.java b/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookDetails.java
new file mode 100644
index 0000000000..d9284fbc66
--- /dev/null
+++ b/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookDetails.java
@@ -0,0 +1,50 @@
+package org.baeldung.batchtesting.model;
+
+public class BookDetails {
+
+    private String bookName;
+
+    private String bookFormat;
+
+    private String publishingYear;
+
+    private String bookISBN;
+
+    public String getBookName() {
+        return bookName;
+    }
+
+    public void setBookName(String bookName) {
+        this.bookName = bookName;
+    }
+
+    public String getBookFormat() {
+        return bookFormat;
+    }
+
+    public void setBookFormat(String bookFormat) {
+        this.bookFormat = bookFormat;
+    }
+
+    public String getPublishingYear() {
+        return publishingYear;
+    }
+
+    public void setPublishingYear(String publishingYear) {
+        this.publishingYear = publishingYear;
+    }
+
+    public String getBookISBN() {
+        return bookISBN;
+    }
+
+    public void setBookISBN(String bookISBN) {
+        this.bookISBN = bookISBN;
+    }
+
+    @Override
+    public String toString() {
+        return "BookDetails [bookName=" + bookName + ", bookFormat=" + bookFormat + ", publishingYear=" + publishingYear + ", bookISBN=" + bookISBN + "]";
+    }
+
+}
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookRecord.java b/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookRecord.java
new file mode 100644
index 0000000000..35fb40e878
--- /dev/null
+++ b/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookRecord.java
@@ -0,0 +1,60 @@
+package org.baeldung.batchtesting.model;
+
+public class BookRecord {
+
+    private String bookName;
+
+    private String bookAuthor;
+
+    private String bookFormat;
+
+    private String bookISBN;
+
+    private String publishingYear;
+
+    public void setBookName(String bookName) {
+        this.bookName = bookName;
+    }
+
+    public void setBookAuthor(String bookAuthor) {
+        this.bookAuthor = bookAuthor;
+    }
+
+    public void setBookFormat(String bookFormat) {
+        this.bookFormat = bookFormat;
+    }
+
+    public void setBookISBN(String bookISBN) {
+        this.bookISBN = bookISBN;
+    }
+
+    public void setPublishingYear(String publishingYear) {
+        this.publishingYear = publishingYear;
+    }
+
+    public String getBookName() {
+        return bookName;
+    }
+
+    public String getBookAuthor() {
+        return bookAuthor;
+    }
+
+    public String getBookFormat() {
+        return bookFormat;
+    }
+
+    public String getBookISBN() {
+        return bookISBN;
+    }
+
+    public String getPublishingYear() {
+        return publishingYear;
+    }
+
+    @Override
+    public String toString() {
+        return "BookRecord [bookName=" + bookName + ", bookAuthor=" + bookAuthor + ", bookFormat=" + bookFormat + ", bookISBN=" + bookISBN + ", publishingYear=" + publishingYear + "]";
+    }
+
+}
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookDetailsItemProcessor.java b/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookDetailsItemProcessor.java
new file mode 100644
index 0000000000..f3800fee51
--- /dev/null
+++ b/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookDetailsItemProcessor.java
@@ -0,0 +1,24 @@
+package org.baeldung.batchtesting.service;
+
+import org.baeldung.batchtesting.model.BookDetails;
+import org.baeldung.batchtesting.model.BookRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.batch.item.ItemProcessor;
+
+public class BookDetailsItemProcessor implements ItemProcessor<BookRecord, BookDetails> {
+
+    private static Logger LOGGER = LoggerFactory.getLogger(BookDetailsItemProcessor.class);
+
+    @Override
+    public BookDetails process(BookRecord item) throws Exception {
+        BookDetails bookDetails = new BookDetails();
+        bookDetails.setBookFormat(item.getBookFormat());
+        bookDetails.setBookISBN(item.getBookISBN());
+        bookDetails.setPublishingYear(item.getPublishingYear());
+        bookDetails.setBookName(item.getBookName());
+        LOGGER.info("Processing bookdetails {}", bookDetails);
+        return bookDetails;
+    }
+
+}
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookItemProcessor.java b/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookItemProcessor.java
new file mode 100644
index 0000000000..69e72ba1d3
--- /dev/null
+++ b/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookItemProcessor.java
@@ -0,0 +1,22 @@
+package org.baeldung.batchtesting.service;
+
+import org.baeldung.batchtesting.model.Book;
+import org.baeldung.batchtesting.model.BookRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.batch.item.ItemProcessor;
+
+public class BookItemProcessor implements ItemProcessor<BookRecord, Book> {
+
+    private static Logger LOGGER = LoggerFactory.getLogger(BookItemProcessor.class);
+
+    @Override
+    public Book process(BookRecord item) throws Exception {
+        Book book = new Book();
+        book.setAuthor(item.getBookAuthor());
+        book.setName(item.getBookName());
+        LOGGER.info("Processing book {}", book);
+        return book;
+    }
+
+}
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookRecordFieldSetMapper.java b/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookRecordFieldSetMapper.java
new file mode 100644
index 0000000000..cfc36fed7a
--- /dev/null
+++ b/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookRecordFieldSetMapper.java
@@ -0,0 +1,22 @@
+package org.baeldung.batchtesting.service;
+
+import org.baeldung.batchtesting.model.BookRecord;
+import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
+import org.springframework.validation.BindException;
+
+
+public class BookRecordFieldSetMapper implements FieldSetMapper<BookRecord> {
+
+    @Override
+    public BookRecord mapFieldSet(FieldSet fieldSet) throws BindException {
+        BookRecord bookRecord = new BookRecord();
+        bookRecord.setBookName(fieldSet.readString("bookname"));
+        bookRecord.setBookAuthor(fieldSet.readString("bookauthor"));
+        bookRecord.setBookFormat(fieldSet.readString("bookformat"));
+        bookRecord.setBookISBN(fieldSet.readString("isbn"));
+        bookRecord.setPublishingYear(fieldSet.readString("publishyear"));
+        return bookRecord;
+    }
+
+}
diff --git a/spring-batch/src/main/resources/batchtesting/application.properties b/spring-batch/src/main/resources/batchtesting/application.properties
new file mode 100644
index 0000000000..11af6f7d31
--- /dev/null
+++ b/spring-batch/src/main/resources/batchtesting/application.properties
@@ -0,0 +1,3 @@
+spring.batch.job.enabled=false
+file.input=src/main/resources/batchtesting/input.csv
+file.output=src/main/resources/batchtesting/output.json
\ No newline at end of file
diff --git a/spring-batch/src/main/resources/batchtesting/input.csv b/spring-batch/src/main/resources/batchtesting/input.csv
new file mode 100644
index 0000000000..5b873241d4
--- /dev/null
+++ b/spring-batch/src/main/resources/batchtesting/input.csv
@@ -0,0 +1,8 @@
+Foundation,Asimov I.,hardcover,ISBN 12839,2018
+Roadside Picnic,Strugatski A.,paperback,ISBN 12839,1988
+Norwegian Wood,Murakami H.,paperback,ISBN 12839,2015
+Davinci Code,Brown D.,hardcover,ISBN 12839,2005
+Ubik,Dick K. P.,hardcover,ISBN 12839,2013
+JFK,King S.,paperback,ISBN 12839,2017
+Contact,Sagan C.,paperback,ISBN 12839,2000
+Brave New World,Huxley A.,paperback,ISBN 12839,1986
diff --git a/spring-batch/src/main/resources/logback.xml b/spring-batch/src/main/resources/logback.xml
index 91d4292b8e..9a622ceb65 100644
--- a/spring-batch/src/main/resources/logback.xml
+++ b/spring-batch/src/main/resources/logback.xml
@@ -8,14 +8,17 @@
         </layout>
     </appender>
 
-    <logger name="org.baeldung.taskletsvschunks" level="debug"
-            additivity="false">
+    <logger name="org.baeldung.taskletsvschunks" level="debug" additivity="false">
         <appender-ref ref="STDOUT" />
     </logger>
     
     <logger name="org.baeldung.batchscheduler" level="debug" additivity="false">
         <appender-ref ref="STDOUT" />
     </logger>
+    
+    <logger name="org.baeldung.batchtesting" level="debug" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
 
     <root level="error">
         <appender-ref ref="STDOUT" />
diff --git a/spring-batch/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-batch/src/test/java/org/baeldung/SpringContextIntegrationTest.java
index c3a9f74759..0898603083 100644
--- a/spring-batch/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-batch/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -5,8 +5,8 @@ import org.junit.Test;
 
 public class SpringContextIntegrationTest {
 
-	@Test
-    public final void testMain() throws Exception {
+    @Test
+    public void testMain() throws Exception {
         App.main(null);
-	}
+    }
 }
diff --git a/spring-batch/src/test/java/org/baeldung/SpringContextTest.java b/spring-batch/src/test/java/org/baeldung/SpringContextTest.java
index 0de9a07b0a..1a4f923a1e 100644
--- a/spring-batch/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-batch/src/test/java/org/baeldung/SpringContextTest.java
@@ -5,8 +5,8 @@ import org.junit.Test;
 
 public class SpringContextTest {
 
-	@Test
-    public final void testMain() throws Exception {
+    @Test
+    public void testMain() throws Exception {
         App.main(null);
-	}
+    }
 }
diff --git a/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchIntegrationTest.java b/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchIntegrationTest.java
new file mode 100644
index 0000000000..d66da89ba4
--- /dev/null
+++ b/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchIntegrationTest.java
@@ -0,0 +1,115 @@
+package org.baeldung.batchtesting;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.Collection;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.batch.core.ExitStatus;
+import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobInstance;
+import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.test.AssertFile;
+import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.JobRepositoryTestUtils;
+import org.springframework.batch.test.context.SpringBatchTest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
+import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
+
+@RunWith(SpringRunner.class)
+@SpringBatchTest
+@EnableAutoConfiguration
+@ContextConfiguration(classes = { SpringBatchConfiguration.class })
+@TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class })
+@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
+public class SpringBatchIntegrationTest {
+
+    private static final String TEST_OUTPUT = "src/test/resources/output/actual-output.json";
+
+    private static final String EXPECTED_OUTPUT = "src/test/resources/output/expected-output.json";
+
+    private static final String TEST_INPUT = "src/test/resources/input/test-input.csv";
+
+    @Autowired
+    private JobLauncherTestUtils jobLauncherTestUtils;
+
+    @Autowired
+    private JobRepositoryTestUtils jobRepositoryTestUtils;
+
+    @After
+    public void cleanUp() {
+        jobRepositoryTestUtils.removeJobExecutions();
+    }
+
+    private JobParameters defaultJobParameters() {
+        JobParametersBuilder paramsBuilder = new JobParametersBuilder();
+        paramsBuilder.addString("file.input", TEST_INPUT);
+        paramsBuilder.addString("file.output", TEST_OUTPUT);
+        return paramsBuilder.toJobParameters();
+    }
+
+    @Test
+    public void givenReferenceOutput_whenJobExecuted_thenSuccess() throws Exception {
+        // given
+        FileSystemResource expectedResult = new FileSystemResource(EXPECTED_OUTPUT);
+        FileSystemResource actualResult = new FileSystemResource(TEST_OUTPUT);
+
+        // when
+        JobExecution jobExecution = jobLauncherTestUtils.launchJob(defaultJobParameters());
+        JobInstance actualJobInstance = jobExecution.getJobInstance();
+        ExitStatus actualJobExitStatus = jobExecution.getExitStatus();
+
+        // then
+        assertThat(actualJobInstance.getJobName(), is("transformBooksRecords"));
+        assertThat(actualJobExitStatus.getExitCode(), is("COMPLETED"));
+        AssertFile.assertFileEquals(expectedResult, actualResult);
+    }
+
+    @Test
+    public void givenReferenceOutput_whenStep1Executed_thenSuccess() throws Exception {
+
+        // given
+        FileSystemResource expectedResult = new FileSystemResource(EXPECTED_OUTPUT);
+        FileSystemResource actualResult = new FileSystemResource(TEST_OUTPUT);
+
+        // when
+        JobExecution jobExecution = jobLauncherTestUtils.launchStep("step1", defaultJobParameters());
+        Collection<StepExecution> actualStepExecutions = jobExecution.getStepExecutions();
+        ExitStatus actualJobExitStatus = jobExecution.getExitStatus();
+
+        // then
+        assertThat(actualStepExecutions.size(), is(1));
+        assertThat(actualJobExitStatus.getExitCode(), is("COMPLETED"));
+        AssertFile.assertFileEquals(expectedResult, actualResult);
+    }
+
+    @Test
+    public void whenStep2Executed_thenSuccess() {
+
+        // when
+        JobExecution jobExecution = jobLauncherTestUtils.launchStep("step2", defaultJobParameters());
+        Collection<StepExecution> actualStepExecutions = jobExecution.getStepExecutions();
+        ExitStatus actualExitStatus = jobExecution.getExitStatus();
+
+        // then
+        assertThat(actualStepExecutions.size(), is(1));
+        assertThat(actualExitStatus.getExitCode(), is("COMPLETED"));
+        actualStepExecutions.forEach(stepExecution -> {
+            assertThat(stepExecution.getWriteCount(), is(8));
+        });
+    }
+
+}
diff --git a/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java b/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java
new file mode 100644
index 0000000000..f7b888f0f9
--- /dev/null
+++ b/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java
@@ -0,0 +1,116 @@
+package org.baeldung.batchtesting;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.Arrays;
+
+import org.baeldung.batchtesting.model.Book;
+import org.baeldung.batchtesting.model.BookRecord;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.item.file.FlatFileItemReader;
+import org.springframework.batch.item.json.JsonFileItemWriter;
+import org.springframework.batch.test.AssertFile;
+import org.springframework.batch.test.JobRepositoryTestUtils;
+import org.springframework.batch.test.MetaDataInstanceFactory;
+import org.springframework.batch.test.StepScopeTestUtils;
+import org.springframework.batch.test.context.SpringBatchTest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
+import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
+
+
+@RunWith(SpringRunner.class)
+@SpringBatchTest
+@EnableAutoConfiguration
+@ContextConfiguration(classes = { SpringBatchConfiguration.class })
+@TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class })
+@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
+public class SpringBatchStepScopeIntegrationTest {
+
+    private static final String TEST_OUTPUT = "src/test/resources/output/actual-output.json";
+
+    private static final String EXPECTED_OUTPUT_ONE = "src/test/resources/output/expected-output-one.json";
+
+    private static final String TEST_INPUT_ONE = "src/test/resources/input/test-input-one.csv";
+    @Autowired
+    private JsonFileItemWriter<Book> jsonItemWriter;
+
+    @Autowired
+    private FlatFileItemReader<BookRecord> itemReader;
+
+    @Autowired
+    private JobRepositoryTestUtils jobRepositoryTestUtils;
+
+    private JobParameters defaultJobParameters() {
+        JobParametersBuilder paramsBuilder = new JobParametersBuilder();
+        paramsBuilder.addString("file.input", TEST_INPUT_ONE);
+        paramsBuilder.addString("file.output", TEST_OUTPUT);
+        return paramsBuilder.toJobParameters();
+    }
+
+    @After
+    public void cleanUp() {
+        jobRepositoryTestUtils.removeJobExecutions();
+    }
+
+    @Test
+    public void givenMockedStep_whenReaderCalled_thenSuccess() throws Exception {
+
+        // given
+        StepExecution stepExecution = MetaDataInstanceFactory.createStepExecution(defaultJobParameters());
+
+        // when
+        StepScopeTestUtils.doInStepScope(stepExecution, () -> {
+            BookRecord bookRecord;
+            itemReader.open(stepExecution.getExecutionContext());
+            while ((bookRecord = itemReader.read()) != null) {
+
+                // then
+                assertThat(bookRecord.getBookName(), is("Foundation"));
+                assertThat(bookRecord.getBookAuthor(), is("Asimov I."));
+                assertThat(bookRecord.getBookISBN(), is("ISBN 12839"));
+                assertThat(bookRecord.getBookFormat(), is("hardcover"));
+                assertThat(bookRecord.getPublishingYear(), is("2018"));
+            }
+            itemReader.close();
+            return null;
+        });
+    }
+
+    @Test
+    public void givenMockedStep_whenWriterCalled_thenSuccess() throws Exception {
+
+        // given
+        FileSystemResource expectedResult = new FileSystemResource(EXPECTED_OUTPUT_ONE);
+        FileSystemResource actualResult = new FileSystemResource(TEST_OUTPUT);
+        Book demoBook = new Book();
+        demoBook.setAuthor("Grisham J.");
+        demoBook.setName("The Firm");
+        StepExecution stepExecution = MetaDataInstanceFactory.createStepExecution(defaultJobParameters());
+
+        // when
+        StepScopeTestUtils.doInStepScope(stepExecution, () -> {
+
+            jsonItemWriter.open(stepExecution.getExecutionContext());
+            jsonItemWriter.write(Arrays.asList(demoBook));
+            jsonItemWriter.close();
+            return null;
+        });
+
+        // then
+        AssertFile.assertFileEquals(expectedResult, actualResult);
+    }
+}
diff --git a/spring-batch/src/test/resources/input/test-input-one.csv b/spring-batch/src/test/resources/input/test-input-one.csv
new file mode 100644
index 0000000000..2c0a5b1103
--- /dev/null
+++ b/spring-batch/src/test/resources/input/test-input-one.csv
@@ -0,0 +1 @@
+Foundation,Asimov I.,hardcover,ISBN 12839,2018
\ No newline at end of file
diff --git a/spring-batch/src/test/resources/input/test-input.csv b/spring-batch/src/test/resources/input/test-input.csv
new file mode 100644
index 0000000000..5b873241d4
--- /dev/null
+++ b/spring-batch/src/test/resources/input/test-input.csv
@@ -0,0 +1,8 @@
+Foundation,Asimov I.,hardcover,ISBN 12839,2018
+Roadside Picnic,Strugatski A.,paperback,ISBN 12839,1988
+Norwegian Wood,Murakami H.,paperback,ISBN 12839,2015
+Davinci Code,Brown D.,hardcover,ISBN 12839,2005
+Ubik,Dick K. P.,hardcover,ISBN 12839,2013
+JFK,King S.,paperback,ISBN 12839,2017
+Contact,Sagan C.,paperback,ISBN 12839,2000
+Brave New World,Huxley A.,paperback,ISBN 12839,1986
diff --git a/spring-batch/src/test/resources/output/actual-output.json b/spring-batch/src/test/resources/output/actual-output.json
new file mode 100644
index 0000000000..1fd6cfcf37
--- /dev/null
+++ b/spring-batch/src/test/resources/output/actual-output.json
@@ -0,0 +1,3 @@
+[
+ {"author":"Grisham J.","name":"The Firm"}
+]
diff --git a/spring-batch/src/test/resources/output/expected-output-one.json b/spring-batch/src/test/resources/output/expected-output-one.json
new file mode 100644
index 0000000000..36c31c6d54
--- /dev/null
+++ b/spring-batch/src/test/resources/output/expected-output-one.json
@@ -0,0 +1,3 @@
+[
+ {"author":"Grisham J.","name":"The Firm"}
+]
\ No newline at end of file
diff --git a/spring-batch/src/test/resources/output/expected-output.json b/spring-batch/src/test/resources/output/expected-output.json
new file mode 100644
index 0000000000..32ad8b7ead
--- /dev/null
+++ b/spring-batch/src/test/resources/output/expected-output.json
@@ -0,0 +1,10 @@
+[
+ {"author":"Asimov I.","name":"Foundation"},
+ {"author":"Strugatski A.","name":"Roadside Picnic"},
+ {"author":"Murakami H.","name":"Norwegian Wood"},
+ {"author":"Brown D.","name":"Davinci Code"},
+ {"author":"Dick K. P.","name":"Ubik"},
+ {"author":"King S.","name":"JFK"},
+ {"author":"Sagan C.","name":"Contact"},
+ {"author":"Huxley A.","name":"Brave New World"}
+]
diff --git a/spring-boot-artifacts/README.md b/spring-boot-artifacts/README.md
new file mode 100644
index 0000000000..4025e43a65
--- /dev/null
+++ b/spring-boot-artifacts/README.md
@@ -0,0 +1,10 @@
+## Spring Boot Artifacts
+
+This module contains articles about configuring the Spring Boot build process.
+
+### Relevant Articles:			
+ - [Spring Boot Dependency Management with a Custom Parent](https://www.baeldung.com/spring-boot-dependency-management-custom-parent)
+ - [Create a Fat Jar App with Spring Boot](https://www.baeldung.com/deployable-fat-jar-spring-boot)
+ - [Intro to Spring Boot Starters](https://www.baeldung.com/spring-boot-starters)
+ - [Introduction to WebJars](https://www.baeldung.com/maven-webjars)
+ - [A Quick Guide to Maven Wrapper](https://www.baeldung.com/maven-wrapper) 
\ No newline at end of file
diff --git a/spring-boot-ops/pom.xml b/spring-boot-artifacts/pom.xml
similarity index 83%
rename from spring-boot-ops/pom.xml
rename to spring-boot-artifacts/pom.xml
index f578a24163..8301533606 100644
--- a/spring-boot-ops/pom.xml
+++ b/spring-boot-artifacts/pom.xml
@@ -2,8 +2,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-boot-ops</artifactId>
-    <name>spring-boot-ops</name>
+    <artifactId>spring-boot-artifacts</artifactId>
+    <name>spring-boot-artifacts</name>
     <packaging>war</packaging>
     <description>Demo project for Spring Boot</description>
 
@@ -101,15 +101,6 @@
 
     <build>
         <finalName>${project.artifactId}</finalName>
-        <resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-				<excludes>
-					<exclude>**/conf.properties</exclude>
-				</excludes>
-			</resource>
-		</resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -126,28 +117,28 @@
                 </executions>
             </plugin>
             <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>2.18</version>
-				<executions>
-					<!-- Invokes both the integration-test and the verify goals of the Failsafe 
-						Maven plugin -->
-					<execution>
-						<id>integration-tests</id>
-						<goals>
-							<goal>integration-test</goal>
-							<goal>verify</goal>
-						</goals>
-						<configuration>
-							<!-- Skips integration tests if the value of skip.integration.tests 
-								property is true -->
-								<includes>
-										<include>**/ExternalPropertyFileLoaderIntegrationTest.java</include>
-									</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.18</version>
+                <executions>
+                    <!-- Invokes both the integration-test and the verify goals of the Failsafe 
+                        Maven plugin -->
+                    <execution>
+                        <id>integration-tests</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Skips integration tests if the value of skip.integration.tests 
+                                property is true -->
+                                <includes>
+                                        <include>**/ExternalPropertyFileLoaderIntegrationTest.java</include>
+                                    </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/spring-boot-ops/src/main/java/com/baeldung/webjar/TestController.java b/spring-boot-artifacts/src/main/java/com/baeldung/webjar/TestController.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/webjar/TestController.java
rename to spring-boot-artifacts/src/main/java/com/baeldung/webjar/TestController.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java b/spring-boot-artifacts/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java
rename to spring-boot-artifacts/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java
diff --git a/spring-boot-artifacts/src/main/resources/application.properties b/spring-boot-artifacts/src/main/resources/application.properties
new file mode 100644
index 0000000000..709574239b
--- /dev/null
+++ b/spring-boot-artifacts/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-boot-ops/src/main/resources/logback.xml b/spring-boot-artifacts/src/main/resources/logback.xml
similarity index 100%
rename from spring-boot-ops/src/main/resources/logback.xml
rename to spring-boot-artifacts/src/main/resources/logback.xml
diff --git a/spring-boot-ops/src/main/resources/templates/index.html b/spring-boot-artifacts/src/main/resources/templates/index.html
similarity index 100%
rename from spring-boot-ops/src/main/resources/templates/index.html
rename to spring-boot-artifacts/src/main/resources/templates/index.html
diff --git a/spring-boot-ops/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java b/spring-boot-artifacts/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java
similarity index 100%
rename from spring-boot-ops/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java
rename to spring-boot-artifacts/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java
diff --git a/spring-boot-autoconfiguration/README.md b/spring-boot-autoconfiguration/README.md
index 67311eed50..180d857d52 100644
--- a/spring-boot-autoconfiguration/README.md
+++ b/spring-boot-autoconfiguration/README.md
@@ -9,3 +9,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 - [Create a Custom Auto-Configuration with Spring Boot](https://www.baeldung.com/spring-boot-custom-auto-configuration)
 - [Guide to ApplicationContextRunner in Spring Boot](https://www.baeldung.com/spring-boot-context-runner)
+- [A Guide to Spring Boot Configuration Metadata](https://www.baeldung.com/spring-boot-configuration-metadata)
+
diff --git a/spring-boot-configuration/README.md b/spring-boot-configuration/README.md
new file mode 100644
index 0000000000..c449538a9d
--- /dev/null
+++ b/spring-boot-configuration/README.md
@@ -0,0 +1,5 @@
+# Spring Boot Configuration
+
+This module contains articles about Spring Boot Configuration.
+
+### Relevant Articles: 
diff --git a/spring-boot-configuration/data-jpa-application/pom.xml b/spring-boot-configuration/data-jpa-application/pom.xml
new file mode 100644
index 0000000000..b1bf6fda43
--- /dev/null
+++ b/spring-boot-configuration/data-jpa-application/pom.xml
@@ -0,0 +1,12 @@
+<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>data-jpa-application</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <parent>
+        <groupId>com.baeldung.spring-boot-configuration</groupId>
+        <artifactId>spring-boot-configuration</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+</project>
\ No newline at end of file
diff --git a/spring-boot-configuration/data-jpa-application/src/main/java/com/baeldung/data/jpa/ApplicationFound.java b/spring-boot-configuration/data-jpa-application/src/main/java/com/baeldung/data/jpa/ApplicationFound.java
new file mode 100644
index 0000000000..50efb42a19
--- /dev/null
+++ b/spring-boot-configuration/data-jpa-application/src/main/java/com/baeldung/data/jpa/ApplicationFound.java
@@ -0,0 +1,7 @@
+package com.baeldung.data.jpa;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ApplicationFound {
+}
diff --git a/spring-boot-configuration/data-jpa-application/src/main/java/com/baeldung/data/jpa/application/ApplicationNotFound.java b/spring-boot-configuration/data-jpa-application/src/main/java/com/baeldung/data/jpa/application/ApplicationNotFound.java
new file mode 100644
index 0000000000..8e7362f626
--- /dev/null
+++ b/spring-boot-configuration/data-jpa-application/src/main/java/com/baeldung/data/jpa/application/ApplicationNotFound.java
@@ -0,0 +1,7 @@
+package com.baeldung.data.jpa.application;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ApplicationNotFound {
+}
diff --git a/spring-boot-configuration/data-jpa-application/src/test/java/com/baeldung/data/jpa/DataJpaUnitTest.java b/spring-boot-configuration/data-jpa-application/src/test/java/com/baeldung/data/jpa/DataJpaUnitTest.java
new file mode 100644
index 0000000000..ac7ff8561b
--- /dev/null
+++ b/spring-boot-configuration/data-jpa-application/src/test/java/com/baeldung/data/jpa/DataJpaUnitTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.data.jpa;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@DataJpaTest
+public class DataJpaUnitTest {
+
+    @Autowired
+    private TestEntityManager entityManager;
+
+    @Test
+    public void givenACorrectSetup_thenAnEntityManagerWillBeAvailable() {
+        assertNotNull(entityManager);
+    }
+}
diff --git a/spring-boot-configuration/data-jpa-library/pom.xml b/spring-boot-configuration/data-jpa-library/pom.xml
new file mode 100644
index 0000000000..1534e7ed23
--- /dev/null
+++ b/spring-boot-configuration/data-jpa-library/pom.xml
@@ -0,0 +1,12 @@
+<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>data-jpa-library</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <parent>
+        <groupId>com.baeldung.spring-boot-configuration</groupId>
+        <artifactId>spring-boot-configuration</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+</project>
\ No newline at end of file
diff --git a/spring-boot-configuration/data-jpa-library/src/main/java/com/baeldung/data/jpa/libarary/model/Example.java b/spring-boot-configuration/data-jpa-library/src/main/java/com/baeldung/data/jpa/libarary/model/Example.java
new file mode 100644
index 0000000000..d5c41d303e
--- /dev/null
+++ b/spring-boot-configuration/data-jpa-library/src/main/java/com/baeldung/data/jpa/libarary/model/Example.java
@@ -0,0 +1,13 @@
+package com.baeldung.data.jpa.libarary.model;
+
+public class Example {
+    private String example;
+
+    public String getExample() {
+        return example;
+    }
+
+    public void setExample(String example) {
+        this.example = example;
+    }
+}
diff --git a/spring-boot-configuration/data-jpa-library/src/test/java/com/baeldung/data/jpa/TestApplication.java b/spring-boot-configuration/data-jpa-library/src/test/java/com/baeldung/data/jpa/TestApplication.java
new file mode 100644
index 0000000000..83f60b388b
--- /dev/null
+++ b/spring-boot-configuration/data-jpa-library/src/test/java/com/baeldung/data/jpa/TestApplication.java
@@ -0,0 +1,7 @@
+package com.baeldung.data.jpa;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class TestApplication {
+}
diff --git a/spring-boot-configuration/data-jpa-library/src/test/java/com/baeldung/data/jpa/libarary/DataJpaUnitTest.java b/spring-boot-configuration/data-jpa-library/src/test/java/com/baeldung/data/jpa/libarary/DataJpaUnitTest.java
new file mode 100644
index 0000000000..31f12a6093
--- /dev/null
+++ b/spring-boot-configuration/data-jpa-library/src/test/java/com/baeldung/data/jpa/libarary/DataJpaUnitTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.data.jpa.libarary;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@DataJpaTest
+public class DataJpaUnitTest {
+
+    @Autowired
+    private TestEntityManager entityManager;
+
+    @Test
+    public void givenACorrectSetup_thenAnEntityManagerWillBeAvailable() {
+        assertNotNull(entityManager);
+    }
+
+}
diff --git a/spring-boot-configuration/pom.xml b/spring-boot-configuration/pom.xml
new file mode 100644
index 0000000000..e4473c3f2d
--- /dev/null
+++ b/spring-boot-configuration/pom.xml
@@ -0,0 +1,61 @@
+<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.spring-boot-configuration</groupId>
+    <artifactId>spring-boot-configuration</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2/pom.xml</relativePath>
+    </parent>
+
+    <modules>
+        <module>data-jpa-library</module>
+        <module>data-jpa-application</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <version>${spring-boot.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/pom.xml b/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/pom.xml
index 74e786be99..4fe92e8e45 100644
--- a/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.baeldung</groupId>
     <artifactId>greeter-spring-boot-autoconfigure</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-	<name>greeter-spring-boot-autoconfigure</name>
+    <name>greeter-spring-boot-autoconfigure</name>
 
     <parent>
         <artifactId>spring-boot-custom-starter</artifactId>
@@ -14,7 +14,6 @@
     </parent>
 
     <dependencies>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
@@ -42,12 +41,11 @@
         </dependency>
         
         <dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<version>${spring-boot.version}</version>
-			<scope>test</scope>
-		</dependency>
-
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -68,7 +66,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-boot.version>1.5.2.RELEASE</spring-boot.version>
         <greeter.version>0.0.1-SNAPSHOT</greeter.version>
-        
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-data/pom.xml b/spring-boot-data/pom.xml
index dc33d9f6ae..4c41eb8e3c 100644
--- a/spring-boot-data/pom.xml
+++ b/spring-boot-data/pom.xml
@@ -6,12 +6,14 @@
     <packaging>war</packaging>
     <name>spring-boot-data</name>
     <description>Spring Boot Data Module</description>
+
     <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>
@@ -49,7 +51,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -66,7 +67,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
             </plugin>
-
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
diff --git a/spring-boot-deployment/README.md b/spring-boot-deployment/README.md
new file mode 100644
index 0000000000..6171decf2d
--- /dev/null
+++ b/spring-boot-deployment/README.md
@@ -0,0 +1,9 @@
+## Spring Boot Deployment
+
+This module contains articles about deployment of a Spring Boot Application
+
+### Relevant Articles:			
+ - [Deploy a Spring Boot WAR into a Tomcat Server](https://www.baeldung.com/spring-boot-war-tomcat-deploy)
+ - [Spring Boot Console Application](https://www.baeldung.com/spring-boot-console-app)
+ - [How to Configure Spring Boot Tomcat](https://www.baeldung.com/spring-boot-configure-tomcat)
+ - [Comparing Embedded Servlet Containers in Spring Boot](https://www.baeldung.com/spring-boot-servlet-containers)
\ No newline at end of file
diff --git a/spring-boot-deployment/pom.xml b/spring-boot-deployment/pom.xml
new file mode 100644
index 0000000000..69a54fd482
--- /dev/null
+++ b/spring-boot-deployment/pom.xml
@@ -0,0 +1,203 @@
+<?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-boot-deployment</artifactId>
+    <name>spring-boot-deployment</name>
+    <packaging>war</packaging>
+    <description>Demo project for Spring Boot</description>
+
+    <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-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>${jpa.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.subethamail</groupId>
+            <artifactId>subethasmtp</artifactId>
+            <version>${subethasmtp.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>bootstrap</artifactId>
+            <version>${bootstrap.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery</artifactId>
+            <version>${jquery.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-context</artifactId>
+            <version>${springcloud.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>**/conf.properties</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>com.baeldung.webjar.WebjarsdemoApplication</mainClass>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.18</version>
+                <executions>
+                    <!-- Invokes both the integration-test and the verify goals of the Failsafe 
+                        Maven plugin -->
+                    <execution>
+                        <id>integration-tests</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Skips integration tests if the value of skip.integration.tests 
+                                property is true -->
+                                <includes>
+                                        <include>**/ExternalPropertyFileLoaderIntegrationTest.java</include>
+                                    </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>autoconfiguration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>**/*LiveTest.java</exclude>
+                                        <exclude>**/*IntegrationTest.java</exclude>
+                                        <exclude>**/*IntTest.java</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/AutoconfigurationTest.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <test.mime>json</test.mime>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
+    <properties>
+        <!-- The main class to start by executing java -jar -->
+        <start-class>org.baeldung.boot.Application</start-class>
+        <jquery.version>3.1.1</jquery.version>
+        <bootstrap.version>3.3.7-1</bootstrap.version>
+        <jpa.version>2.2</jpa.version>
+        <guava.version>18.0</guava.version>
+        <subethasmtp.version>3.1.7</subethasmtp.version>
+        <springcloud.version>2.0.2.RELEASE</springcloud.version>
+        <httpclient.version>4.5.8</httpclient.version>
+    </properties>
+
+</project>
diff --git a/spring-boot-ops/src/main/java/com/baeldung/compare/ComparisonApplication.java b/spring-boot-deployment/src/main/java/com/baeldung/compare/ComparisonApplication.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/compare/ComparisonApplication.java
rename to spring-boot-deployment/src/main/java/com/baeldung/compare/ComparisonApplication.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/compare/StartupEventHandler.java b/spring-boot-deployment/src/main/java/com/baeldung/compare/StartupEventHandler.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/compare/StartupEventHandler.java
rename to spring-boot-deployment/src/main/java/com/baeldung/compare/StartupEventHandler.java
diff --git a/spring-boot-ops-2/src/main/java/com/baeldung/gracefulshutdown/GracefulShutdownApplication.java b/spring-boot-deployment/src/main/java/com/baeldung/gracefulshutdown/GracefulShutdownApplication.java
similarity index 100%
rename from spring-boot-ops-2/src/main/java/com/baeldung/gracefulshutdown/GracefulShutdownApplication.java
rename to spring-boot-deployment/src/main/java/com/baeldung/gracefulshutdown/GracefulShutdownApplication.java
diff --git a/spring-boot-ops-2/src/main/java/com/baeldung/gracefulshutdown/beans/LongRunningProcessBean.java b/spring-boot-deployment/src/main/java/com/baeldung/gracefulshutdown/beans/LongRunningProcessBean.java
similarity index 100%
rename from spring-boot-ops-2/src/main/java/com/baeldung/gracefulshutdown/beans/LongRunningProcessBean.java
rename to spring-boot-deployment/src/main/java/com/baeldung/gracefulshutdown/beans/LongRunningProcessBean.java
diff --git a/spring-boot-ops-2/src/main/java/com/baeldung/gracefulshutdown/config/SpringConfiguration.java b/spring-boot-deployment/src/main/java/com/baeldung/gracefulshutdown/config/SpringConfiguration.java
similarity index 100%
rename from spring-boot-ops-2/src/main/java/com/baeldung/gracefulshutdown/config/SpringConfiguration.java
rename to spring-boot-deployment/src/main/java/com/baeldung/gracefulshutdown/config/SpringConfiguration.java
diff --git a/spring-boot-ops-2/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java b/spring-boot-deployment/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java
similarity index 100%
rename from spring-boot-ops-2/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java
rename to spring-boot-deployment/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java
diff --git a/spring-boot-ops-2/src/main/java/com/baeldung/springbootconfiguration/controller/GreetingsController.java b/spring-boot-deployment/src/main/java/com/baeldung/springbootconfiguration/controller/GreetingsController.java
similarity index 100%
rename from spring-boot-ops-2/src/main/java/com/baeldung/springbootconfiguration/controller/GreetingsController.java
rename to spring-boot-deployment/src/main/java/com/baeldung/springbootconfiguration/controller/GreetingsController.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/springbootnonwebapp/SpringBootConsoleApplication.java b/spring-boot-deployment/src/main/java/com/baeldung/springbootnonwebapp/SpringBootConsoleApplication.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/springbootnonwebapp/SpringBootConsoleApplication.java
rename to spring-boot-deployment/src/main/java/com/baeldung/springbootnonwebapp/SpringBootConsoleApplication.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/springbootsimple/SpringBootTomcatApplication.java b/spring-boot-deployment/src/main/java/com/baeldung/springbootsimple/SpringBootTomcatApplication.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/springbootsimple/SpringBootTomcatApplication.java
rename to spring-boot-deployment/src/main/java/com/baeldung/springbootsimple/SpringBootTomcatApplication.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/springbootsimple/TomcatController.java b/spring-boot-deployment/src/main/java/com/baeldung/springbootsimple/TomcatController.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/springbootsimple/TomcatController.java
rename to spring-boot-deployment/src/main/java/com/baeldung/springbootsimple/TomcatController.java
diff --git a/spring-boot-ops/src/main/resources/application.properties b/spring-boot-deployment/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-ops/src/main/resources/application.properties
rename to spring-boot-deployment/src/main/resources/application.properties
diff --git a/spring-boot-management/src/main/resources/logback.xml b/spring-boot-deployment/src/main/resources/logback.xml
similarity index 58%
rename from spring-boot-management/src/main/resources/logback.xml
rename to spring-boot-deployment/src/main/resources/logback.xml
index 36314cbeeb..7d900d8ea8 100644
--- a/spring-boot-management/src/main/resources/logback.xml
+++ b/spring-boot-deployment/src/main/resources/logback.xml
@@ -1,13 +1,13 @@
-<configuration scan="true" scanPeriod="15 seconds">
+<?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>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
         </encoder>
     </appender>
 
-    <logger name="com.baeldung.spring.boot.management.logging" level="INFO" />
-
-    <root level="info">
+    <root level="INFO">
         <appender-ref ref="STDOUT" />
     </root>
 </configuration>
\ No newline at end of file
diff --git a/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java b/spring-boot-deployment/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java
similarity index 100%
rename from spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java
rename to spring-boot-deployment/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java
diff --git a/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextTest.java b/spring-boot-deployment/src/test/java/com/baeldung/springbootconfiguration/SpringContextTest.java
similarity index 100%
rename from spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextTest.java
rename to spring-boot-deployment/src/test/java/com/baeldung/springbootconfiguration/SpringContextTest.java
diff --git a/spring-boot-ops/src/test/java/com/baeldung/springbootsimple/SpringBootTomcatApplicationIntegrationTest.java b/spring-boot-deployment/src/test/java/com/baeldung/springbootsimple/SpringBootTomcatApplicationIntegrationTest.java
similarity index 100%
rename from spring-boot-ops/src/test/java/com/baeldung/springbootsimple/SpringBootTomcatApplicationIntegrationTest.java
rename to spring-boot-deployment/src/test/java/com/baeldung/springbootsimple/SpringBootTomcatApplicationIntegrationTest.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterApp.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterApp.java
index aea7c0a2cd..5380e99ef3 100644
--- a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterApp.java
+++ b/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterApp.java
@@ -5,10 +5,10 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
 
 @Configuration
-@ComponentScan(includeFilters = @ComponentScan.Filter(type = FilterType.ASPECTJ, 
-pattern = "com.baeldung.componentscan.filter.aspectj.* " 
-            + "&& !(com.baeldung.componentscan.filter.aspectj.L* " 
-            + "|| com.baeldung.componentscan.filter.aspectj.C*)"))
+@ComponentScan(includeFilters = @ComponentScan.Filter(type = FilterType.ASPECTJ,
+        pattern = "com.baeldung.componentscan.filter.aspectj.* "
+                + "&& !(com.baeldung.componentscan.filter.aspectj.L* "
+                + "|| com.baeldung.componentscan.filter.aspectj.C*)"))
 public class ComponentScanAspectJFilterApp {
     public static void main(String[] args) {
     }
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Cat.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Cat.java
index 17a8e87b7a..5a4983b699 100644
--- a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Cat.java
+++ b/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Cat.java
@@ -1,4 +1,4 @@
 package com.baeldung.componentscan.filter.custom;
 
-public class Cat extends Pet {
+public class Cat {
 }
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilter.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilter.java
index 30ccb19276..fc21c28135 100644
--- a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilter.java
+++ b/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilter.java
@@ -12,11 +12,8 @@ public class ComponentScanCustomFilter implements TypeFilter {
     @Override
     public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException {
         ClassMetadata classMetadata = metadataReader.getClassMetadata();
-        String superClass = classMetadata.getSuperClassName();
-        if (Pet.class.getName()
-            .equalsIgnoreCase(superClass)) {
-            return true;
-        }
-        return false;
+        String fullyQualifiedName = classMetadata.getClassName();
+        String className = fullyQualifiedName.substring(fullyQualifiedName.lastIndexOf(".") + 1);
+        return className.length() > 5 ? true : false;
     }
 }
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Pet.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Elephant.java
similarity index 68%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Pet.java
rename to spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Elephant.java
index c9be5a39c2..8ae065a391 100644
--- a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Pet.java
+++ b/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Elephant.java
@@ -1,4 +1,4 @@
 package com.baeldung.componentscan.filter.custom;
 
-public class Pet {
+public class Elephant {
 }
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterApp.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterApp.java
index d2b7bd03fb..b7a3f5cd8a 100644
--- a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterApp.java
+++ b/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterApp.java
@@ -5,7 +5,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
 
 @Configuration
-@ComponentScan(includeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = ".*[t]"))
+@ComponentScan(includeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = ".*(nt)"))
 public class ComponentScanRegexFilterApp {
 
     public static void main(String[] args) {
diff --git a/spring-boot-di/src/test/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterAppIntegrationTest.java b/spring-boot-di/src/test/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterAppIntegrationTest.java
index 097214a2cf..9902a620ad 100644
--- a/spring-boot-di/src/test/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterAppIntegrationTest.java
+++ b/spring-boot-di/src/test/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterAppIntegrationTest.java
@@ -1,18 +1,18 @@
 package com.baeldung.componentscan.filter.custom;
 
-import static org.junit.Assert.assertThat;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertThat;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = ComponentScanCustomFilterApp.class)
@@ -22,9 +22,10 @@ public class ComponentScanCustomFilterAppIntegrationTest {
     public void whenCustomFilterIsUsed_thenComponentScanShouldRegisterBeanMatchingCustomFilter() {
         ApplicationContext applicationContext = new AnnotationConfigApplicationContext(ComponentScanCustomFilterApp.class);
         List<String> beans = Arrays.stream(applicationContext.getBeanDefinitionNames())
-            .filter(bean -> !bean.contains("org.springframework") && !bean.contains("componentScanCustomFilterApp"))
-            .collect(Collectors.toList());
+                .filter(bean -> !bean.contains("org.springframework") && !bean.contains("componentScanCustomFilterApp")
+                        && !bean.contains("componentScanCustomFilter"))
+                .collect(Collectors.toList());
         assertThat(beans.size(), equalTo(1));
-        assertThat(beans.get(0), equalTo("cat"));
+        assertThat(beans.get(0), equalTo("elephant"));
     }
 }
diff --git a/spring-boot-di/src/test/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterAppIntegrationTest.java b/spring-boot-di/src/test/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterAppIntegrationTest.java
index 3163581c37..38d6acd7f8 100644
--- a/spring-boot-di/src/test/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterAppIntegrationTest.java
+++ b/spring-boot-di/src/test/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterAppIntegrationTest.java
@@ -24,8 +24,7 @@ public class ComponentScanRegexFilterAppIntegrationTest {
         List<String> beans = Arrays.stream(applicationContext.getBeanDefinitionNames())
             .filter(bean -> !bean.contains("org.springframework") && !bean.contains("componentScanRegexFilterApp"))
             .collect(Collectors.toList());
-        assertThat(beans.size(), equalTo(2));
-        assertThat(beans.contains("cat"), equalTo(true));
+        assertThat(beans.size(), equalTo(1));
         assertThat(beans.contains("elephant"), equalTo(true));
     }
 }
diff --git a/spring-boot-disable-console-logging/README.md b/spring-boot-disable-console-logging/README.md
deleted file mode 100644
index 7f1c06042f..0000000000
--- a/spring-boot-disable-console-logging/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Spring Boot Disable Console Logging
-
-This module contains articles about disabling Spring Boot console logging. 
-
-### Relevant Articles: 
-- [How to Disable Console Logging in Spring Boot](https://www.baeldung.com/spring-boot-disable-console-logging)
diff --git a/spring-boot-disable-console-logging/pom.xml b/spring-boot-disable-console-logging/pom.xml
deleted file mode 100644
index 63ed129347..0000000000
--- a/spring-boot-disable-console-logging/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<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-boot-disable-console-logging</artifactId>
-	<name>spring-boot-disable-console-logging</name>
-    <packaging>pom</packaging>
-    <description>Projects for Disabling Spring Boot Console Logging tutorials</description>
-
-    <parent>
-        <artifactId>parent-boot-2</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
-    </parent>
-
-    <modules>
-        <module>disabling-console-logback</module>
-        <module>disabling-console-log4j2</module>
-        <module>disabling-console-jul</module>
-    </modules>
-</project>
\ No newline at end of file
diff --git a/spring-boot-environment/README.md b/spring-boot-environment/README.md
new file mode 100644
index 0000000000..e916c503bc
--- /dev/null
+++ b/spring-boot-environment/README.md
@@ -0,0 +1,7 @@
+## Spring Boot Environment
+
+This module contains articles about configuring the Spring Boot `Environment`
+
+### Relevant Articles:			
+ - [EnvironmentPostProcessor in Spring Boot](https://www.baeldung.com/spring-boot-environmentpostprocessor)
+ - [Spring Properties File Outside jar](https://www.baeldung.com/spring-properties-file-outside-jar)
\ No newline at end of file
diff --git a/spring-boot-environment/pom.xml b/spring-boot-environment/pom.xml
new file mode 100644
index 0000000000..4e4a363fee
--- /dev/null
+++ b/spring-boot-environment/pom.xml
@@ -0,0 +1,148 @@
+<?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-boot-environment</artifactId>
+    <name>spring-boot-environment</name>
+    <packaging>war</packaging>
+    <description>Demo project for Spring Boot</description>
+
+    <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-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>${jpa.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.subethamail</groupId>
+            <artifactId>subethasmtp</artifactId>
+            <version>${subethasmtp.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-context</artifactId>
+            <version>${springcloud.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>**/conf.properties</exclude>
+                </excludes>
+            </resource>
+        </resources>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>autoconfiguration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>**/*LiveTest.java</exclude>
+                                        <exclude>**/*IntegrationTest.java</exclude>
+                                        <exclude>**/*IntTest.java</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/AutoconfigurationTest.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <test.mime>json</test.mime>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
+    <properties>
+        <jpa.version>2.2</jpa.version>
+        <guava.version>18.0</guava.version>
+        <subethasmtp.version>3.1.7</subethasmtp.version>
+        <springcloud.version>2.0.2.RELEASE</springcloud.version>
+        <httpclient.version>4.5.8</httpclient.version>
+    </properties>
+
+</project>
diff --git a/spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/PriceCalculationApplication.java b/spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/PriceCalculationApplication.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/PriceCalculationApplication.java
rename to spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/PriceCalculationApplication.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/PriceCalculationEnvironmentPostProcessor.java b/spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/PriceCalculationEnvironmentPostProcessor.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/PriceCalculationEnvironmentPostProcessor.java
rename to spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/PriceCalculationEnvironmentPostProcessor.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/autoconfig/PriceCalculationAutoConfig.java b/spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/autoconfig/PriceCalculationAutoConfig.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/autoconfig/PriceCalculationAutoConfig.java
rename to spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/autoconfig/PriceCalculationAutoConfig.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/calculator/GrossPriceCalculator.java b/spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/calculator/GrossPriceCalculator.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/calculator/GrossPriceCalculator.java
rename to spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/calculator/GrossPriceCalculator.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/calculator/NetPriceCalculator.java b/spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/calculator/NetPriceCalculator.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/calculator/NetPriceCalculator.java
rename to spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/calculator/NetPriceCalculator.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/calculator/PriceCalculator.java b/spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/calculator/PriceCalculator.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/calculator/PriceCalculator.java
rename to spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/calculator/PriceCalculator.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/service/PriceCalculationService.java b/spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/service/PriceCalculationService.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/environmentpostprocessor/service/PriceCalculationService.java
rename to spring-boot-environment/src/main/java/com/baeldung/environmentpostprocessor/service/PriceCalculationService.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/properties/ConfProperties.java b/spring-boot-environment/src/main/java/com/baeldung/properties/ConfProperties.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/properties/ConfProperties.java
rename to spring-boot-environment/src/main/java/com/baeldung/properties/ConfProperties.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/properties/ExternalPropertyConfigurer.java b/spring-boot-environment/src/main/java/com/baeldung/properties/ExternalPropertyConfigurer.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/properties/ExternalPropertyConfigurer.java
rename to spring-boot-environment/src/main/java/com/baeldung/properties/ExternalPropertyConfigurer.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/properties/ExternalPropertyFileLoader.java b/spring-boot-environment/src/main/java/com/baeldung/properties/ExternalPropertyFileLoader.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/properties/ExternalPropertyFileLoader.java
rename to spring-boot-environment/src/main/java/com/baeldung/properties/ExternalPropertyFileLoader.java
diff --git a/spring-boot-ops/src/main/resources/META-INF/spring.factories b/spring-boot-environment/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from spring-boot-ops/src/main/resources/META-INF/spring.factories
rename to spring-boot-environment/src/main/resources/META-INF/spring.factories
diff --git a/spring-boot-environment/src/main/resources/application.properties b/spring-boot-environment/src/main/resources/application.properties
new file mode 100644
index 0000000000..27b7915cff
--- /dev/null
+++ b/spring-boot-environment/src/main/resources/application.properties
@@ -0,0 +1,7 @@
+management.endpoints.web.exposure.include=*
+management.metrics.enable.root=true
+management.metrics.enable.jvm=true
+management.endpoint.restart.enabled=true
+spring.datasource.jmx-enabled=false
+spring.main.allow-bean-definition-overriding=true
+management.endpoint.shutdown.enabled=true
\ No newline at end of file
diff --git a/spring-boot-ops/src/main/resources/external/conf.properties b/spring-boot-environment/src/main/resources/external/conf.properties
similarity index 100%
rename from spring-boot-ops/src/main/resources/external/conf.properties
rename to spring-boot-environment/src/main/resources/external/conf.properties
diff --git a/spring-boot-environment/src/main/resources/logback.xml b/spring-boot-environment/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/spring-boot-environment/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/spring-boot-ops/src/test/java/com/baeldung/environmentpostprocessor/PriceCalculationEnvironmentPostProcessorLiveTest.java b/spring-boot-environment/src/test/java/com/baeldung/environmentpostprocessor/PriceCalculationEnvironmentPostProcessorLiveTest.java
similarity index 100%
rename from spring-boot-ops/src/test/java/com/baeldung/environmentpostprocessor/PriceCalculationEnvironmentPostProcessorLiveTest.java
rename to spring-boot-environment/src/test/java/com/baeldung/environmentpostprocessor/PriceCalculationEnvironmentPostProcessorLiveTest.java
diff --git a/spring-boot-ops/src/test/java/com/baeldung/properties/ExternalPropertyFileLoaderIntegrationTest.java b/spring-boot-environment/src/test/java/com/baeldung/properties/ExternalPropertyFileLoaderIntegrationTest.java
similarity index 100%
rename from spring-boot-ops/src/test/java/com/baeldung/properties/ExternalPropertyFileLoaderIntegrationTest.java
rename to spring-boot-environment/src/test/java/com/baeldung/properties/ExternalPropertyFileLoaderIntegrationTest.java
diff --git a/spring-boot-exceptions/README.md b/spring-boot-exceptions/README.md
deleted file mode 100644
index bbc272aec4..0000000000
--- a/spring-boot-exceptions/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### Relevant Articles: 
-
-- [Rendering Exceptions in JSON with Spring](https://www.baeldung.com/spring-exceptions-json)
diff --git a/spring-boot-management/README.md b/spring-boot-management/README.md
deleted file mode 100644
index 53d4c439ff..0000000000
--- a/spring-boot-management/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Spring Boot Logging HTTP Requests
-
-This module contains articles about the management of Spring Boot applications.
-
-### Relevant Articles: 
-- [Logging HTTP Requests with Spring Boot Actuator HTTP Tracing](https://www.baeldung.com/spring-boot-actuator-http)
-
diff --git a/spring-boot-management/pom.xml b/spring-boot-management/pom.xml
deleted file mode 100644
index ca483d2f61..0000000000
--- a/spring-boot-management/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
-    </parent>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-boot-management</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-boot-management</name>
-
-    <properties>
-        <start-class>com.baeldung.spring.boot.management.logging.LoggingApplication</start-class>
-        <java.version>1.8</java.version>
-        <spring-boot-admin-starter-client.version>2.1.6</spring-boot-admin-starter-client.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <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>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-starter-client</artifactId>
-            <version>${spring-boot-admin-starter-client.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/spring-boot-mvc/pom.xml b/spring-boot-mvc/pom.xml
index fee725847f..a414ed7bb2 100644
--- a/spring-boot-mvc/pom.xml
+++ b/spring-boot-mvc/pom.xml
@@ -89,6 +89,18 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- AOP -->
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>1.9.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.9.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/annotations/PerformanceAspect.java b/spring-boot-mvc/src/main/java/com/baeldung/annotations/PerformanceAspect.java
new file mode 100644
index 0000000000..534a2ba333
--- /dev/null
+++ b/spring-boot-mvc/src/main/java/com/baeldung/annotations/PerformanceAspect.java
@@ -0,0 +1,32 @@
+package com.baeldung.annotations;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+
+@Aspect
+@Component
+public class PerformanceAspect {
+
+    private static Logger logger = Logger.getLogger(PerformanceAspect.class.getName());
+
+    @Pointcut("within(@org.springframework.stereotype.Repository *)")
+    public void repositoryClassMethods() {
+    }
+
+    @Around("repositoryClassMethods()")
+    public Object measureMethodExecutionTime(ProceedingJoinPoint pjp) throws Throwable {
+        long start = System.nanoTime();
+        Object retval = pjp.proceed();
+        long end = System.nanoTime();
+        String methodName = pjp.getSignature().getName();
+        logger.info("Execution of " + methodName + " took " + TimeUnit.NANOSECONDS.toMillis(end - start) + " ms");
+        return retval;
+    }
+
+}
diff --git a/spring-boot-ops-2/.gitignore b/spring-boot-ops-2/.gitignore
deleted file mode 100644
index 153c9335eb..0000000000
--- a/spring-boot-ops-2/.gitignore
+++ /dev/null
@@ -1,29 +0,0 @@
-HELP.md
-/target/
-!.mvn/wrapper/maven-wrapper.jar
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-/build/
-
-### VS Code ###
-.vscode/
diff --git a/spring-boot-ops-2/README.md b/spring-boot-ops-2/README.md
deleted file mode 100644
index 0925b099b1..0000000000
--- a/spring-boot-ops-2/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-## Spring Boot Operations
-
-This module contains articles about Spring Boot Operations
-
-### Relevant Articles
-
-- [How to Configure Spring Boot Tomcat](https://www.baeldung.com/spring-boot-configure-tomcat)
-- [Spring Boot Embedded Tomcat Logs](https://www.baeldung.com/spring-boot-embedded-tomcat-logs)
-- More articles: [[<-- prev]](/spring-boot-ops)
diff --git a/spring-boot-ops-2/pom.xml b/spring-boot-ops-2/pom.xml
deleted file mode 100644
index 74fcd79169..0000000000
--- a/spring-boot-ops-2/pom.xml
+++ /dev/null
@@ -1,40 +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-boot-ops-2</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-boot-ops-2</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-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/spring-boot-ops-2/src/main/resources/application.properties b/spring-boot-ops-2/src/main/resources/application.properties
deleted file mode 100644
index fc3fff1d38..0000000000
--- a/spring-boot-ops-2/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.profiles.active=tomcat
diff --git a/spring-boot-ops/README.md b/spring-boot-ops/README.md
deleted file mode 100644
index 2720bc5ae2..0000000000
--- a/spring-boot-ops/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-## Spring Boot Operations
-
-This module contains articles about Spring Boot Operations
-
-### Relevant Articles:			
- - [Deploy a Spring Boot WAR into a Tomcat Server](https://www.baeldung.com/spring-boot-war-tomcat-deploy)		
- - [Spring Boot Dependency Management with a Custom Parent](https://www.baeldung.com/spring-boot-dependency-management-custom-parent)		
- - [A Custom Data Binder in Spring MVC](https://www.baeldung.com/spring-mvc-custom-data-binder)		
- - [Create a Fat Jar App with Spring Boot](https://www.baeldung.com/deployable-fat-jar-spring-boot)		
- - [Introduction to WebJars](https://www.baeldung.com/maven-webjars)		
- - [Intro to Spring Boot Starters](https://www.baeldung.com/spring-boot-starters)		
- - [A Quick Guide to Maven Wrapper](https://www.baeldung.com/maven-wrapper)		
- - [Shutdown a Spring Boot Application](https://www.baeldung.com/spring-boot-shutdown)
- - [Spring Boot Console Application](https://www.baeldung.com/spring-boot-console-app)
- - [Comparing Embedded Servlet Containers in Spring Boot](https://www.baeldung.com/spring-boot-servlet-containers)
- - [Programmatically Restarting a Spring Boot Application](https://www.baeldung.com/java-restart-spring-boot-app)
- - [Spring Properties File Outside jar](https://www.baeldung.com/spring-properties-file-outside-jar)
- - [EnvironmentPostProcessor in Spring Boot](https://www.baeldung.com/spring-boot-environmentpostprocessor)
- - [Running a Spring Boot App with Maven vs an Executable War/Jar](https://www.baeldung.com/spring-boot-run-maven-vs-executable-jar)
- - More articles: [[next -->]](/spring-boot-ops-2)
diff --git a/spring-boot-performance/README.md b/spring-boot-performance/README.md
index 015dd759a8..f6a11720de 100644
--- a/spring-boot-performance/README.md
+++ b/spring-boot-performance/README.md
@@ -1,3 +1,7 @@
+## Spring Boot Performance
+
+This module contains articles about Spring Boot performance.
+
 ### Relevant Articles
 
 - [Lazy Initialization in Spring Boot 2](https://www.baeldung.com/spring-boot-lazy-initialization)
diff --git a/spring-boot-properties/README.md b/spring-boot-properties/README.md
index 48ff79537c..daf7c55ab3 100644
--- a/spring-boot-properties/README.md
+++ b/spring-boot-properties/README.md
@@ -1,3 +1,7 @@
+## Spring Boot Properties
+
+This module contains articles about Properties in Spring Boot.
+
 ### Relevant Articles:
 - [Reloading Properties Files in Spring](https://www.baeldung.com/spring-reloading-properties)
 - [Guide to @ConfigurationProperties in Spring Boot](https://www.baeldung.com/configuration-properties-in-spring-boot)
diff --git a/spring-boot-runtime/README.md b/spring-boot-runtime/README.md
new file mode 100644
index 0000000000..d3dc19493d
--- /dev/null
+++ b/spring-boot-runtime/README.md
@@ -0,0 +1,10 @@
+## Spring Boot Runtime
+
+This module contains articles about administering a Spring Boot runtime
+
+### Relevant Articles:									
+ - [Shutdown a Spring Boot Application](https://www.baeldung.com/spring-boot-shutdown)
+ - [Programmatically Restarting a Spring Boot Application](https://www.baeldung.com/java-restart-spring-boot-app)
+ - [Logging HTTP Requests with Spring Boot Actuator HTTP Tracing](https://www.baeldung.com/spring-boot-actuator-http)
+ - [How to Disable Console Logging in Spring Boot](https://www.baeldung.com/spring-boot-disable-console-logging)
+ - [Spring Boot Embedded Tomcat Logs](https://www.baeldung.com/spring-boot-embedded-tomcat-logs) 
\ No newline at end of file
diff --git a/spring-boot-disable-console-logging/disabling-console-jul/.gitignore b/spring-boot-runtime/disabling-console-jul/.gitignore
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-jul/.gitignore
rename to spring-boot-runtime/disabling-console-jul/.gitignore
diff --git a/spring-boot-disable-console-logging/disabling-console-jul/pom.xml b/spring-boot-runtime/disabling-console-jul/pom.xml
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-jul/pom.xml
rename to spring-boot-runtime/disabling-console-jul/pom.xml
diff --git a/spring-boot-disable-console-logging/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/DisablingConsoleJulApp.java b/spring-boot-runtime/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/DisablingConsoleJulApp.java
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/DisablingConsoleJulApp.java
rename to spring-boot-runtime/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/DisablingConsoleJulApp.java
diff --git a/spring-boot-disable-console-logging/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/controllers/DisabledConsoleRestController.java b/spring-boot-runtime/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/controllers/DisabledConsoleRestController.java
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/controllers/DisabledConsoleRestController.java
rename to spring-boot-runtime/disabling-console-jul/src/main/java/com/baeldung/springbootlogging/disablingconsole/jul/properties/controllers/DisabledConsoleRestController.java
diff --git a/spring-boot-disable-console-logging/disabling-console-jul/src/main/resources/application.properties b/spring-boot-runtime/disabling-console-jul/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-jul/src/main/resources/application.properties
rename to spring-boot-runtime/disabling-console-jul/src/main/resources/application.properties
diff --git a/spring-boot-disable-console-logging/disabling-console-jul/src/main/resources/logging.properties b/spring-boot-runtime/disabling-console-jul/src/main/resources/logging.properties
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-jul/src/main/resources/logging.properties
rename to spring-boot-runtime/disabling-console-jul/src/main/resources/logging.properties
diff --git a/spring-boot-disable-console-logging/disabling-console-log4j2/.gitignore b/spring-boot-runtime/disabling-console-log4j2/.gitignore
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-log4j2/.gitignore
rename to spring-boot-runtime/disabling-console-log4j2/.gitignore
diff --git a/spring-boot-disable-console-logging/disabling-console-log4j2/pom.xml b/spring-boot-runtime/disabling-console-log4j2/pom.xml
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-log4j2/pom.xml
rename to spring-boot-runtime/disabling-console-log4j2/pom.xml
diff --git a/spring-boot-disable-console-logging/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/DisablingConsoleLog4j2App.java b/spring-boot-runtime/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/DisablingConsoleLog4j2App.java
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/DisablingConsoleLog4j2App.java
rename to spring-boot-runtime/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/DisablingConsoleLog4j2App.java
diff --git a/spring-boot-disable-console-logging/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/controllers/DisabledConsoleRestController.java b/spring-boot-runtime/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/controllers/DisabledConsoleRestController.java
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/controllers/DisabledConsoleRestController.java
rename to spring-boot-runtime/disabling-console-log4j2/src/main/java/com/baeldung/springbootlogging/disablingconsole/log4j2/xml/controllers/DisabledConsoleRestController.java
diff --git a/spring-boot-disable-console-logging/disabling-console-log4j2/src/main/resources/log4j2.xml b/spring-boot-runtime/disabling-console-log4j2/src/main/resources/log4j2.xml
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-log4j2/src/main/resources/log4j2.xml
rename to spring-boot-runtime/disabling-console-log4j2/src/main/resources/log4j2.xml
diff --git a/spring-boot-disable-console-logging/disabling-console-logback/.gitignore b/spring-boot-runtime/disabling-console-logback/.gitignore
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-logback/.gitignore
rename to spring-boot-runtime/disabling-console-logback/.gitignore
diff --git a/spring-boot-disable-console-logging/disabling-console-logback/pom.xml b/spring-boot-runtime/disabling-console-logback/pom.xml
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-logback/pom.xml
rename to spring-boot-runtime/disabling-console-logback/pom.xml
diff --git a/spring-boot-disable-console-logging/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/DisablingConsoleLogbackApp.java b/spring-boot-runtime/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/DisablingConsoleLogbackApp.java
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/DisablingConsoleLogbackApp.java
rename to spring-boot-runtime/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/DisablingConsoleLogbackApp.java
diff --git a/spring-boot-disable-console-logging/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/controllers/DisabledConsoleRestController.java b/spring-boot-runtime/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/controllers/DisabledConsoleRestController.java
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/controllers/DisabledConsoleRestController.java
rename to spring-boot-runtime/disabling-console-logback/src/main/java/com/baeldung/springbootlogging/disablingconsole/logback/xml/controllers/DisabledConsoleRestController.java
diff --git a/spring-boot-disable-console-logging/disabling-console-logback/src/main/resources/application.properties b/spring-boot-runtime/disabling-console-logback/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-logback/src/main/resources/application.properties
rename to spring-boot-runtime/disabling-console-logback/src/main/resources/application.properties
diff --git a/spring-boot-disable-console-logging/disabling-console-logback/src/main/resources/logback-spring.xml b/spring-boot-runtime/disabling-console-logback/src/main/resources/logback-spring.xml
similarity index 100%
rename from spring-boot-disable-console-logging/disabling-console-logback/src/main/resources/logback-spring.xml
rename to spring-boot-runtime/disabling-console-logback/src/main/resources/logback-spring.xml
diff --git a/spring-boot-ops/docker/Dockerfile b/spring-boot-runtime/docker/Dockerfile
similarity index 100%
rename from spring-boot-ops/docker/Dockerfile
rename to spring-boot-runtime/docker/Dockerfile
diff --git a/spring-boot-ops/docker/logback.xml b/spring-boot-runtime/docker/logback.xml
similarity index 100%
rename from spring-boot-ops/docker/logback.xml
rename to spring-boot-runtime/docker/logback.xml
diff --git a/spring-boot-ops/docker/run.sh b/spring-boot-runtime/docker/run.sh
old mode 100755
new mode 100644
similarity index 100%
rename from spring-boot-ops/docker/run.sh
rename to spring-boot-runtime/docker/run.sh
diff --git a/spring-boot-runtime/pom.xml b/spring-boot-runtime/pom.xml
new file mode 100644
index 0000000000..dca9b47410
--- /dev/null
+++ b/spring-boot-runtime/pom.xml
@@ -0,0 +1,159 @@
+<?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-boot-runtime</artifactId>
+    <name>spring-boot-runtime</name>
+    <packaging>war</packaging>
+    <description>Demo project for Spring Boot</description>
+
+    <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-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring-boot-admin-starter-client.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>${jpa.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.subethamail</groupId>
+            <artifactId>subethasmtp</artifactId>
+            <version>${subethasmtp.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-context</artifactId>
+            <version>${springcloud.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>**/conf.properties</exclude>
+                </excludes>
+            </resource>
+        </resources>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>autoconfiguration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>**/*LiveTest.java</exclude>
+                                        <exclude>**/*IntegrationTest.java</exclude>
+                                        <exclude>**/*IntTest.java</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/AutoconfigurationTest.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <test.mime>json</test.mime>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
+    <properties>
+        <jpa.version>2.2</jpa.version>
+        <guava.version>18.0</guava.version>
+        <subethasmtp.version>3.1.7</subethasmtp.version>
+        <springcloud.version>2.0.2.RELEASE</springcloud.version>
+        <httpclient.version>4.5.8</httpclient.version>
+        <spring-boot-admin-starter-client.version>2.1.6</spring-boot-admin-starter-client.version>
+    </properties>
+
+</project>
diff --git a/spring-boot-ops/src/main/java/com/baeldung/restart/Application.java b/spring-boot-runtime/src/main/java/com/baeldung/restart/Application.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/restart/Application.java
rename to spring-boot-runtime/src/main/java/com/baeldung/restart/Application.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/restart/RestartController.java b/spring-boot-runtime/src/main/java/com/baeldung/restart/RestartController.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/restart/RestartController.java
rename to spring-boot-runtime/src/main/java/com/baeldung/restart/RestartController.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/restart/RestartService.java b/spring-boot-runtime/src/main/java/com/baeldung/restart/RestartService.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/restart/RestartService.java
rename to spring-boot-runtime/src/main/java/com/baeldung/restart/RestartService.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/shutdown/Application.java b/spring-boot-runtime/src/main/java/com/baeldung/shutdown/Application.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/shutdown/Application.java
rename to spring-boot-runtime/src/main/java/com/baeldung/shutdown/Application.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/shutdown/ShutdownConfig.java b/spring-boot-runtime/src/main/java/com/baeldung/shutdown/ShutdownConfig.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/shutdown/ShutdownConfig.java
rename to spring-boot-runtime/src/main/java/com/baeldung/shutdown/ShutdownConfig.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/shutdown/TerminateBean.java b/spring-boot-runtime/src/main/java/com/baeldung/shutdown/TerminateBean.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/shutdown/TerminateBean.java
rename to spring-boot-runtime/src/main/java/com/baeldung/shutdown/TerminateBean.java
diff --git a/spring-boot-ops/src/main/java/com/baeldung/shutdown/shutdown/ShutdownController.java b/spring-boot-runtime/src/main/java/com/baeldung/shutdown/shutdown/ShutdownController.java
similarity index 100%
rename from spring-boot-ops/src/main/java/com/baeldung/shutdown/shutdown/ShutdownController.java
rename to spring-boot-runtime/src/main/java/com/baeldung/shutdown/shutdown/ShutdownController.java
diff --git a/spring-boot-management/src/main/java/com/baeldung/spring/boot/management/logging/LoggingApplication.java b/spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/logging/LoggingApplication.java
similarity index 82%
rename from spring-boot-management/src/main/java/com/baeldung/spring/boot/management/logging/LoggingApplication.java
rename to spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/logging/LoggingApplication.java
index 6371ac4c64..5c1b143c4e 100644
--- a/spring-boot-management/src/main/java/com/baeldung/spring/boot/management/logging/LoggingApplication.java
+++ b/spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/logging/LoggingApplication.java
@@ -2,7 +2,9 @@ package com.baeldung.spring.boot.management.logging;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Profile;
 
+@Profile("logging")
 @SpringBootApplication
 public class LoggingApplication {
     public static void main(String[] args) {
diff --git a/spring-boot-management/src/main/java/com/baeldung/spring/boot/management/logging/LoggingController.java b/spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/logging/LoggingController.java
similarity index 100%
rename from spring-boot-management/src/main/java/com/baeldung/spring/boot/management/logging/LoggingController.java
rename to spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/logging/LoggingController.java
diff --git a/spring-boot-management/src/main/java/com/baeldung/spring/boot/management/logging/SecurityConfig.java b/spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/logging/SecurityConfig.java
similarity index 100%
rename from spring-boot-management/src/main/java/com/baeldung/spring/boot/management/logging/SecurityConfig.java
rename to spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/logging/SecurityConfig.java
diff --git a/spring-boot-management/src/main/java/com/baeldung/spring/boot/management/trace/App.java b/spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/trace/App.java
similarity index 80%
rename from spring-boot-management/src/main/java/com/baeldung/spring/boot/management/trace/App.java
rename to spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/trace/App.java
index 150e451c57..ffc30e9b33 100644
--- a/spring-boot-management/src/main/java/com/baeldung/spring/boot/management/trace/App.java
+++ b/spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/trace/App.java
@@ -2,7 +2,9 @@ package com.baeldung.spring.boot.management.trace;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Profile;
 
+@Profile("logging")
 @SpringBootApplication
 public class App {
 
diff --git a/spring-boot-management/src/main/java/com/baeldung/spring/boot/management/trace/CustomTraceRepository.java b/spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/trace/CustomTraceRepository.java
similarity index 100%
rename from spring-boot-management/src/main/java/com/baeldung/spring/boot/management/trace/CustomTraceRepository.java
rename to spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/trace/CustomTraceRepository.java
diff --git a/spring-boot-management/src/main/java/com/baeldung/spring/boot/management/trace/EchoController.java b/spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/trace/EchoController.java
similarity index 100%
rename from spring-boot-management/src/main/java/com/baeldung/spring/boot/management/trace/EchoController.java
rename to spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/trace/EchoController.java
diff --git a/spring-boot-management/src/main/java/com/baeldung/spring/boot/management/trace/TraceRequestFilter.java b/spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/trace/TraceRequestFilter.java
similarity index 100%
rename from spring-boot-management/src/main/java/com/baeldung/spring/boot/management/trace/TraceRequestFilter.java
rename to spring-boot-runtime/src/main/java/com/baeldung/spring/boot/management/trace/TraceRequestFilter.java
diff --git a/spring-boot-management/src/main/resources/application.properties b/spring-boot-runtime/src/main/resources/application-logging.properties
similarity index 100%
rename from spring-boot-management/src/main/resources/application.properties
rename to spring-boot-runtime/src/main/resources/application-logging.properties
diff --git a/spring-boot-ops-2/src/main/resources/application-tomcat.properties b/spring-boot-runtime/src/main/resources/application-tomcat.properties
similarity index 100%
rename from spring-boot-ops-2/src/main/resources/application-tomcat.properties
rename to spring-boot-runtime/src/main/resources/application-tomcat.properties
diff --git a/spring-boot-runtime/src/main/resources/application.properties b/spring-boot-runtime/src/main/resources/application.properties
new file mode 100644
index 0000000000..27b7915cff
--- /dev/null
+++ b/spring-boot-runtime/src/main/resources/application.properties
@@ -0,0 +1,7 @@
+management.endpoints.web.exposure.include=*
+management.metrics.enable.root=true
+management.metrics.enable.jvm=true
+management.endpoint.restart.enabled=true
+spring.datasource.jmx-enabled=false
+spring.main.allow-bean-definition-overriding=true
+management.endpoint.shutdown.enabled=true
\ No newline at end of file
diff --git a/spring-boot-runtime/src/main/resources/logback.xml b/spring-boot-runtime/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/spring-boot-runtime/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/spring-boot-ops/src/test/java/com/baeldung/restart/RestartApplicationManualTest.java b/spring-boot-runtime/src/test/java/com/baeldung/restart/RestartApplicationManualTest.java
similarity index 100%
rename from spring-boot-ops/src/test/java/com/baeldung/restart/RestartApplicationManualTest.java
rename to spring-boot-runtime/src/test/java/com/baeldung/restart/RestartApplicationManualTest.java
diff --git a/spring-boot-ops/src/test/java/com/baeldung/shutdown/ShutdownApplicationIntegrationTest.java b/spring-boot-runtime/src/test/java/com/baeldung/shutdown/ShutdownApplicationIntegrationTest.java
similarity index 100%
rename from spring-boot-ops/src/test/java/com/baeldung/shutdown/ShutdownApplicationIntegrationTest.java
rename to spring-boot-runtime/src/test/java/com/baeldung/shutdown/ShutdownApplicationIntegrationTest.java
diff --git a/spring-boot-ops/src/test/resources/application-integrationtest.properties b/spring-boot-runtime/src/test/resources/application-integrationtest.properties
similarity index 100%
rename from spring-boot-ops/src/test/resources/application-integrationtest.properties
rename to spring-boot-runtime/src/test/resources/application-integrationtest.properties
diff --git a/spring-boot-ops/src/test/resources/application.properties b/spring-boot-runtime/src/test/resources/application.properties
similarity index 100%
rename from spring-boot-ops/src/test/resources/application.properties
rename to spring-boot-runtime/src/test/resources/application.properties
diff --git a/spring-boot/src/main/java/com/baeldung/graphql/Query.java b/spring-boot/src/main/java/com/baeldung/graphql/Query.java
index 7bb625798c..6988cdd37f 100644
--- a/spring-boot/src/main/java/com/baeldung/graphql/Query.java
+++ b/spring-boot/src/main/java/com/baeldung/graphql/Query.java
@@ -11,7 +11,7 @@ public class Query implements GraphQLQueryResolver {
         this.postDao = postDao;
     }
 
-    public List<Post> recentPosts(int count, int offset) {
+    public List<Post> getRecentPosts(int count, int offset) {
         return postDao.getRecentPosts(count, offset);
     }
 }
diff --git a/spring-boot/src/main/java/org/baeldung/repository/UserRepository.java b/spring-boot/src/main/java/org/baeldung/repository/UserRepository.java
index 7335af2616..752664cd5d 100644
--- a/spring-boot/src/main/java/org/baeldung/repository/UserRepository.java
+++ b/spring-boot/src/main/java/org/baeldung/repository/UserRepository.java
@@ -15,7 +15,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.stream.Stream;
 
 @Repository("userRepository")
 public interface UserRepository extends JpaRepository<User, Integer> {
diff --git a/spring-boot/src/test/java/org/baeldung/repository/UserRepositoryIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/repository/UserRepositoryIntegrationTest.java
index 04bb1170f8..ea7f118967 100644
--- a/spring-boot/src/test/java/org/baeldung/repository/UserRepositoryIntegrationTest.java
+++ b/spring-boot/src/test/java/org/baeldung/repository/UserRepositoryIntegrationTest.java
@@ -8,12 +8,10 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-caching/README.md b/spring-caching/README.md
new file mode 100644
index 0000000000..14dfe94041
--- /dev/null
+++ b/spring-caching/README.md
@@ -0,0 +1,4 @@
+### Relevant articles:
+- [Introduction To Ehcache](http://www.baeldung.com/ehcache)
+- [A Guide To Caching in Spring](http://www.baeldung.com/spring-cache-tutorial)
+- [Spring Cache – Creating a Custom KeyGenerator](http://www.baeldung.com/spring-cache-custom-keygenerator)
diff --git a/spring-caching/pom.xml b/spring-caching/pom.xml
new file mode 100644
index 0000000000..3329cd5f77
--- /dev/null
+++ b/spring-caching/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>
+    <artifactId>spring-caching</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-caching</name>
+    <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>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <ehcache.version>3.5.2</ehcache.version>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/spring-all/src/main/java/org/baeldung/caching/config/ApplicationCacheConfig.java b/spring-caching/src/main/java/org/baeldung/caching/config/ApplicationCacheConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/caching/config/ApplicationCacheConfig.java
rename to spring-caching/src/main/java/org/baeldung/caching/config/ApplicationCacheConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/caching/config/CachingConfig.java b/spring-caching/src/main/java/org/baeldung/caching/config/CachingConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/caching/config/CachingConfig.java
rename to spring-caching/src/main/java/org/baeldung/caching/config/CachingConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/caching/config/CustomKeyGenerator.java b/spring-caching/src/main/java/org/baeldung/caching/config/CustomKeyGenerator.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/caching/config/CustomKeyGenerator.java
rename to spring-caching/src/main/java/org/baeldung/caching/config/CustomKeyGenerator.java
diff --git a/spring-all/src/main/java/org/baeldung/caching/eviction/controllers/CachingController.java b/spring-caching/src/main/java/org/baeldung/caching/eviction/controllers/CachingController.java
similarity index 96%
rename from spring-all/src/main/java/org/baeldung/caching/eviction/controllers/CachingController.java
rename to spring-caching/src/main/java/org/baeldung/caching/eviction/controllers/CachingController.java
index 675cb7a516..aaaf8a5918 100644
--- a/spring-all/src/main/java/org/baeldung/caching/eviction/controllers/CachingController.java
+++ b/spring-caching/src/main/java/org/baeldung/caching/eviction/controllers/CachingController.java
@@ -1,18 +1,18 @@
-package org.baeldung.caching.eviction.controllers;
-
-import org.baeldung.caching.eviction.service.CachingService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class CachingController {
-
-    @Autowired
-    CachingService cachingService;
-
-    @GetMapping("clearAllCaches")
-    public void clearAllCaches() {
-        cachingService.evictAllCaches();
-    }
-}
+package org.baeldung.caching.eviction.controllers;
+
+import org.baeldung.caching.eviction.service.CachingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class CachingController {
+
+    @Autowired
+    CachingService cachingService;
+
+    @GetMapping("clearAllCaches")
+    public void clearAllCaches() {
+        cachingService.evictAllCaches();
+    }
+}
diff --git a/spring-all/src/main/java/org/baeldung/caching/eviction/service/CachingService.java b/spring-caching/src/main/java/org/baeldung/caching/eviction/service/CachingService.java
similarity index 96%
rename from spring-all/src/main/java/org/baeldung/caching/eviction/service/CachingService.java
rename to spring-caching/src/main/java/org/baeldung/caching/eviction/service/CachingService.java
index 7e37215954..a0dd30c329 100644
--- a/spring-all/src/main/java/org/baeldung/caching/eviction/service/CachingService.java
+++ b/spring-caching/src/main/java/org/baeldung/caching/eviction/service/CachingService.java
@@ -1,53 +1,53 @@
-package org.baeldung.caching.eviction.service;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-@Component
-public class CachingService {
-
-    @Autowired
-    CacheManager cacheManager;
-
-    public void putToCache(String cacheName, String key, String value) {
-        cacheManager.getCache(cacheName).put(key, value);
-    }
-
-    public String getFromCache(String cacheName, String key) {
-        String value = null;
-        if (cacheManager.getCache(cacheName).get(key) != null) {
-            value = cacheManager.getCache(cacheName).get(key).get().toString();
-        }
-        return value;
-    }
-
-    @CacheEvict(value = "first", key = "#cacheKey")
-    public void evictSingleCacheValue(String cacheKey) {
-    }
-
-    @CacheEvict(value = "first", allEntries = true)
-    public void evictAllCacheValues() {
-    }
-
-    public void evictSingleCacheValue(String cacheName, String cacheKey) {
-        cacheManager.getCache(cacheName).evict(cacheKey);
-    }
-
-    public void evictAllCacheValues(String cacheName) {
-        cacheManager.getCache(cacheName).clear();
-    }
-
-    public void evictAllCaches() {
-        cacheManager.getCacheNames()
-          .parallelStream()
-          .forEach(cacheName -> cacheManager.getCache(cacheName).clear());
-    }
-
-    @Scheduled(fixedRate = 6000)
-    public void evictAllcachesAtIntervals() {
-        evictAllCaches();
-    }
-}
+package org.baeldung.caching.eviction.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CachingService {
+
+    @Autowired
+    CacheManager cacheManager;
+
+    public void putToCache(String cacheName, String key, String value) {
+        cacheManager.getCache(cacheName).put(key, value);
+    }
+
+    public String getFromCache(String cacheName, String key) {
+        String value = null;
+        if (cacheManager.getCache(cacheName).get(key) != null) {
+            value = cacheManager.getCache(cacheName).get(key).get().toString();
+        }
+        return value;
+    }
+
+    @CacheEvict(value = "first", key = "#cacheKey")
+    public void evictSingleCacheValue(String cacheKey) {
+    }
+
+    @CacheEvict(value = "first", allEntries = true)
+    public void evictAllCacheValues() {
+    }
+
+    public void evictSingleCacheValue(String cacheName, String cacheKey) {
+        cacheManager.getCache(cacheName).evict(cacheKey);
+    }
+
+    public void evictAllCacheValues(String cacheName) {
+        cacheManager.getCache(cacheName).clear();
+    }
+
+    public void evictAllCaches() {
+        cacheManager.getCacheNames()
+          .parallelStream()
+          .forEach(cacheName -> cacheManager.getCache(cacheName).clear());
+    }
+
+    @Scheduled(fixedRate = 6000)
+    public void evictAllcachesAtIntervals() {
+        evictAllCaches();
+    }
+}
diff --git a/spring-all/src/main/java/org/baeldung/caching/example/AbstractService.java b/spring-caching/src/main/java/org/baeldung/caching/example/AbstractService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/caching/example/AbstractService.java
rename to spring-caching/src/main/java/org/baeldung/caching/example/AbstractService.java
diff --git a/spring-all/src/main/java/org/baeldung/caching/example/BookService.java b/spring-caching/src/main/java/org/baeldung/caching/example/BookService.java
similarity index 93%
rename from spring-all/src/main/java/org/baeldung/caching/example/BookService.java
rename to spring-caching/src/main/java/org/baeldung/caching/example/BookService.java
index 26118d61de..9f3aaf89cf 100644
--- a/spring-all/src/main/java/org/baeldung/caching/example/BookService.java
+++ b/spring-caching/src/main/java/org/baeldung/caching/example/BookService.java
@@ -1,6 +1,6 @@
 package org.baeldung.caching.example;
 
-import org.baeldung.model.Book;
+import org.baeldung.caching.model.Book;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 
diff --git a/spring-all/src/main/java/org/baeldung/caching/example/Customer.java b/spring-caching/src/main/java/org/baeldung/caching/example/Customer.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/caching/example/Customer.java
rename to spring-caching/src/main/java/org/baeldung/caching/example/Customer.java
diff --git a/spring-all/src/main/java/org/baeldung/caching/example/CustomerDataService.java b/spring-caching/src/main/java/org/baeldung/caching/example/CustomerDataService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/caching/example/CustomerDataService.java
rename to spring-caching/src/main/java/org/baeldung/caching/example/CustomerDataService.java
diff --git a/spring-all/src/main/java/org/baeldung/caching/example/CustomerServiceWithParent.java b/spring-caching/src/main/java/org/baeldung/caching/example/CustomerServiceWithParent.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/caching/example/CustomerServiceWithParent.java
rename to spring-caching/src/main/java/org/baeldung/caching/example/CustomerServiceWithParent.java
diff --git a/spring-all/src/main/java/org/baeldung/model/Book.java b/spring-caching/src/main/java/org/baeldung/caching/model/Book.java
similarity index 94%
rename from spring-all/src/main/java/org/baeldung/model/Book.java
rename to spring-caching/src/main/java/org/baeldung/caching/model/Book.java
index 9305ce9653..c110c79db0 100644
--- a/spring-all/src/main/java/org/baeldung/model/Book.java
+++ b/spring-caching/src/main/java/org/baeldung/caching/model/Book.java
@@ -1,4 +1,4 @@
-package org.baeldung.model;
+package org.baeldung.caching.model;
 
 public class Book {
 
diff --git a/spring-all/src/main/java/org/baeldung/ehcache/calculator/SquaredCalculator.java b/spring-caching/src/main/java/org/baeldung/ehcache/calculator/SquaredCalculator.java
old mode 100755
new mode 100644
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/ehcache/calculator/SquaredCalculator.java
rename to spring-caching/src/main/java/org/baeldung/ehcache/calculator/SquaredCalculator.java
diff --git a/spring-all/src/main/java/org/baeldung/ehcache/config/CacheHelper.java b/spring-caching/src/main/java/org/baeldung/ehcache/config/CacheHelper.java
old mode 100755
new mode 100644
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/ehcache/config/CacheHelper.java
rename to spring-caching/src/main/java/org/baeldung/ehcache/config/CacheHelper.java
diff --git a/spring-all/src/main/resources/config.xml b/spring-caching/src/main/resources/config.xml
similarity index 100%
rename from spring-all/src/main/resources/config.xml
rename to spring-caching/src/main/resources/config.xml
diff --git a/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java b/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
new file mode 100644
index 0000000000..28b0d26bed
--- /dev/null
+++ b/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
@@ -0,0 +1,79 @@
+package org.baeldung.caching.test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.baeldung.caching.eviction.service.CachingService;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean;
+import org.springframework.cache.support.SimpleCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class CacheEvictAnnotationIntegrationTest {
+
+    @Configuration
+    @EnableCaching
+    static class ContextConfiguration {
+
+        @Bean
+        public CachingService cachingService() {
+            return new CachingService();
+        }
+
+        @Bean
+        public CacheManager cacheManager() {
+            SimpleCacheManager cacheManager = new SimpleCacheManager();
+            List<Cache> caches = new ArrayList<>();
+            caches.add(cacheBean().getObject());
+            cacheManager.setCaches(caches);
+            return cacheManager;
+        }
+
+        @Bean
+        public ConcurrentMapCacheFactoryBean cacheBean() {
+            ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean();
+            cacheFactoryBean.setName("first");
+            return cacheFactoryBean;
+        }
+    }
+
+    @Autowired
+    CachingService cachingService;
+
+    @Before
+    public void before() {
+        cachingService.putToCache("first", "key1", "Baeldung");
+        cachingService.putToCache("first", "key2", "Article");
+    }
+
+    @Test
+    public void givenFirstCache_whenSingleCacheValueEvictRequested_thenEmptyCacheValue() {
+        cachingService.evictSingleCacheValue("key1");
+        String key1 = cachingService.getFromCache("first", "key1");
+        assertThat(key1, is(nullValue()));
+    }
+
+    @Test
+    public void givenFirstCache_whenAllCacheValueEvictRequested_thenEmptyCache() {
+        cachingService.evictAllCacheValues();
+        String key1 = cachingService.getFromCache("first", "key1");
+        String key2 = cachingService.getFromCache("first", "key2");
+        assertThat(key1, is(nullValue()));
+        assertThat(key2, is(nullValue()));
+    }
+}
diff --git a/spring-all/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java b/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
similarity index 67%
rename from spring-all/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
rename to spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
index 9c6aaea892..ffcc88febc 100644
--- a/spring-all/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
+++ b/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
@@ -1,96 +1,96 @@
-package org.baeldung.caching.test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.baeldung.caching.eviction.service.CachingService;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean;
-import org.springframework.cache.support.SimpleCacheManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
-public class CacheManagerEvictIntegrationTest {
-	
-	@Configuration
-	static class ContextConfiguration {
-
-		@Bean
-		public CachingService cachingService() {
-			return new CachingService();
-		}
-		
-		@Bean
-		public CacheManager cacheManager(){
-			SimpleCacheManager cacheManager = new SimpleCacheManager();
-			List<Cache> caches = new ArrayList<>();
-			caches.add(cacheBeanFirst().getObject());
-			caches.add(cacheBeanSecond().getObject());
-			cacheManager.setCaches(caches );
-			return cacheManager;
-		}
-		
-		@Bean
-		public ConcurrentMapCacheFactoryBean cacheBeanFirst(){
-			ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean();
-			cacheFactoryBean.setName("first");
-			return cacheFactoryBean;
-		}
-		
-		@Bean
-		public ConcurrentMapCacheFactoryBean cacheBeanSecond(){
-			ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean();
-			cacheFactoryBean.setName("second");
-			return cacheFactoryBean;
-		}
-	}
-
-    @Autowired
-    CachingService cachingService;
-
-    @Before
-    public void before() {
-        cachingService.putToCache("first", "key1", "Baeldung");
-        cachingService.putToCache("first", "key2", "Article");
-        cachingService.putToCache("second", "key", "Article");
-    }
-
-    @Test
-    public void givenFirstCache_whenSingleCacheValueEvictRequested_thenEmptyCacheValue() {
-        cachingService.evictSingleCacheValue("first", "key1");
-        String key1 = cachingService.getFromCache("first", "key1");
-        assertThat(key1, is(nullValue()));
-    }
-
-    @Test
-    public void givenFirstCache_whenAllCacheValueEvictRequested_thenEmptyCache() {
-        cachingService.evictAllCacheValues("first");
-        String key1 = cachingService.getFromCache("first", "key1");
-        String key2 = cachingService.getFromCache("first", "key2");
-        assertThat(key1, is(nullValue()));
-        assertThat(key2, is(nullValue()));
-    }
-
-    @Test
-    public void givenAllCaches_whenAllCacheEvictRequested_thenEmptyAllCaches() {
-        cachingService.evictAllCaches();
-        String key1 = cachingService.getFromCache("first", "key1");
-        assertThat(key1, is(nullValue()));
-
-        String key = cachingService.getFromCache("second", "key");
-        assertThat(key, is(nullValue()));
-    }
-}
+package org.baeldung.caching.test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.baeldung.caching.eviction.service.CachingService;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean;
+import org.springframework.cache.support.SimpleCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class CacheManagerEvictIntegrationTest {
+
+    @Configuration
+    static class ContextConfiguration {
+
+        @Bean
+        public CachingService cachingService() {
+            return new CachingService();
+        }
+
+        @Bean
+        public CacheManager cacheManager() {
+            SimpleCacheManager cacheManager = new SimpleCacheManager();
+            List<Cache> caches = new ArrayList<>();
+            caches.add(cacheBeanFirst().getObject());
+            caches.add(cacheBeanSecond().getObject());
+            cacheManager.setCaches(caches);
+            return cacheManager;
+        }
+
+        @Bean
+        public ConcurrentMapCacheFactoryBean cacheBeanFirst() {
+            ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean();
+            cacheFactoryBean.setName("first");
+            return cacheFactoryBean;
+        }
+
+        @Bean
+        public ConcurrentMapCacheFactoryBean cacheBeanSecond() {
+            ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean();
+            cacheFactoryBean.setName("second");
+            return cacheFactoryBean;
+        }
+    }
+
+    @Autowired
+    CachingService cachingService;
+
+    @Before
+    public void before() {
+        cachingService.putToCache("first", "key1", "Baeldung");
+        cachingService.putToCache("first", "key2", "Article");
+        cachingService.putToCache("second", "key", "Article");
+    }
+
+    @Test
+    public void givenFirstCache_whenSingleCacheValueEvictRequested_thenEmptyCacheValue() {
+        cachingService.evictSingleCacheValue("first", "key1");
+        String key1 = cachingService.getFromCache("first", "key1");
+        assertThat(key1, is(nullValue()));
+    }
+
+    @Test
+    public void givenFirstCache_whenAllCacheValueEvictRequested_thenEmptyCache() {
+        cachingService.evictAllCacheValues("first");
+        String key1 = cachingService.getFromCache("first", "key1");
+        String key2 = cachingService.getFromCache("first", "key2");
+        assertThat(key1, is(nullValue()));
+        assertThat(key2, is(nullValue()));
+    }
+
+    @Test
+    public void givenAllCaches_whenAllCacheEvictRequested_thenEmptyAllCaches() {
+        cachingService.evictAllCaches();
+        String key1 = cachingService.getFromCache("first", "key1");
+        assertThat(key1, is(nullValue()));
+
+        String key = cachingService.getFromCache("second", "key");
+        assertThat(key, is(nullValue()));
+    }
+}
diff --git a/spring-all/src/test/java/org/baeldung/caching/test/SpringCachingIntegrationTest.java b/spring-caching/src/test/java/org/baeldung/caching/test/SpringCachingIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/caching/test/SpringCachingIntegrationTest.java
rename to spring-caching/src/test/java/org/baeldung/caching/test/SpringCachingIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java b/spring-caching/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java
similarity index 97%
rename from spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java
rename to spring-caching/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java
index 96265c11f5..0e6ac6fd8e 100644
--- a/spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java
+++ b/spring-caching/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java
@@ -1,40 +1,40 @@
-package org.baeldung.ehcache;
-
-import org.baeldung.ehcache.calculator.SquaredCalculator;
-import org.baeldung.ehcache.config.CacheHelper;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class SquareCalculatorUnitTest {
-    private SquaredCalculator squaredCalculator = new SquaredCalculator();
-    private CacheHelper cacheHelper = new CacheHelper();
-
-    @Before
-    public void setup() {
-        squaredCalculator.setCache(cacheHelper);
-    }
-
-    @Test
-    public void whenCalculatingSquareValueOnce_thenCacheDontHaveValues() {
-        for (int i = 10; i < 15; i++) {
-            assertFalse(cacheHelper.getSquareNumberCache().containsKey(i));
-            System.out.println("Square value of " + i + " is: " + squaredCalculator.getSquareValueOfNumber(i) + "\n");
-        }
-    }
-
-    @Test
-    public void whenCalculatingSquareValueAgain_thenCacheHasAllValues() {
-        for (int i = 10; i < 15; i++) {
-            assertFalse(cacheHelper.getSquareNumberCache().containsKey(i));
-            System.out.println("Square value of " + i + " is: " + squaredCalculator.getSquareValueOfNumber(i) + "\n");
-        }
-
-        for (int i = 10; i < 15; i++) {
-            assertTrue(cacheHelper.getSquareNumberCache().containsKey(i));
-            System.out.println("Square value of " + i + " is: " + squaredCalculator.getSquareValueOfNumber(i) + "\n");
-        }
-    }
-}
+package org.baeldung.ehcache;
+
+import org.baeldung.ehcache.calculator.SquaredCalculator;
+import org.baeldung.ehcache.config.CacheHelper;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class SquareCalculatorUnitTest {
+    private SquaredCalculator squaredCalculator = new SquaredCalculator();
+    private CacheHelper cacheHelper = new CacheHelper();
+
+    @Before
+    public void setup() {
+        squaredCalculator.setCache(cacheHelper);
+    }
+
+    @Test
+    public void whenCalculatingSquareValueOnce_thenCacheDontHaveValues() {
+        for (int i = 10; i < 15; i++) {
+            assertFalse(cacheHelper.getSquareNumberCache().containsKey(i));
+            System.out.println("Square value of " + i + " is: " + squaredCalculator.getSquareValueOfNumber(i) + "\n");
+        }
+    }
+
+    @Test
+    public void whenCalculatingSquareValueAgain_thenCacheHasAllValues() {
+        for (int i = 10; i < 15; i++) {
+            assertFalse(cacheHelper.getSquareNumberCache().containsKey(i));
+            System.out.println("Square value of " + i + " is: " + squaredCalculator.getSquareValueOfNumber(i) + "\n");
+        }
+
+        for (int i = 10; i < 15; i++) {
+            assertTrue(cacheHelper.getSquareNumberCache().containsKey(i));
+            System.out.println("Square value of " + i + " is: " + squaredCalculator.getSquareValueOfNumber(i) + "\n");
+        }
+    }
+}
diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index baf86a4386..7138efc128 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -25,7 +25,7 @@
         <module>spring-cloud-zookeeper</module>
         <module>spring-cloud-gateway</module>
         <module>spring-cloud-stream</module>
-		<module>spring-cloud-stream-starters/twitterhdfs</module>
+        <module>spring-cloud-stream-starters/twitterhdfs</module>
         <module>spring-cloud-connectors-heroku</module>
         <module>spring-cloud-aws</module>
         <module>spring-cloud-consul</module>
@@ -35,9 +35,10 @@
         <module>spring-cloud-archaius</module>
         <module>spring-cloud-functions</module>        
         <module>spring-cloud-vault</module>
-		<!-- <module>spring-cloud-security</module> --> <!-- Fixing in BAEL-10887 -->
-		<module>spring-cloud-task</module>
+        <!-- <module>spring-cloud-security</module> --> <!-- Fixing in BAEL-10887 -->
+        <module>spring-cloud-task</module>
         <module>spring-cloud-zuul</module>
+        <module>spring-cloud-zuul-fallback</module>
     </modules>
 
     <build>
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml
index 18bc426364..2ba9d55358 100644
--- a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml
@@ -2,8 +2,6 @@
     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-stream-kafka</artifactId>
     <name>spring-cloud-stream-kafka</name>
     <description>Simple Spring Cloud Stream</description>
@@ -15,13 +13,6 @@
         <version>2.1.5.RELEASE</version>
     </parent>
 
-    <properties>
-        <java.version>1.8</java.version>
-        <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
-        <kafka-avro-serializer.version>4.0.0</kafka-avro-serializer.version>
-        <avro.version>1.8.2</avro.version>
-    </properties>
-
     <dependencies>
 
         <dependency>
@@ -108,4 +99,11 @@
         </repository>
     </repositories>
 
+    <properties>
+        <java.version>1.8</java.version>
+        <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+        <kafka-avro-serializer.version>4.0.0</kafka-avro-serializer.version>
+        <avro.version>1.8.2</avro.version>
+    </properties>
+
 </project>
diff --git a/spring-cloud/spring-cloud-zuul-fallback/README.md b/spring-cloud/spring-cloud-zuul-fallback/README.md
new file mode 100644
index 0000000000..2f13c1923b
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Fallback for Zuul Route](TODO)
diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/pom.xml b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/pom.xml
new file mode 100644
index 0000000000..ee0f607d8a
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/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>
+    <artifactId>api-gateway</artifactId>
+    <name>api-gateway</name>
+    <description>API Gateway using Zuul</description>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-zuul-fallback</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-parent</artifactId>
+                <version>${spring-cloud-dependencies.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java
new file mode 100644
index 0000000000..78f489f2bb
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java
@@ -0,0 +1,15 @@
+package com.baeldung.spring.cloud.apigateway;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
+
+@SpringBootApplication
+@EnableZuulProxy
+public class ApiGatewayApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ApiGatewayApplication.class, args);
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java
new file mode 100644
index 0000000000..ce0c7819f1
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java
@@ -0,0 +1,69 @@
+package com.baeldung.spring.cloud.apigateway.fallback;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.ClientHttpResponse;
+
+public class GatewayClientResponse implements ClientHttpResponse {
+
+    private HttpStatus status;
+    private String message;
+
+    public GatewayClientResponse(HttpStatus status, String message) {
+        this.status = status;
+        this.message = message;
+    }
+
+    @Override
+    public HttpStatus getStatusCode() throws IOException {
+        return status;
+    }
+
+    @Override
+    public int getRawStatusCode() throws IOException {
+        return status.value();
+    }
+
+    @Override
+    public String getStatusText() throws IOException {
+        return status.getReasonPhrase();
+    }
+
+    @Override
+    public void close() {
+    }
+
+    @Override
+    public InputStream getBody() throws IOException {
+        return new ByteArrayInputStream(message.getBytes());
+    }
+
+    @Override
+    public HttpHeaders getHeaders() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        return headers;
+    }
+
+    public HttpStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(HttpStatus status) {
+        this.status = status;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java
new file mode 100644
index 0000000000..73f72492c9
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java
@@ -0,0 +1,29 @@
+package com.baeldung.spring.cloud.apigateway.fallback;
+
+import org.springframework.cloud.netflix.zuul.filters.route.FallbackProvider;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.stereotype.Component;
+
+import com.netflix.hystrix.exception.HystrixTimeoutException;
+
+@Component
+class GatewayServiceFallback implements FallbackProvider {
+
+    private static final String DEFAULT_MESSAGE = "Service not available.";
+
+    @Override
+    public String getRoute() {
+        return "*"; // or return null;
+    }
+
+    @Override
+    public ClientHttpResponse fallbackResponse(String route, Throwable cause) {
+        if (cause instanceof HystrixTimeoutException) {
+            return new GatewayClientResponse(HttpStatus.GATEWAY_TIMEOUT, DEFAULT_MESSAGE);
+        } else {
+            return new GatewayClientResponse(HttpStatus.INTERNAL_SERVER_ERROR, DEFAULT_MESSAGE);
+        }
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java
new file mode 100644
index 0000000000..28fb6fb6e5
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java
@@ -0,0 +1,29 @@
+package com.baeldung.spring.cloud.apigateway.fallback;
+
+import org.springframework.cloud.netflix.zuul.filters.route.FallbackProvider;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.stereotype.Component;
+
+import com.netflix.hystrix.exception.HystrixTimeoutException;
+
+@Component
+class WeatherServiceFallback implements FallbackProvider {
+
+    private static final String DEFAULT_MESSAGE = "Weather information is not available.";
+
+    @Override
+    public String getRoute() {
+        return "weather-service";
+    }
+
+    @Override
+    public ClientHttpResponse fallbackResponse(String route, Throwable cause) {
+        if (cause instanceof HystrixTimeoutException) {
+            return new GatewayClientResponse(HttpStatus.GATEWAY_TIMEOUT, DEFAULT_MESSAGE);
+        } else {
+            return new GatewayClientResponse(HttpStatus.INTERNAL_SERVER_ERROR, DEFAULT_MESSAGE);
+        }
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml
new file mode 100644
index 0000000000..4a0662a960
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml
@@ -0,0 +1,22 @@
+spring:
+   application:
+      name: api-gateway
+server:
+   port: 7070
+  
+zuul:
+   igoredServices: '*'
+   routes:
+      weather-service:
+         path: /weather/**
+         serviceId: weather-service
+         strip-prefix: false
+
+ribbon:
+   eureka:
+      enabled: false
+
+weather-service:
+   ribbon:
+      listOfServers: localhost:8080
+
diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java
new file mode 100644
index 0000000000..4052edc1f3
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.apigateway;
+
+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
+public class ApiGatewayApplicationIntegrationTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java
new file mode 100644
index 0000000000..db2f703084
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java
@@ -0,0 +1,46 @@
+package com.baeldung.spring.cloud.apigateway.fallback;
+
+import static org.junit.Assert.assertEquals;
+
+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.http.HttpStatus;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.netflix.hystrix.exception.HystrixTimeoutException;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class GatewayServiceFallbackUnitTest {
+
+    private static final String ROUTE = "*";
+
+    @Autowired
+    private GatewayServiceFallback fallback;
+
+    @Test
+    public void testWhenGetRouteThenReturnWeatherServiceRoute() {
+        assertEquals(ROUTE, fallback.getRoute());
+
+    }
+
+    @Test
+    public void testFallbackResponse_whenHystrixException_thenGatewayTimeout() throws Exception {
+        HystrixTimeoutException exception = new HystrixTimeoutException();
+        ClientHttpResponse response = fallback.fallbackResponse(ROUTE, exception);
+
+        assertEquals(HttpStatus.GATEWAY_TIMEOUT, response.getStatusCode());
+    }
+
+    @Test
+    public void testFallbackResponse_whenNonHystrixException_thenInternalServerError() throws Exception {
+        RuntimeException exception = new RuntimeException("Test exception");
+        ClientHttpResponse response = fallback.fallbackResponse(ROUTE, exception);
+
+        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java
new file mode 100644
index 0000000000..ccd59531b5
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java
@@ -0,0 +1,46 @@
+package com.baeldung.spring.cloud.apigateway.fallback;
+
+import static org.junit.Assert.assertEquals;
+
+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.http.HttpStatus;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.netflix.hystrix.exception.HystrixTimeoutException;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class WeatherServiceFallbackUnitTest {
+
+    private static final String ROUTE = "weather-service";
+
+    @Autowired
+    private WeatherServiceFallback fallback;
+
+    @Test
+    public void testWhenGetRouteThenReturnWeatherServiceRoute() {
+        assertEquals(ROUTE, fallback.getRoute());
+
+    }
+
+    @Test
+    public void testFallbackResponse_whenHystrixException_thenGatewayTimeout() throws Exception {
+        HystrixTimeoutException exception = new HystrixTimeoutException();
+        ClientHttpResponse response = fallback.fallbackResponse(ROUTE, exception);
+
+        assertEquals(HttpStatus.GATEWAY_TIMEOUT, response.getStatusCode());
+    }
+
+    @Test
+    public void testFallbackResponse_whenNonHystrixException_thenInternalServerError() throws Exception {
+        RuntimeException exception = new RuntimeException("Test exception");
+        ClientHttpResponse response = fallback.fallbackResponse(ROUTE, exception);
+
+        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-zuul-fallback/pom.xml b/spring-cloud/spring-cloud-zuul-fallback/pom.xml
new file mode 100644
index 0000000000..5bdd1d49ca
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/pom.xml
@@ -0,0 +1,28 @@
+<?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-cloud-zuul-fallback</artifactId>
+    <packaging>pom</packaging>
+    <name>spring-cloud-zuul-fallback</name>
+    <description>Spring Cloud Zuul Fallback</description>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <modules>
+        <module>api-gateway</module>
+        <module>weather-service</module>
+    </modules>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
+        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+    </properties>
+</project>
diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/pom.xml b/spring-cloud/spring-cloud-zuul-fallback/weather-service/pom.xml
new file mode 100644
index 0000000000..611f1dcd4f
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/weather-service/pom.xml
@@ -0,0 +1,39 @@
+<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>weather-service</artifactId>
+    <name>Weather Service</name>
+    <description>Weather Service for Zuul Fallback Test</description>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-zuul-fallback</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-parent</artifactId>
+                <version>${spring-cloud-dependencies.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java b/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java
new file mode 100644
index 0000000000..3cf451dcf7
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.weatherservice;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/weather")
+public class WeatherController {
+
+    @GetMapping("/today")
+    public String getMessage() {
+        return "It's a bright sunny day today!";
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java b/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java
new file mode 100644
index 0000000000..3a6d85e8d1
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.spring.cloud.weatherservice;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class WeatherServiceApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(WeatherServiceApplication.class, args);
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml b/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml
new file mode 100644
index 0000000000..242f842f44
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml
@@ -0,0 +1,4 @@
+spring:
+   application:
+      name: weather-service
+
diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java b/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java
new file mode 100644
index 0000000000..3ffd2b0e7a
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.spring.cloud.weatherservice;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+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.WebMvcTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+
+@RunWith(SpringRunner.class)
+@WebMvcTest(WeatherController.class)
+public class WeatherControllerIntegrationTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    public void whenWeatherControllerInvoked_thenReturnWeatherInformation() throws Exception {
+        this.mockMvc.perform(get("/weather/today"))
+            .andDo(print())
+            .andExpect(status().isOk())
+            .andExpect(content().string(containsString("bright sunny day")));
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java b/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java
new file mode 100644
index 0000000000..fec7ec1560
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.weatherservice;
+
+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
+public class WeatherServiceApplicationIntegrationTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/guava-collections/.gitignore b/spring-core-2/.gitignore
similarity index 100%
rename from guava-collections/.gitignore
rename to spring-core-2/.gitignore
diff --git a/spring-core-2/README.md b/spring-core-2/README.md
index 910d27583f..bcb1ce1fb4 100644
--- a/spring-core-2/README.md
+++ b/spring-core-2/README.md
@@ -4,8 +4,15 @@ This module contains articles about core Spring functionality
 
 ## Relevant Articles:
 
-- [Understanding getBean() in Spring](https://www.baeldung.com/spring-getbean)
-- [Exploring the Spring BeanFactory API](https://www.baeldung.com/spring-beanfactory)
-- [How to use the Spring FactoryBean?](https://www.baeldung.com/spring-factorybean)
-- [Spring – Injecting Collections](https://www.baeldung.com/spring-injecting-collections)
-- More articles: [[<-- prev]](/spring-core)
+- [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire)
+- [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)
+- [Running Setup Data on Startup in Spring](http://www.baeldung.com/running-setup-logic-on-startup-in-spring)
+- [Quick Guide to Spring Bean Scopes](http://www.baeldung.com/spring-bean-scopes)
+- [Custom Scope in Spring](http://www.baeldung.com/spring-custom-scope)
+- [@Order in Spring](http://www.baeldung.com/spring-order)
+- [Spring @Primary Annotation](http://www.baeldung.com/spring-primary)
+- [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)
+- More articles: [[<-- prev]](/spring-core)
\ No newline at end of file
diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml
index c9334e3d38..21548d6984 100644
--- a/spring-core-2/pom.xml
+++ b/spring-core-2/pom.xml
@@ -1,65 +1,217 @@
-<?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"
+<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-core-2</artifactId>
+    <version>0.1-SNAPSHOT</version>
     <name>spring-core-2</name>
+    <packaging>war</packaging>
 
     <parent>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-5</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-spring-5</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <!-- Spring -->
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
+            <artifactId>spring-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>${spring.version}</version>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
+            <artifactId>spring-websocket</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-messaging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
+        <!-- aspectj -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+        </dependency>
+        <!-- persistence -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>${javassist.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+        </dependency>
+        <!-- validation -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <!-- web -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <!-- util -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit-jupiter.version}</version>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- ShedLock -->
+        <dependency>
+            <groupId>net.javacrumbs.shedlock</groupId>
+            <artifactId>shedlock-spring</artifactId>
+            <version>${shedlock.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.javacrumbs.shedlock</groupId>
+            <artifactId>shedlock-provider-jdbc-template</artifactId>
+            <version>${shedlock.version}</version>
+        </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>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-thymeleaf</artifactId>
+                <version>${org.springframework.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
+        <finalName>spring-core-2</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.surefire.version}</version>
+                <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>
-        <maven.surefire.version>2.22.1</maven.surefire.version>
+        <start-class>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>
+        <!-- persistence -->
+        <hibernate.version>5.2.5.Final</hibernate.version>
+
+        <!-- util -->
+        <guava.version>25.1-jre</guava.version>
+        <easymock.version>3.6</easymock.version>
+        <assertj.version>3.6.1</assertj.version>
+        <shedlock.version>2.1.0</shedlock.version>
+        <javassist.version>3.22.0-GA</javassist.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-all/src/main/java/org/baeldung/autowire/sample/App.java b/spring-core-2/src/main/java/org/baeldung/autowire/sample/App.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/autowire/sample/App.java
rename to spring-core-2/src/main/java/org/baeldung/autowire/sample/App.java
diff --git a/spring-all/src/main/java/org/baeldung/autowire/sample/AppConfig.java b/spring-core-2/src/main/java/org/baeldung/autowire/sample/AppConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/autowire/sample/AppConfig.java
rename to spring-core-2/src/main/java/org/baeldung/autowire/sample/AppConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/autowire/sample/BarFormatter.java b/spring-core-2/src/main/java/org/baeldung/autowire/sample/BarFormatter.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/autowire/sample/BarFormatter.java
rename to spring-core-2/src/main/java/org/baeldung/autowire/sample/BarFormatter.java
diff --git a/spring-all/src/main/java/org/baeldung/autowire/sample/FooDAO.java b/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooDAO.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/autowire/sample/FooDAO.java
rename to spring-core-2/src/main/java/org/baeldung/autowire/sample/FooDAO.java
diff --git a/spring-all/src/main/java/org/baeldung/autowire/sample/FooFormatter.java b/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooFormatter.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/autowire/sample/FooFormatter.java
rename to spring-core-2/src/main/java/org/baeldung/autowire/sample/FooFormatter.java
diff --git a/spring-all/src/main/java/org/baeldung/autowire/sample/FooService.java b/spring-core-2/src/main/java/org/baeldung/autowire/sample/FooService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/autowire/sample/FooService.java
rename to spring-core-2/src/main/java/org/baeldung/autowire/sample/FooService.java
diff --git a/spring-all/src/main/java/org/baeldung/autowire/sample/Formatter.java b/spring-core-2/src/main/java/org/baeldung/autowire/sample/Formatter.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/autowire/sample/Formatter.java
rename to spring-core-2/src/main/java/org/baeldung/autowire/sample/Formatter.java
diff --git a/spring-all/src/main/java/org/baeldung/autowire/sample/FormatterType.java b/spring-core-2/src/main/java/org/baeldung/autowire/sample/FormatterType.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/autowire/sample/FormatterType.java
rename to spring-core-2/src/main/java/org/baeldung/autowire/sample/FormatterType.java
diff --git a/spring-all/src/main/java/org/baeldung/bean/config/ConstructorBasedShipConfig.java b/spring-core-2/src/main/java/org/baeldung/bean/config/ConstructorBasedShipConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/bean/config/ConstructorBasedShipConfig.java
rename to spring-core-2/src/main/java/org/baeldung/bean/config/ConstructorBasedShipConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/bean/config/SetterBasedShipConfig.java b/spring-core-2/src/main/java/org/baeldung/bean/config/SetterBasedShipConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/bean/config/SetterBasedShipConfig.java
rename to spring-core-2/src/main/java/org/baeldung/bean/config/SetterBasedShipConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/bean/injection/Helm.java b/spring-core-2/src/main/java/org/baeldung/bean/injection/Helm.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/bean/injection/Helm.java
rename to spring-core-2/src/main/java/org/baeldung/bean/injection/Helm.java
diff --git a/spring-all/src/main/java/org/baeldung/bean/injection/Ship.java b/spring-core-2/src/main/java/org/baeldung/bean/injection/Ship.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/bean/injection/Ship.java
rename to spring-core-2/src/main/java/org/baeldung/bean/injection/Ship.java
diff --git a/spring-all/src/main/java/org/baeldung/customannotation/CustomAnnotationConfiguration.java b/spring-core-2/src/main/java/org/baeldung/customannotation/CustomAnnotationConfiguration.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/customannotation/CustomAnnotationConfiguration.java
rename to spring-core-2/src/main/java/org/baeldung/customannotation/CustomAnnotationConfiguration.java
diff --git a/spring-all/src/main/java/org/baeldung/customannotation/DataAccess.java b/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccess.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/customannotation/DataAccess.java
rename to spring-core-2/src/main/java/org/baeldung/customannotation/DataAccess.java
diff --git a/spring-all/src/main/java/org/baeldung/customannotation/DataAccessAnnotationProcessor.java b/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessAnnotationProcessor.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/customannotation/DataAccessAnnotationProcessor.java
rename to spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessAnnotationProcessor.java
diff --git a/spring-all/src/main/java/org/baeldung/customannotation/DataAccessFieldCallback.java b/spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessFieldCallback.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/customannotation/DataAccessFieldCallback.java
rename to spring-core-2/src/main/java/org/baeldung/customannotation/DataAccessFieldCallback.java
diff --git a/spring-all/src/main/java/org/baeldung/customannotation/GenericDAO.java b/spring-core-2/src/main/java/org/baeldung/customannotation/GenericDAO.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/customannotation/GenericDAO.java
rename to spring-core-2/src/main/java/org/baeldung/customannotation/GenericDAO.java
diff --git a/spring-all/src/main/java/org/baeldung/customscope/TenantBean.java b/spring-core-2/src/main/java/org/baeldung/customscope/TenantBean.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/customscope/TenantBean.java
rename to spring-core-2/src/main/java/org/baeldung/customscope/TenantBean.java
diff --git a/spring-all/src/main/java/org/baeldung/customscope/TenantBeanFactoryPostProcessor.java b/spring-core-2/src/main/java/org/baeldung/customscope/TenantBeanFactoryPostProcessor.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/customscope/TenantBeanFactoryPostProcessor.java
rename to spring-core-2/src/main/java/org/baeldung/customscope/TenantBeanFactoryPostProcessor.java
diff --git a/spring-all/src/main/java/org/baeldung/customscope/TenantBeansConfig.java b/spring-core-2/src/main/java/org/baeldung/customscope/TenantBeansConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/customscope/TenantBeansConfig.java
rename to spring-core-2/src/main/java/org/baeldung/customscope/TenantBeansConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/customscope/TenantScope.java b/spring-core-2/src/main/java/org/baeldung/customscope/TenantScope.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/customscope/TenantScope.java
rename to spring-core-2/src/main/java/org/baeldung/customscope/TenantScope.java
diff --git a/spring-all/src/main/java/org/baeldung/customscope/TenantScopeConfig.java b/spring-core-2/src/main/java/org/baeldung/customscope/TenantScopeConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/customscope/TenantScopeConfig.java
rename to spring-core-2/src/main/java/org/baeldung/customscope/TenantScopeConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/nullibility/Person.java b/spring-core-2/src/main/java/org/baeldung/nullibility/Person.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/nullibility/Person.java
rename to spring-core-2/src/main/java/org/baeldung/nullibility/Person.java
diff --git a/spring-all/src/main/java/org/baeldung/nullibility/package-info.java b/spring-core-2/src/main/java/org/baeldung/nullibility/package-info.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/nullibility/package-info.java
rename to spring-core-2/src/main/java/org/baeldung/nullibility/package-info.java
diff --git a/spring-all/src/main/java/org/baeldung/order/Average.java b/spring-core-2/src/main/java/org/baeldung/order/Average.java
similarity index 95%
rename from spring-all/src/main/java/org/baeldung/order/Average.java
rename to spring-core-2/src/main/java/org/baeldung/order/Average.java
index d1d9117fb1..3deffaf1ae 100644
--- a/spring-all/src/main/java/org/baeldung/order/Average.java
+++ b/spring-core-2/src/main/java/org/baeldung/order/Average.java
@@ -1,15 +1,15 @@
-package org.baeldung.order;
-
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-@Component
-@Order(Ordered.LOWEST_PRECEDENCE)
-public class Average implements Rating {
-
-    @Override
-    public int getRating() {
-        return 3;
-    }
-}
+package org.baeldung.order;
+
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+@Component
+@Order(Ordered.LOWEST_PRECEDENCE)
+public class Average implements Rating {
+
+    @Override
+    public int getRating() {
+        return 3;
+    }
+}
diff --git a/spring-all/src/main/java/org/baeldung/order/Excellent.java b/spring-core-2/src/main/java/org/baeldung/order/Excellent.java
similarity index 94%
rename from spring-all/src/main/java/org/baeldung/order/Excellent.java
rename to spring-core-2/src/main/java/org/baeldung/order/Excellent.java
index e5f125593f..96fea4ac9b 100644
--- a/spring-all/src/main/java/org/baeldung/order/Excellent.java
+++ b/spring-core-2/src/main/java/org/baeldung/order/Excellent.java
@@ -1,14 +1,14 @@
-package org.baeldung.order;
-
-import org.springframework.stereotype.Component;
-import org.springframework.core.annotation.Order;
-
-@Component
-@Order(1)
-public class Excellent implements Rating {
-
-    @Override
-    public int getRating() {
-        return 1;
-    }
-}
+package org.baeldung.order;
+
+import org.springframework.stereotype.Component;
+import org.springframework.core.annotation.Order;
+
+@Component
+@Order(1)
+public class Excellent implements Rating {
+
+    @Override
+    public int getRating() {
+        return 1;
+    }
+}
diff --git a/spring-all/src/main/java/org/baeldung/order/Good.java b/spring-core-2/src/main/java/org/baeldung/order/Good.java
similarity index 94%
rename from spring-all/src/main/java/org/baeldung/order/Good.java
rename to spring-core-2/src/main/java/org/baeldung/order/Good.java
index 3dd9852cc4..4b3e268504 100644
--- a/spring-all/src/main/java/org/baeldung/order/Good.java
+++ b/spring-core-2/src/main/java/org/baeldung/order/Good.java
@@ -1,14 +1,14 @@
-package org.baeldung.order;
-
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-@Component
-@Order(2)
-public class Good implements Rating {
-
-    @Override
-    public int getRating() {
-        return 2;
-    }
-}
+package org.baeldung.order;
+
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+@Component
+@Order(2)
+public class Good implements Rating {
+
+    @Override
+    public int getRating() {
+        return 2;
+    }
+}
diff --git a/spring-all/src/main/java/org/baeldung/order/Rating.java b/spring-core-2/src/main/java/org/baeldung/order/Rating.java
similarity index 93%
rename from spring-all/src/main/java/org/baeldung/order/Rating.java
rename to spring-core-2/src/main/java/org/baeldung/order/Rating.java
index dd0391a3d9..10f2780522 100644
--- a/spring-all/src/main/java/org/baeldung/order/Rating.java
+++ b/spring-core-2/src/main/java/org/baeldung/order/Rating.java
@@ -1,6 +1,6 @@
-package org.baeldung.order;
-
-public interface Rating {
-    
-    int getRating();
-}
+package org.baeldung.order;
+
+public interface Rating {
+    
+    int getRating();
+}
diff --git a/spring-all/src/main/java/org/baeldung/persistence/Setup.java b/spring-core-2/src/main/java/org/baeldung/persistence/Setup.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/persistence/Setup.java
rename to spring-core-2/src/main/java/org/baeldung/persistence/Setup.java
diff --git a/spring-all/src/main/java/org/baeldung/primary/Config.java b/spring-core-2/src/main/java/org/baeldung/primary/Config.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/primary/Config.java
rename to spring-core-2/src/main/java/org/baeldung/primary/Config.java
diff --git a/spring-all/src/main/java/org/baeldung/primary/DepartmentManager.java b/spring-core-2/src/main/java/org/baeldung/primary/DepartmentManager.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/primary/DepartmentManager.java
rename to spring-core-2/src/main/java/org/baeldung/primary/DepartmentManager.java
diff --git a/spring-all/src/main/java/org/baeldung/primary/Employee.java b/spring-core-2/src/main/java/org/baeldung/primary/Employee.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/primary/Employee.java
rename to spring-core-2/src/main/java/org/baeldung/primary/Employee.java
diff --git a/spring-all/src/main/java/org/baeldung/primary/GeneralManager.java b/spring-core-2/src/main/java/org/baeldung/primary/GeneralManager.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/primary/GeneralManager.java
rename to spring-core-2/src/main/java/org/baeldung/primary/GeneralManager.java
diff --git a/spring-all/src/main/java/org/baeldung/primary/Manager.java b/spring-core-2/src/main/java/org/baeldung/primary/Manager.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/primary/Manager.java
rename to spring-core-2/src/main/java/org/baeldung/primary/Manager.java
diff --git a/spring-all/src/main/java/org/baeldung/primary/ManagerService.java b/spring-core-2/src/main/java/org/baeldung/primary/ManagerService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/primary/ManagerService.java
rename to spring-core-2/src/main/java/org/baeldung/primary/ManagerService.java
diff --git a/spring-all/src/main/java/org/baeldung/primary/PrimaryApplication.java b/spring-core-2/src/main/java/org/baeldung/primary/PrimaryApplication.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/primary/PrimaryApplication.java
rename to spring-core-2/src/main/java/org/baeldung/primary/PrimaryApplication.java
diff --git a/spring-all/src/main/java/org/baeldung/profiles/DatasourceConfig.java b/spring-core-2/src/main/java/org/baeldung/profiles/DatasourceConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/profiles/DatasourceConfig.java
rename to spring-core-2/src/main/java/org/baeldung/profiles/DatasourceConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/profiles/DevDatasourceConfig.java b/spring-core-2/src/main/java/org/baeldung/profiles/DevDatasourceConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/profiles/DevDatasourceConfig.java
rename to spring-core-2/src/main/java/org/baeldung/profiles/DevDatasourceConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/profiles/ProductionDatasourceConfig.java b/spring-core-2/src/main/java/org/baeldung/profiles/ProductionDatasourceConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/profiles/ProductionDatasourceConfig.java
rename to spring-core-2/src/main/java/org/baeldung/profiles/ProductionDatasourceConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/profiles/ProfileManager.java b/spring-core-2/src/main/java/org/baeldung/profiles/ProfileManager.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/profiles/ProfileManager.java
rename to spring-core-2/src/main/java/org/baeldung/profiles/ProfileManager.java
diff --git a/spring-all/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java b/spring-core-2/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java
rename to spring-core-2/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/sample/Bar.java b/spring-core-2/src/main/java/org/baeldung/sample/Bar.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/sample/Bar.java
rename to spring-core-2/src/main/java/org/baeldung/sample/Bar.java
diff --git a/spring-all/src/main/java/org/baeldung/sample/Foo.java b/spring-core-2/src/main/java/org/baeldung/sample/Foo.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/sample/Foo.java
rename to spring-core-2/src/main/java/org/baeldung/sample/Foo.java
diff --git a/spring-all/src/main/java/org/baeldung/sampleabstract/BallService.java b/spring-core-2/src/main/java/org/baeldung/sampleabstract/BallService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/sampleabstract/BallService.java
rename to spring-core-2/src/main/java/org/baeldung/sampleabstract/BallService.java
diff --git a/spring-all/src/main/java/org/baeldung/sampleabstract/BasketballService.java b/spring-core-2/src/main/java/org/baeldung/sampleabstract/BasketballService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/sampleabstract/BasketballService.java
rename to spring-core-2/src/main/java/org/baeldung/sampleabstract/BasketballService.java
diff --git a/spring-all/src/main/java/org/baeldung/sampleabstract/DemoApp.java b/spring-core-2/src/main/java/org/baeldung/sampleabstract/DemoApp.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/sampleabstract/DemoApp.java
rename to spring-core-2/src/main/java/org/baeldung/sampleabstract/DemoApp.java
diff --git a/spring-all/src/main/java/org/baeldung/sampleabstract/LogRepository.java b/spring-core-2/src/main/java/org/baeldung/sampleabstract/LogRepository.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/sampleabstract/LogRepository.java
rename to spring-core-2/src/main/java/org/baeldung/sampleabstract/LogRepository.java
diff --git a/spring-all/src/main/java/org/baeldung/sampleabstract/RuleRepository.java b/spring-core-2/src/main/java/org/baeldung/sampleabstract/RuleRepository.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/sampleabstract/RuleRepository.java
rename to spring-core-2/src/main/java/org/baeldung/sampleabstract/RuleRepository.java
diff --git a/spring-all/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java b/spring-core-2/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java
rename to spring-core-2/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java
diff --git a/spring-all/src/main/java/org/baeldung/scopes/Person.java b/spring-core-2/src/main/java/org/baeldung/scopes/Person.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/scopes/Person.java
rename to spring-core-2/src/main/java/org/baeldung/scopes/Person.java
diff --git a/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java b/spring-core-2/src/main/java/org/baeldung/scopes/ScopesController.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
rename to spring-core-2/src/main/java/org/baeldung/scopes/ScopesController.java
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/CleanupBean.java b/spring-core-2/src/main/java/org/baeldung/spring/config/CleanupBean.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring/config/CleanupBean.java
rename to spring-core-2/src/main/java/org/baeldung/spring/config/CleanupBean.java
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/CoreConfig.java b/spring-core-2/src/main/java/org/baeldung/spring/config/CoreConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring/config/CoreConfig.java
rename to spring-core-2/src/main/java/org/baeldung/spring/config/CoreConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java b/spring-core-2/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java
rename to spring-core-2/src/main/java/org/baeldung/spring/config/MainWebAppInitializer.java
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/MvcConfig.java b/spring-core-2/src/main/java/org/baeldung/spring/config/MvcConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring/config/MvcConfig.java
rename to spring-core-2/src/main/java/org/baeldung/spring/config/MvcConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/PersistenceConfig.java b/spring-core-2/src/main/java/org/baeldung/spring/config/PersistenceConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring/config/PersistenceConfig.java
rename to spring-core-2/src/main/java/org/baeldung/spring/config/PersistenceConfig.java
diff --git a/spring-core-2/src/main/java/org/baeldung/spring/config/ScopesConfig.java b/spring-core-2/src/main/java/org/baeldung/spring/config/ScopesConfig.java
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spring-all/src/main/java/org/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java b/spring-core-2/src/main/java/org/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java
rename to spring-core-2/src/main/java/org/baeldung/springevents/asynchronous/AsynchronousSpringEventsConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java b/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java
rename to spring-core-2/src/main/java/org/baeldung/springevents/synchronous/AnnotationDrivenEventListener.java
diff --git a/spring-all/src/main/java/org/baeldung/springevents/synchronous/ContextRefreshedListener.java b/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/ContextRefreshedListener.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springevents/synchronous/ContextRefreshedListener.java
rename to spring-core-2/src/main/java/org/baeldung/springevents/synchronous/ContextRefreshedListener.java
diff --git a/spring-all/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEvent.java b/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEvent.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEvent.java
rename to spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEvent.java
diff --git a/spring-all/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventListener.java b/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventListener.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventListener.java
rename to spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventListener.java
diff --git a/spring-all/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventPublisher.java b/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventPublisher.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventPublisher.java
rename to spring-core-2/src/main/java/org/baeldung/springevents/synchronous/CustomSpringEventPublisher.java
diff --git a/spring-all/src/main/java/org/baeldung/springevents/synchronous/GenericSpringAppEvent.java b/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringAppEvent.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springevents/synchronous/GenericSpringAppEvent.java
rename to spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringAppEvent.java
diff --git a/spring-all/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEvent.java b/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEvent.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEvent.java
rename to spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEvent.java
diff --git a/spring-all/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEventListener.java b/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEventListener.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEventListener.java
rename to spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericSpringEventListener.java
diff --git a/spring-all/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java b/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java
rename to spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringAppEvent.java
diff --git a/spring-all/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringEvent.java b/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringEvent.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringEvent.java
rename to spring-core-2/src/main/java/org/baeldung/springevents/synchronous/GenericStringSpringEvent.java
diff --git a/spring-all/src/main/java/org/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java b/spring-core-2/src/main/java/org/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java
rename to spring-core-2/src/main/java/org/baeldung/springevents/synchronous/SynchronousSpringEventsConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java b/spring-core-2/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java
rename to spring-core-2/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java
diff --git a/spring-all/src/main/java/org/baeldung/startup/EventListenerExampleBean.java b/spring-core-2/src/main/java/org/baeldung/startup/EventListenerExampleBean.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/startup/EventListenerExampleBean.java
rename to spring-core-2/src/main/java/org/baeldung/startup/EventListenerExampleBean.java
diff --git a/spring-all/src/main/java/org/baeldung/startup/InitMethodExampleBean.java b/spring-core-2/src/main/java/org/baeldung/startup/InitMethodExampleBean.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/startup/InitMethodExampleBean.java
rename to spring-core-2/src/main/java/org/baeldung/startup/InitMethodExampleBean.java
diff --git a/spring-all/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java b/spring-core-2/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java
rename to spring-core-2/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java
diff --git a/spring-all/src/main/java/org/baeldung/startup/InvalidInitExampleBean.java b/spring-core-2/src/main/java/org/baeldung/startup/InvalidInitExampleBean.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/startup/InvalidInitExampleBean.java
rename to spring-core-2/src/main/java/org/baeldung/startup/InvalidInitExampleBean.java
diff --git a/spring-all/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java b/spring-core-2/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java
rename to spring-core-2/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java
diff --git a/spring-all/src/main/java/org/baeldung/startup/PostConstructExampleBean.java b/spring-core-2/src/main/java/org/baeldung/startup/PostConstructExampleBean.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/startup/PostConstructExampleBean.java
rename to spring-core-2/src/main/java/org/baeldung/startup/PostConstructExampleBean.java
diff --git a/spring-all/src/main/java/org/baeldung/startup/SpringStartupConfig.java b/spring-core-2/src/main/java/org/baeldung/startup/SpringStartupConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/startup/SpringStartupConfig.java
rename to spring-core-2/src/main/java/org/baeldung/startup/SpringStartupConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java b/spring-core-2/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java
rename to spring-core-2/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java
diff --git a/spring-all/src/main/resources/application.properties b/spring-core-2/src/main/resources/application.properties
similarity index 100%
rename from spring-all/src/main/resources/application.properties
rename to spring-core-2/src/main/resources/application.properties
diff --git a/spring-core-2/src/main/resources/beanInjection-constructor.xml b/spring-core-2/src/main/resources/beanInjection-constructor.xml
new file mode 100644
index 0000000000..5a2ffe767c
--- /dev/null
+++ b/spring-core-2/src/main/resources/beanInjection-constructor.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+	   					   http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="ship" class="org.baeldung.bean.injection.Ship">
+        <constructor-arg>
+            <ref bean="helm"/>
+        </constructor-arg>
+    </bean>
+
+    <bean id="helm" class="org.baeldung.bean.injection.Helm"/>
+
+</beans>
\ No newline at end of file
diff --git a/spring-core-2/src/main/resources/beanInjection-setter.xml b/spring-core-2/src/main/resources/beanInjection-setter.xml
new file mode 100644
index 0000000000..0e82e3be1c
--- /dev/null
+++ b/spring-core-2/src/main/resources/beanInjection-setter.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+	   					   http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="ship" class="org.baeldung.bean.injection.Ship">
+        <property name="helm">
+            <ref bean="helm"/>
+        </property>
+    </bean>
+
+    <bean id="helm" class="org.baeldung.bean.injection.Helm"/>
+</beans>
\ No newline at end of file
diff --git a/spring-all/src/main/resources/jdbc/schema.sql b/spring-core-2/src/main/resources/jdbc/schema.sql
similarity index 100%
rename from spring-all/src/main/resources/jdbc/schema.sql
rename to spring-core-2/src/main/resources/jdbc/schema.sql
diff --git a/spring-all/src/main/resources/jdbc/springJdbc-config.xml b/spring-core-2/src/main/resources/jdbc/springJdbc-config.xml
similarity index 100%
rename from spring-all/src/main/resources/jdbc/springJdbc-config.xml
rename to spring-core-2/src/main/resources/jdbc/springJdbc-config.xml
diff --git a/spring-all/src/main/resources/jdbc/test-data.sql b/spring-core-2/src/main/resources/jdbc/test-data.sql
similarity index 100%
rename from spring-all/src/main/resources/jdbc/test-data.sql
rename to spring-core-2/src/main/resources/jdbc/test-data.sql
diff --git a/spring-all/src/main/resources/log4j2.properties b/spring-core-2/src/main/resources/log4j2.properties
similarity index 100%
rename from spring-all/src/main/resources/log4j2.properties
rename to spring-core-2/src/main/resources/log4j2.properties
diff --git a/spring-all/src/main/resources/logback.xml b/spring-core-2/src/main/resources/logback.xml
similarity index 74%
rename from spring-all/src/main/resources/logback.xml
rename to spring-core-2/src/main/resources/logback.xml
index 56af2d397e..7bd5154680 100644
--- a/spring-all/src/main/resources/logback.xml
+++ b/spring-core-2/src/main/resources/logback.xml
@@ -7,13 +7,13 @@
         </encoder>
     </appender>
 
-    <logger name="org.springframework" level="WARN" />
-    <logger name="org.springframework.transaction" level="WARN" />
+    <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" />
+    <logger name="org.springframework.web.servlet.mvc" level="WARN"/>
 
     <root level="INFO">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="STDOUT"/>
     </root>
 </configuration>
\ No newline at end of file
diff --git a/spring-all/src/main/resources/scopes.xml b/spring-core-2/src/main/resources/scopes.xml
similarity index 58%
rename from spring-all/src/main/resources/scopes.xml
rename to spring-core-2/src/main/resources/scopes.xml
index faecd727fa..8fdb186c28 100644
--- a/spring-all/src/main/resources/scopes.xml
+++ b/spring-core-2/src/main/resources/scopes.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean id="personSingleton" class="org.baeldung.scopes.Person" scope="singleton"/>
-    
+
     <bean id="personPrototype" class="org.baeldung.scopes.Person" scope="prototype"/>
-    
+
 </beans>
diff --git a/spring-all/src/main/resources/springProfiles-config.xml b/spring-core-2/src/main/resources/springProfiles-config.xml
similarity index 66%
rename from spring-all/src/main/resources/springProfiles-config.xml
rename to spring-core-2/src/main/resources/springProfiles-config.xml
index 5f71c02e20..985ab6ba86 100644
--- a/spring-all/src/main/resources/springProfiles-config.xml
+++ b/spring-core-2/src/main/resources/springProfiles-config.xml
@@ -1,6 +1,7 @@
 <?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"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+<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"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
 >
 
diff --git a/spring-all/src/main/resources/startupConfig.xml b/spring-core-2/src/main/resources/startupConfig.xml
similarity index 100%
rename from spring-all/src/main/resources/startupConfig.xml
rename to spring-core-2/src/main/resources/startupConfig.xml
diff --git a/spring-all/src/test/java/org/baeldung/autowire/sample/FooServiceIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/autowire/sample/FooServiceIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/autowire/sample/FooServiceIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/autowire/sample/FooServiceIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/customannotation/Account.java b/spring-core-2/src/test/java/org/baeldung/customannotation/Account.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/customannotation/Account.java
rename to spring-core-2/src/test/java/org/baeldung/customannotation/Account.java
diff --git a/spring-all/src/test/java/org/baeldung/customannotation/BeanWithGenericDAO.java b/spring-core-2/src/test/java/org/baeldung/customannotation/BeanWithGenericDAO.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/customannotation/BeanWithGenericDAO.java
rename to spring-core-2/src/test/java/org/baeldung/customannotation/BeanWithGenericDAO.java
diff --git a/spring-all/src/test/java/org/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/customannotation/Person.java b/spring-core-2/src/test/java/org/baeldung/customannotation/Person.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/customannotation/Person.java
rename to spring-core-2/src/test/java/org/baeldung/customannotation/Person.java
diff --git a/spring-all/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/order/RatingRetrieverUnitTest.java b/spring-core-2/src/test/java/org/baeldung/order/RatingRetrieverUnitTest.java
similarity index 97%
rename from spring-all/src/test/java/org/baeldung/order/RatingRetrieverUnitTest.java
rename to spring-core-2/src/test/java/org/baeldung/order/RatingRetrieverUnitTest.java
index a624f757fc..96993ccd7c 100644
--- a/spring-all/src/test/java/org/baeldung/order/RatingRetrieverUnitTest.java
+++ b/spring-core-2/src/test/java/org/baeldung/order/RatingRetrieverUnitTest.java
@@ -1,37 +1,37 @@
-package org.baeldung.order;
-
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
-public class RatingRetrieverUnitTest {
-    
-    @Configuration 
-    @ComponentScan(basePackages = {"org.baeldung.order"}) 
-    static class ContextConfiguration {} 
-    
-    @Autowired
-    private List<Rating> ratings;
-    
-    @Test
-    public void givenOrderOnComponents_whenInjected_thenAutowireByOrderValue() {
-        assertThat(ratings.get(0).getRating(), is(equalTo(1)));
-        assertThat(ratings.get(1).getRating(), is(equalTo(2)));
-        assertThat(ratings.get(2).getRating(), is(equalTo(3)));
-    }
-
-}
+package org.baeldung.order;
+
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
+public class RatingRetrieverUnitTest {
+    
+    @Configuration 
+    @ComponentScan(basePackages = {"org.baeldung.order"}) 
+    static class ContextConfiguration {} 
+    
+    @Autowired
+    private List<Rating> ratings;
+    
+    @Test
+    public void givenOrderOnComponents_whenInjected_thenAutowireByOrderValue() {
+        assertThat(ratings.get(0).getRating(), is(equalTo(1)));
+        assertThat(ratings.get(1).getRating(), is(equalTo(2)));
+        assertThat(ratings.get(2).getRating(), is(equalTo(3)));
+    }
+
+}
diff --git a/spring-all/src/test/java/org/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/springevents/asynchronous/AsynchronousCustomSpringEventsIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/springevents/synchronous/ContextRefreshedListenerIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/springevents/synchronous/GenericAppEventListenerIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/springevents/synchronous/SynchronousCustomSpringEventsIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/startup/SpringStartupIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/startup/SpringStartupIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/startup/SpringStartupIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/startup/SpringStartupIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java b/spring-core-2/src/test/java/org/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java
rename to spring-core-2/src/test/java/org/baeldung/startup/SpringStartupXMLConfigIntegrationTest.java
diff --git a/guava-collections/src/test/resources/.gitignore b/spring-core-2/src/test/resources/.gitignore
similarity index 100%
rename from guava-collections/src/test/resources/.gitignore
rename to spring-core-2/src/test/resources/.gitignore
diff --git a/spring-core-3/README.md b/spring-core-3/README.md
new file mode 100644
index 0000000000..7ca95ae78e
--- /dev/null
+++ b/spring-core-3/README.md
@@ -0,0 +1,7 @@
+## Relevant Articles:
+
+- [Understanding getBean() in Spring](https://www.baeldung.com/spring-getbean)
+- [Exploring the Spring BeanFactory API](https://www.baeldung.com/spring-beanfactory)
+- [How to use the Spring FactoryBean?](https://www.baeldung.com/spring-factorybean)
+- [Spring – Injecting Collections](https://www.baeldung.com/spring-injecting-collections)
+- More articles: [[<-- prev]](/spring-core-2)
\ No newline at end of file
diff --git a/spring-core-3/pom.xml b/spring-core-3/pom.xml
new file mode 100644
index 0000000000..cd82f23320
--- /dev/null
+++ b/spring-core-3/pom.xml
@@ -0,0 +1,72 @@
+<?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-core-3</artifactId>
+    <name>spring-core-3</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-spring-5</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-spring-5</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven.surefire.version}</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <maven.surefire.version>2.22.1</maven.surefire.version>
+        <annotation-api.version>1.3.2</annotation-api.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-core-2/src/main/java/com/baeldung/beanfactory/Employee.java b/spring-core-3/src/main/java/com/baeldung/beanfactory/Employee.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/beanfactory/Employee.java
rename to spring-core-3/src/main/java/com/baeldung/beanfactory/Employee.java
diff --git a/spring-core-2/src/main/java/com/baeldung/collection/BaeldungBean.java b/spring-core-3/src/main/java/com/baeldung/collection/BaeldungBean.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/collection/BaeldungBean.java
rename to spring-core-3/src/main/java/com/baeldung/collection/BaeldungBean.java
diff --git a/spring-core-2/src/main/java/com/baeldung/collection/CollectionConfig.java b/spring-core-3/src/main/java/com/baeldung/collection/CollectionConfig.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/collection/CollectionConfig.java
rename to spring-core-3/src/main/java/com/baeldung/collection/CollectionConfig.java
diff --git a/spring-core-2/src/main/java/com/baeldung/collection/CollectionInjectionDemo.java b/spring-core-3/src/main/java/com/baeldung/collection/CollectionInjectionDemo.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/collection/CollectionInjectionDemo.java
rename to spring-core-3/src/main/java/com/baeldung/collection/CollectionInjectionDemo.java
diff --git a/spring-core-2/src/main/java/com/baeldung/collection/CollectionsBean.java b/spring-core-3/src/main/java/com/baeldung/collection/CollectionsBean.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/collection/CollectionsBean.java
rename to spring-core-3/src/main/java/com/baeldung/collection/CollectionsBean.java
diff --git a/spring-core-2/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java b/spring-core-3/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java
rename to spring-core-3/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java
diff --git a/spring-core-2/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java b/spring-core-3/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java
rename to spring-core-3/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java
diff --git a/spring-core-2/src/main/java/com/baeldung/factorybean/README.md b/spring-core-3/src/main/java/com/baeldung/factorybean/README.md
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/factorybean/README.md
rename to spring-core-3/src/main/java/com/baeldung/factorybean/README.md
diff --git a/spring-core-2/src/main/java/com/baeldung/factorybean/SingleToolFactory.java b/spring-core-3/src/main/java/com/baeldung/factorybean/SingleToolFactory.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/factorybean/SingleToolFactory.java
rename to spring-core-3/src/main/java/com/baeldung/factorybean/SingleToolFactory.java
diff --git a/spring-core-2/src/main/java/com/baeldung/factorybean/Tool.java b/spring-core-3/src/main/java/com/baeldung/factorybean/Tool.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/factorybean/Tool.java
rename to spring-core-3/src/main/java/com/baeldung/factorybean/Tool.java
diff --git a/spring-core-2/src/main/java/com/baeldung/factorybean/ToolFactory.java b/spring-core-3/src/main/java/com/baeldung/factorybean/ToolFactory.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/factorybean/ToolFactory.java
rename to spring-core-3/src/main/java/com/baeldung/factorybean/ToolFactory.java
diff --git a/spring-core-2/src/main/java/com/baeldung/getbean/AnnotationConfig.java b/spring-core-3/src/main/java/com/baeldung/getbean/AnnotationConfig.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/getbean/AnnotationConfig.java
rename to spring-core-3/src/main/java/com/baeldung/getbean/AnnotationConfig.java
diff --git a/spring-core-2/src/main/java/com/baeldung/getbean/Lion.java b/spring-core-3/src/main/java/com/baeldung/getbean/Lion.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/getbean/Lion.java
rename to spring-core-3/src/main/java/com/baeldung/getbean/Lion.java
diff --git a/spring-core-2/src/main/java/com/baeldung/getbean/Tiger.java b/spring-core-3/src/main/java/com/baeldung/getbean/Tiger.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/getbean/Tiger.java
rename to spring-core-3/src/main/java/com/baeldung/getbean/Tiger.java
diff --git a/spring-core-2/src/main/resources/factorybean-abstract-spring-ctx.xml b/spring-core-3/src/main/resources/factorybean-abstract-spring-ctx.xml
similarity index 100%
rename from spring-core-2/src/main/resources/factorybean-abstract-spring-ctx.xml
rename to spring-core-3/src/main/resources/factorybean-abstract-spring-ctx.xml
diff --git a/spring-core-2/src/main/resources/factorybean-spring-ctx.xml b/spring-core-3/src/main/resources/factorybean-spring-ctx.xml
similarity index 100%
rename from spring-core-2/src/main/resources/factorybean-spring-ctx.xml
rename to spring-core-3/src/main/resources/factorybean-spring-ctx.xml
diff --git a/spring-core-2/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceIntegrationTest.java b/spring-core-3/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceIntegrationTest.java
rename to spring-core-3/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceIntegrationTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/beanfactory/README.md b/spring-core-3/src/test/java/com/baeldung/beanfactory/README.md
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/beanfactory/README.md
rename to spring-core-3/src/test/java/com/baeldung/beanfactory/README.md
diff --git a/spring-core-2/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanIntegrationTest.java b/spring-core-3/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanIntegrationTest.java
rename to spring-core-3/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanIntegrationTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigIntegrationTest.java b/spring-core-3/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigIntegrationTest.java
rename to spring-core-3/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigIntegrationTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigIntegrationTest.java b/spring-core-3/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigIntegrationTest.java
rename to spring-core-3/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigIntegrationTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameAndTypeUnitTest.java b/spring-core-3/src/test/java/com/baeldung/getbean/GetBeanByNameAndTypeUnitTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameAndTypeUnitTest.java
rename to spring-core-3/src/test/java/com/baeldung/getbean/GetBeanByNameAndTypeUnitTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameUnitTest.java b/spring-core-3/src/test/java/com/baeldung/getbean/GetBeanByNameUnitTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameUnitTest.java
rename to spring-core-3/src/test/java/com/baeldung/getbean/GetBeanByNameUnitTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameWithConstructorParametersUnitTest.java b/spring-core-3/src/test/java/com/baeldung/getbean/GetBeanByNameWithConstructorParametersUnitTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameWithConstructorParametersUnitTest.java
rename to spring-core-3/src/test/java/com/baeldung/getbean/GetBeanByNameWithConstructorParametersUnitTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByTypeUnitTest.java b/spring-core-3/src/test/java/com/baeldung/getbean/GetBeanByTypeUnitTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByTypeUnitTest.java
rename to spring-core-3/src/test/java/com/baeldung/getbean/GetBeanByTypeUnitTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByTypeWithConstructorParametersUnitTest.java b/spring-core-3/src/test/java/com/baeldung/getbean/GetBeanByTypeWithConstructorParametersUnitTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByTypeWithConstructorParametersUnitTest.java
rename to spring-core-3/src/test/java/com/baeldung/getbean/GetBeanByTypeWithConstructorParametersUnitTest.java
diff --git a/spring-core-2/src/test/resources/beanfactory-example.xml b/spring-core-3/src/test/resources/beanfactory-example.xml
similarity index 100%
rename from spring-core-2/src/test/resources/beanfactory-example.xml
rename to spring-core-3/src/test/resources/beanfactory-example.xml
diff --git a/spring-ejb/spring-ejb-remote/pom.xml b/spring-ejb/spring-ejb-remote/pom.xml
index 4a365180f2..633e0387b0 100644
--- a/spring-ejb/spring-ejb-remote/pom.xml
+++ b/spring-ejb/spring-ejb-remote/pom.xml
@@ -27,7 +27,6 @@
         </dependency>
     </dependencies>
 
-
     <profiles>
         <!-- mvn clean package cargo:run -Pwildfly-standalone -->
         <profile>
diff --git a/spring-freemarker/README.md b/spring-freemarker/README.md
index 410781f2ca..d9dfe16fbe 100644
--- a/spring-freemarker/README.md
+++ b/spring-freemarker/README.md
@@ -4,3 +4,5 @@ This module contains articles about Spring with FreeMarker
 
 ### Relevant Articles:
 - [Introduction to Using FreeMarker in Spring MVC](https://www.baeldung.com/freemarker-in-spring-mvc-tutorial)
+- [FreeMarker Common Operations](https://www.baeldung.com/freemarker-operations)
+
diff --git a/spring-integration/pom.xml b/spring-integration/pom.xml
index 367d25de98..f06cb91ef6 100644
--- a/spring-integration/pom.xml
+++ b/spring-integration/pom.xml
@@ -68,6 +68,11 @@
             <artifactId>spring-integration-security</artifactId>
             <version>${spring.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-jdbc</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.security</groupId>
@@ -75,6 +80,12 @@
             <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.197</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -106,7 +117,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.version>5.0.3.RELEASE</spring.version>
+        <spring.version>5.0.13.RELEASE</spring.version>
         <spring-social.version>1.1.4.RELEASE</spring-social.version>
         <javax-mail.version>1.4.7</javax-mail.version>
         <javax-activation.version>1.1.1</javax-activation.version>
diff --git a/spring-integration/src/main/java/com/baeldung/dsl/JavaDSLFileCopyConfig.java b/spring-integration/src/main/java/com/baeldung/dsl/JavaDSLFileCopyConfig.java
index 7e91345f04..e79eec3e83 100644
--- a/spring-integration/src/main/java/com/baeldung/dsl/JavaDSLFileCopyConfig.java
+++ b/spring-integration/src/main/java/com/baeldung/dsl/JavaDSLFileCopyConfig.java
@@ -16,8 +16,10 @@ import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.dsl.IntegrationFlow;
 import org.springframework.integration.dsl.IntegrationFlows;
 import org.springframework.integration.dsl.Pollers;
+import org.springframework.integration.dsl.channel.MessageChannels;
 import org.springframework.integration.file.FileReadingMessageSource;
 import org.springframework.integration.file.FileWritingMessageHandler;
+import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
 
 /**
@@ -104,9 +106,14 @@ public class JavaDSLFileCopyConfig {
         return handler;
     }
 
+    @Bean
+    public MessageChannel holdingTank() {
+        return MessageChannels.queue().get();
+    }
+    
     // @Bean
     public IntegrationFlow fileReader() {
-        return IntegrationFlows.from(sourceDirectory())
+        return IntegrationFlows.from(sourceDirectory(), configurer -> configurer.poller(Pollers.fixedDelay(10)))
             .filter(onlyJpgs())
             .channel("holdingTank")
             .get();
diff --git a/spring-integration/src/main/java/com/baeldung/tx/ServiceActivator.java b/spring-integration/src/main/java/com/baeldung/tx/ServiceActivator.java
new file mode 100755
index 0000000000..56399c653f
--- /dev/null
+++ b/spring-integration/src/main/java/com/baeldung/tx/ServiceActivator.java
@@ -0,0 +1,27 @@
+package com.baeldung.tx;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+public class ServiceActivator {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    public void checkTestResults(String payload) {
+
+        this.jdbcTemplate.update("insert into STUDENT values(?)", payload);
+
+        if (payload.toLowerCase().startsWith("fail")) {
+            log.error("Service failure. Test result: {}", payload);
+            throw new RuntimeException("Service failure.");
+        }
+
+        log.info("Service success. Test result: {}", payload);
+    }
+
+}
diff --git a/spring-integration/src/main/java/com/baeldung/tx/TxIntegrationConfig.java b/spring-integration/src/main/java/com/baeldung/tx/TxIntegrationConfig.java
new file mode 100644
index 0000000000..7a58cb3125
--- /dev/null
+++ b/spring-integration/src/main/java/com/baeldung/tx/TxIntegrationConfig.java
@@ -0,0 +1,155 @@
+package com.baeldung.tx;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.integration.annotation.InboundChannelAdapter;
+import org.springframework.integration.annotation.Poller;
+import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.integration.annotation.Transformer;
+import org.springframework.integration.channel.DirectChannel;
+import org.springframework.integration.config.EnableIntegration;
+import org.springframework.integration.core.MessageSource;
+import org.springframework.integration.dsl.Pollers;
+import org.springframework.integration.file.FileReadingMessageSource;
+import org.springframework.integration.file.filters.SimplePatternFileListFilter;
+import org.springframework.integration.file.transformer.FileToStringTransformer;
+import org.springframework.integration.scheduling.PollerMetadata;
+import org.springframework.integration.transaction.*;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.transaction.interceptor.TransactionInterceptor;
+
+import javax.sql.DataSource;
+import java.io.File;
+import java.util.Scanner;
+
+@Configuration
+@EnableIntegration
+public class TxIntegrationConfig {
+
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    public final String INPUT_DIR = System.getProperty("java.io.tmpdir") + "/tx/";
+    public final String FILE_PATTERN = "*.txt";
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Autowired
+    private TransactionSynchronizationFactory transactionSynchronizationFactory;
+
+    @Autowired
+    DataSourceTransactionManager txManager;
+
+    @Bean
+    public MessageChannel inputChannel() {
+        return new DirectChannel();
+    }
+
+    @Bean
+    @InboundChannelAdapter(value = "inputChannel", poller = @Poller(value = "pollerMetadata"))
+    public MessageSource<File> fileReadingMessageSource() {
+        FileReadingMessageSource sourceReader = new FileReadingMessageSource();
+        sourceReader.setDirectory(new File(INPUT_DIR));
+        sourceReader.setFilter(new SimplePatternFileListFilter(FILE_PATTERN));
+        return sourceReader;
+    }
+
+    @Bean
+    public PollerMetadata pollerMetadata() {
+        return Pollers.fixedDelay(5000)
+                 .advice(transactionInterceptor())
+                 .transactionSynchronizationFactory(transactionSynchronizationFactory)
+                 .get();
+    }
+
+    private TransactionInterceptor transactionInterceptor() {
+        return new TransactionInterceptorBuilder().transactionManager(txManager).build();
+    }
+
+    @Bean
+    public TransactionSynchronizationFactory transactionSynchronizationFactory() {
+        ExpressionEvaluatingTransactionSynchronizationProcessor processor =
+            new ExpressionEvaluatingTransactionSynchronizationProcessor();
+
+        SpelExpressionParser spelParser = new SpelExpressionParser();
+        processor.setAfterCommitExpression(
+            spelParser.parseExpression(
+                "payload.renameTo(new java.io.File(payload.absolutePath + '.PASSED'))"));
+        processor.setAfterRollbackExpression(
+            spelParser.parseExpression(
+                "payload.renameTo(new java.io.File(payload.absolutePath + '.FAILED'))"));
+
+        return new DefaultTransactionSynchronizationFactory(processor);
+        }
+
+    @Bean
+    @Transformer(inputChannel = "inputChannel", outputChannel = "toServiceChannel")
+    public FileToStringTransformer fileToStringTransformer() {
+        return new FileToStringTransformer();
+    }
+
+    @ServiceActivator(inputChannel = "toServiceChannel")
+    public void serviceActivator(String payload) {
+
+        jdbcTemplate.update("insert into STUDENT values(?)", payload);
+
+        if (payload.toLowerCase().startsWith("fail")) {
+            log.error("Service failure. Test result: {} ", payload);
+            throw new RuntimeException("Service failure.");
+        }
+
+        log.info("Service success. Test result: {}", payload);
+    }
+
+    @Bean
+    public JdbcTemplate jdbcTemplate(DataSource dataSource) {
+        return new JdbcTemplate(dataSource);
+    }
+
+    @Bean
+    public DataSource dataSource() {
+        return new EmbeddedDatabaseBuilder()
+                .setType(EmbeddedDatabaseType.H2)
+                .addScript("classpath:table.sql")
+                .build();
+    }
+
+    @Bean
+    public DataSourceTransactionManager txManager() {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    public static void main(final String... args) {
+        final AbstractApplicationContext context = new AnnotationConfigApplicationContext(TxIntegrationConfig.class);
+        context.registerShutdownHook();
+
+        final Scanner scanner = new Scanner(System.in);
+        System.out.print("Integration flow is running. Type q + <enter> to quit ");
+        while (true) {
+            final String input = scanner.nextLine();
+            if ("q".equals(input.trim())) {
+                context.close();
+                scanner.close();
+                break;
+            }
+        }
+        System.exit(0);
+    }
+
+}
+    
+
+
diff --git a/spring-integration/src/main/resources/META-INF/spring/integration/spring-integration-tx-context.xml b/spring-integration/src/main/resources/META-INF/spring/integration/spring-integration-tx-context.xml
new file mode 100755
index 0000000000..2861826521
--- /dev/null
+++ b/spring-integration/src/main/resources/META-INF/spring/integration/spring-integration-tx-context.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://www.springframework.org/schema/beans"
+       xmlns:int="http://www.springframework.org/schema/integration"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:int-file="http://www.springframework.org/schema/integration/file"
+       xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+       xmlns:int-jdbc="http://www.springframework.org/schema/integration/jdbc"
+       xsi:schemaLocation="http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc.xsd
+		http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/file https://www.springframework.org/schema/integration/file/spring-integration-file.xsd
+		http://www.springframework.org/schema/integration/jdbc https://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd
+
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
+
+    <context:annotation-config/>
+
+    <context:property-placeholder/>
+
+    <int-file:inbound-channel-adapter
+            channel="inputChannel"
+            auto-create-directory="true"
+            filename-pattern="*.txt"
+            directory="${java.io.tmpdir}/tx/">
+        <int:poller fixed-delay="500">
+            <int:transactional transaction-manager="txManager" synchronization-factory="syncFactory"/>
+        </int:poller>
+    </int-file:inbound-channel-adapter>
+
+    <int:transaction-synchronization-factory id="syncFactory">
+        <int:after-commit expression="payload.renameTo(new java.io.File(payload.absolutePath + '.PASSED'))"
+                          channel="infoLogger"/>
+        <int:after-rollback expression="payload.renameTo(new java.io.File(payload.absolutePath + '.FAILED'))"
+                            channel="errorLogger"/>
+    </int:transaction-synchronization-factory>
+
+    <int:channel id="inputChannel"/>
+
+    <int-file:file-to-string-transformer input-channel="inputChannel" output-channel="toServiceChannel"/>
+
+    <int:service-activator input-channel="toServiceChannel"
+                           ref="serviceActivator"
+                           method="checkTestResults"/>
+
+    <int:logging-channel-adapter id="infoLogger" level="INFO"/>
+    <int:logging-channel-adapter id="errorLogger" level="ERROR"/>
+
+    <bean id="serviceActivator" class="com.baeldung.tx.ServiceActivator"/>
+
+    <bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+        <property name="dataSource" ref="dataSource"/>
+    </bean>
+
+    <jdbc:embedded-database id="dataSource" type="H2">
+        <jdbc:script location="classpath*:table.sql"/>
+    </jdbc:embedded-database>
+
+    <bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
+        <property name="dataSource" ref="dataSource"/>
+    </bean>
+
+    <int-jdbc:inbound-channel-adapter channel="infoLogger"
+                                      query="select TEST from STUDENT" data-source="dataSource">
+        <int:poller fixed-delay="5000"/>
+    </int-jdbc:inbound-channel-adapter>
+</beans>
diff --git a/spring-integration/src/main/resources/table.sql b/spring-integration/src/main/resources/table.sql
new file mode 100644
index 0000000000..9ca58f6f27
--- /dev/null
+++ b/spring-integration/src/main/resources/table.sql
@@ -0,0 +1,4 @@
+
+CREATE TABLE IF NOT EXISTS STUDENT (
+    TEST VARCHAR(256)
+);
\ No newline at end of file
diff --git a/spring-integration/src/test/java/com/baeldung/tx/TxIntegrationTest.java b/spring-integration/src/test/java/com/baeldung/tx/TxIntegrationTest.java
new file mode 100644
index 0000000000..1bbd16aa4b
--- /dev/null
+++ b/spring-integration/src/test/java/com/baeldung/tx/TxIntegrationTest.java
@@ -0,0 +1,56 @@
+package com.baeldung.tx;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+public final class TxIntegrationTest {
+
+    private static final String CONTEXT_CONFIG = "classpath:META-INF/spring/integration/spring-integration-tx-context.xml";
+
+    @Test
+    public void whenFileDoesntStartWithFail_thenTxSuccessful() throws InterruptedException, IOException {
+        final AbstractApplicationContext context =
+                new ClassPathXmlApplicationContext(CONTEXT_CONFIG);
+
+        String fileName = System.getProperty("java.io.tmpdir") + "/tx/test1.txt";
+        FileWriter fw = new FileWriter(fileName);
+        fw.write("PASSED!");
+        fw.close();
+
+        context.registerShutdownHook();
+        Thread.sleep(5000);
+
+        File file = new File(fileName + ".PASSED");
+        Assert.assertTrue(file.exists());
+    }
+
+    @Test
+    public void whenFileStartsWithFail_thenTxFailed() {
+
+        String fileName = System.getProperty("java.io.tmpdir") + "/tx/test2.txt";
+
+        try {
+            final AbstractApplicationContext context =
+                    new ClassPathXmlApplicationContext(CONTEXT_CONFIG);
+
+            FileWriter fw = new FileWriter(fileName);
+            fw.write("FAILED!");
+            fw.close();
+
+            context.registerShutdownHook();
+            Thread.sleep(5000);
+        } catch (Exception e) {
+            // Exception is expected, do nothing
+        }
+
+        File file = new File(fileName + ".FAILED");
+        Assert.assertTrue(file.exists());
+    }
+
+}
diff --git a/spring-jooq/src/test/java/com/baeldung/jooq/introduction/ExceptionTranslator.java b/spring-jooq/src/test/java/com/baeldung/jooq/introduction/ExceptionTranslator.java
index 8312f20c05..26c061e9cd 100644
--- a/spring-jooq/src/test/java/com/baeldung/jooq/introduction/ExceptionTranslator.java
+++ b/spring-jooq/src/test/java/com/baeldung/jooq/introduction/ExceptionTranslator.java
@@ -12,7 +12,7 @@ public class ExceptionTranslator extends DefaultExecuteListener {
     @Override
     public void exception(ExecuteContext context) {
         SQLDialect dialect = context.configuration().dialect();
-        SQLExceptionTranslator translator = new SQLErrorCodeSQLExceptionTranslator(dialect.name());
+        SQLExceptionTranslator translator = new SQLErrorCodeSQLExceptionTranslator(dialect.thirdParty().springDbName());
 
         context.exception(translator.translate("Access database using jOOQ", context.sql(), context.sqlException()));
     }
diff --git a/spring-mockito/src/main/resources/application.properties b/spring-mockito/src/main/resources/application.properties
index e69de29bb2..709574239b 100644
--- a/spring-mockito/src/main/resources/application.properties
+++ b/spring-mockito/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-mockito/src/test/java/com/baeldung/NameServiceTestConfiguration.java b/spring-mockito/src/test/java/com/baeldung/NameServiceTestConfiguration.java
index c50377a22a..2c63ff6203 100644
--- a/spring-mockito/src/test/java/com/baeldung/NameServiceTestConfiguration.java
+++ b/spring-mockito/src/test/java/com/baeldung/NameServiceTestConfiguration.java
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Profile;
 public class NameServiceTestConfiguration {
     @Bean
     @Primary
-    public NameService nameServiceTest() {
+    public NameService nameService() {
         return Mockito.mock(NameService.class);
     }
 }
diff --git a/jackson-simple/src/test/resources/.gitignore b/spring-mvc-basics-2/.gitignore
similarity index 100%
rename from jackson-simple/src/test/resources/.gitignore
rename to spring-mvc-basics-2/.gitignore
diff --git a/spring-mvc-basics-2/README.md b/spring-mvc-basics-2/README.md
new file mode 100644
index 0000000000..8cf753bbdc
--- /dev/null
+++ b/spring-mvc-basics-2/README.md
@@ -0,0 +1,11 @@
+=========
+
+## Spring MVC Basics with Java Configuration Example Project
+
+### The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
+### Relevant Articles: 
+- [Quick Guide to Spring Controllers](http://www.baeldung.com/spring-controllers)- [The Spring @Controller and @RestController Annotations](http://www.baeldung.com/spring-controller-vs-restcontroller)
+- [Model, ModelMap, and ModelView in Spring MVC](http://www.baeldung.com/spring-mvc-model-model-map-model-view)
+- [Spring Web Contexts](http://www.baeldung.com/spring-web-contexts)
\ No newline at end of file
diff --git a/spring-mvc-basics-2/pom.xml b/spring-mvc-basics-2/pom.xml
new file mode 100644
index 0000000000..706459a268
--- /dev/null
+++ b/spring-mvc-basics-2/pom.xml
@@ -0,0 +1,37 @@
+<?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-mvc-basics-2</artifactId>
+    <name>spring-mvc-basics-2</name>
+    <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>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/spring-all/src/main/java/com/baeldung/contexts/Greeting.java b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/Greeting.java
similarity index 100%
rename from spring-all/src/main/java/com/baeldung/contexts/Greeting.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/contexts/Greeting.java
diff --git a/spring-all/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java
similarity index 94%
rename from spring-all/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java
index 318dc5ea65..1dffad637a 100644
--- a/spring-all/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java
+++ b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java
@@ -2,7 +2,6 @@ package com.baeldung.contexts.config;
 
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-import org.springframework.web.servlet.support.AbstractDispatcherServletInitializer;
 
 public class AnnotationsBasedApplicationAndServletInitializer //extends AbstractDispatcherServletInitializer 
 {
diff --git a/spring-all/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java
similarity index 89%
rename from spring-all/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java
index b685d2fa83..ffa80d58bf 100644
--- a/spring-all/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java
+++ b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java
@@ -1,6 +1,5 @@
 package com.baeldung.contexts.config;
 
-import org.springframework.web.context.AbstractContextLoaderInitializer;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 
diff --git a/spring-all/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java
similarity index 100%
rename from spring-all/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java
diff --git a/spring-all/src/main/java/com/baeldung/contexts/config/NormalWebAppConfig.java b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/NormalWebAppConfig.java
similarity index 100%
rename from spring-all/src/main/java/com/baeldung/contexts/config/NormalWebAppConfig.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/NormalWebAppConfig.java
diff --git a/spring-all/src/main/java/com/baeldung/contexts/config/RootApplicationConfig.java b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/RootApplicationConfig.java
similarity index 100%
rename from spring-all/src/main/java/com/baeldung/contexts/config/RootApplicationConfig.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/RootApplicationConfig.java
diff --git a/spring-all/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java
similarity index 92%
rename from spring-all/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java
index d74d4a6c63..580e86d2b5 100644
--- a/spring-all/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java
+++ b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/SecureAnnotationsBasedApplicationAndServletInitializer.java
@@ -2,7 +2,6 @@ package com.baeldung.contexts.config;
 
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-import org.springframework.web.servlet.support.AbstractDispatcherServletInitializer;
 
 public class SecureAnnotationsBasedApplicationAndServletInitializer// extends AbstractDispatcherServletInitializer 
 {
diff --git a/spring-all/src/main/java/com/baeldung/contexts/config/SecureWebAppConfig.java b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/SecureWebAppConfig.java
similarity index 100%
rename from spring-all/src/main/java/com/baeldung/contexts/config/SecureWebAppConfig.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/contexts/config/SecureWebAppConfig.java
diff --git a/spring-all/src/main/java/com/baeldung/contexts/normal/HelloWorldController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/normal/HelloWorldController.java
similarity index 100%
rename from spring-all/src/main/java/com/baeldung/contexts/normal/HelloWorldController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/contexts/normal/HelloWorldController.java
diff --git a/spring-all/src/main/java/com/baeldung/contexts/secure/HelloWorldSecureController.java b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/secure/HelloWorldSecureController.java
similarity index 100%
rename from spring-all/src/main/java/com/baeldung/contexts/secure/HelloWorldSecureController.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/contexts/secure/HelloWorldSecureController.java
diff --git a/spring-all/src/main/java/com/baeldung/contexts/services/ApplicationContextUtilService.java b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/services/ApplicationContextUtilService.java
similarity index 100%
rename from spring-all/src/main/java/com/baeldung/contexts/services/ApplicationContextUtilService.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/contexts/services/ApplicationContextUtilService.java
diff --git a/spring-all/src/main/java/com/baeldung/contexts/services/GreeterService.java b/spring-mvc-basics-2/src/main/java/com/baeldung/contexts/services/GreeterService.java
similarity index 100%
rename from spring-all/src/main/java/com/baeldung/contexts/services/GreeterService.java
rename to spring-mvc-basics-2/src/main/java/com/baeldung/contexts/services/GreeterService.java
diff --git a/spring-all/src/main/java/org/baeldung/controller/config/StudentControllerConfig.java b/spring-mvc-basics-2/src/main/java/org/baeldung/controller/config/StudentControllerConfig.java
similarity index 77%
rename from spring-all/src/main/java/org/baeldung/controller/config/StudentControllerConfig.java
rename to spring-mvc-basics-2/src/main/java/org/baeldung/controller/config/StudentControllerConfig.java
index 85305e057f..218418ecc8 100644
--- a/spring-all/src/main/java/org/baeldung/controller/config/StudentControllerConfig.java
+++ b/spring-mvc-basics-2/src/main/java/org/baeldung/controller/config/StudentControllerConfig.java
@@ -1,32 +1,28 @@
-package org.baeldung.controller.config;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.web.WebApplicationInitializer;
-import org.springframework.web.context.ContextLoaderListener;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-import org.springframework.web.context.support.GenericWebApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
-
-public class StudentControllerConfig //implements WebApplicationInitializer 
-{
-
-    //uncomment to run the student controller example
-    //@Override
-    public void onStartup(ServletContext sc) throws ServletException {
-        AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext();
-        root.register(WebConfig.class);
-        root.setServletContext(sc);
-        sc.addListener(new ContextLoaderListener(root));
-
-        DispatcherServlet dv = new DispatcherServlet(root);
-        
-        ServletRegistration.Dynamic appServlet = sc.addServlet("test-mvc", dv);
-        appServlet.setLoadOnStartup(1);
-        appServlet.addMapping("/test/*");
-    }
-}
+package org.baeldung.controller.config;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+
+import org.springframework.web.context.ContextLoaderListener;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.servlet.DispatcherServlet;
+
+public class StudentControllerConfig //implements WebApplicationInitializer 
+{
+
+    //uncomment to run the student controller example
+    //@Override
+    public void onStartup(ServletContext sc) throws ServletException {
+        AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext();
+        root.register(WebConfig.class);
+        root.setServletContext(sc);
+        sc.addListener(new ContextLoaderListener(root));
+
+        DispatcherServlet dv = new DispatcherServlet(root);
+        
+        ServletRegistration.Dynamic appServlet = sc.addServlet("test-mvc", dv);
+        appServlet.setLoadOnStartup(1);
+        appServlet.addMapping("/test/*");
+    }
+}
diff --git a/spring-all/src/main/java/org/baeldung/controller/config/WebConfig.java b/spring-mvc-basics-2/src/main/java/org/baeldung/controller/config/WebConfig.java
similarity index 97%
rename from spring-all/src/main/java/org/baeldung/controller/config/WebConfig.java
rename to spring-mvc-basics-2/src/main/java/org/baeldung/controller/config/WebConfig.java
index a17210f3b8..485c1d9032 100644
--- a/spring-all/src/main/java/org/baeldung/controller/config/WebConfig.java
+++ b/spring-mvc-basics-2/src/main/java/org/baeldung/controller/config/WebConfig.java
@@ -1,28 +1,28 @@
-package org.baeldung.controller.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.view.InternalResourceViewResolver;
-
-@Configuration
-@EnableWebMvc
-@ComponentScan(basePackages = { "org.baeldung.controller.controller", "org.baeldung.controller.config" })
-public class WebConfig implements WebMvcConfigurer {
-    @Override
-    public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
-        configurer.enable();
-    }
-
-    @Bean
-    public ViewResolver viewResolver() {
-        InternalResourceViewResolver bean = new InternalResourceViewResolver();
-        bean.setPrefix("/WEB-INF/");
-        bean.setSuffix(".jsp");
-        return bean;
-    }
+package org.baeldung.controller.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
+
+@Configuration
+@EnableWebMvc
+@ComponentScan(basePackages = { "org.baeldung.controller.controller", "org.baeldung.controller.config" })
+public class WebConfig implements WebMvcConfigurer {
+    @Override
+    public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
+        configurer.enable();
+    }
+
+    @Bean
+    public ViewResolver viewResolver() {
+        InternalResourceViewResolver bean = new InternalResourceViewResolver();
+        bean.setPrefix("/WEB-INF/");
+        bean.setSuffix(".jsp");
+        return bean;
+    }
 }
\ No newline at end of file
diff --git a/spring-all/src/main/java/org/baeldung/controller/controller/PassParametersController.java b/spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/PassParametersController.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/controller/controller/PassParametersController.java
rename to spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/PassParametersController.java
diff --git a/spring-all/src/main/java/org/baeldung/controller/controller/RestAnnotatedController.java b/spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/RestAnnotatedController.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/controller/controller/RestAnnotatedController.java
rename to spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/RestAnnotatedController.java
diff --git a/spring-all/src/main/java/org/baeldung/controller/controller/RestController.java b/spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/RestController.java
similarity index 86%
rename from spring-all/src/main/java/org/baeldung/controller/controller/RestController.java
rename to spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/RestController.java
index 4b38b4dd34..4e5d1d9e17 100644
--- a/spring-all/src/main/java/org/baeldung/controller/controller/RestController.java
+++ b/spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/RestController.java
@@ -10,7 +10,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 public class RestController {
 
     @GetMapping(value = "/student/{studentId}")
-    public @ResponseBody Student getTestData(@PathVariable Integer studentId) {
+    public @ResponseBody
+    Student getTestData(@PathVariable Integer studentId) {
         Student student = new Student();
         student.setName("Peter");
         student.setId(studentId);
diff --git a/spring-all/src/main/java/org/baeldung/controller/controller/TestController.java b/spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/TestController.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/controller/controller/TestController.java
rename to spring-mvc-basics-2/src/main/java/org/baeldung/controller/controller/TestController.java
diff --git a/spring-all/src/main/java/org/baeldung/controller/student/Student.java b/spring-mvc-basics-2/src/main/java/org/baeldung/controller/student/Student.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/controller/student/Student.java
rename to spring-mvc-basics-2/src/main/java/org/baeldung/controller/student/Student.java
diff --git a/spring-mvc-basics-2/src/main/resources/application.properties b/spring-mvc-basics-2/src/main/resources/application.properties
new file mode 100644
index 0000000000..709574239b
--- /dev/null
+++ b/spring-mvc-basics-2/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-mvc-basics-2/src/main/resources/logback.xml b/spring-mvc-basics-2/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/spring-mvc-basics-2/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/spring-mvc-basics-2/src/main/resources/test-mvc.xml b/spring-mvc-basics-2/src/main/resources/test-mvc.xml
new file mode 100644
index 0000000000..8013170379
--- /dev/null
+++ b/spring-mvc-basics-2/src/main/resources/test-mvc.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xsi:schemaLocation="
+        http://www.springframework.org/schema/beans     
+        http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+        http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context-4.0.xsd
+        http://www.springframework.org/schema/mvc
+        http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
+    <context:component-scan base-package="org.baeldung.controller.controller"/>
+    <mvc:annotation-driven/>
+
+    <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="prefix">
+            <value>/WEB-INF/</value>
+        </property>
+        <property name="suffix">
+            <value>.jsp</value>
+        </property>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/greeting.xml b/spring-mvc-basics-2/src/main/webapp/WEB-INF/greeting.xml
new file mode 100644
index 0000000000..1ad5484d80
--- /dev/null
+++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/greeting.xml
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+   http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+    <bean id="greeting" class="com.baeldung.contexts.Greeting">
+        <property name="message" value="Hello World !!"/>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/index.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/index.jsp
similarity index 100%
rename from spring-all/src/main/webapp/WEB-INF/index.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/index.jsp
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/normal-webapp-servlet.xml b/spring-mvc-basics-2/src/main/webapp/WEB-INF/normal-webapp-servlet.xml
new file mode 100644
index 0000000000..8addbe3cf3
--- /dev/null
+++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/normal-webapp-servlet.xml
@@ -0,0 +1,16 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       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.xsd">
+
+    <context:component-scan base-package="com.baeldung.contexts.normal"/>
+
+    <bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
+        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
+        <property name="prefix" value="/WEB-INF/view/"/>
+        <property name="suffix" value=".jsp"/>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/rootApplicationContext.xml b/spring-mvc-basics-2/src/main/webapp/WEB-INF/rootApplicationContext.xml
new file mode 100644
index 0000000000..12e5d8f161
--- /dev/null
+++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/rootApplicationContext.xml
@@ -0,0 +1,14 @@
+<?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"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+   http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+   http://www.springframework.org/schema/context
+   http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+    <context:component-scan base-package="com.baeldung.contexts.services"/>
+
+    <import resource="greeting.xml"/>
+</beans>
\ No newline at end of file
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/secure-webapp-servlet.xml b/spring-mvc-basics-2/src/main/webapp/WEB-INF/secure-webapp-servlet.xml
new file mode 100644
index 0000000000..86797ad081
--- /dev/null
+++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/secure-webapp-servlet.xml
@@ -0,0 +1,16 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       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.xsd">
+
+    <context:component-scan base-package="com.baeldung.contexts.secure"/>
+
+    <bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
+        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
+        <property name="prefix" value="/WEB-INF/secure/view/"/>
+        <property name="suffix" value=".jsp"/>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/secure/view/welcome.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/secure/view/welcome.jsp
similarity index 100%
rename from spring-all/src/main/webapp/WEB-INF/secure/view/welcome.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/secure/view/welcome.jsp
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/sample.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/sample.jsp
new file mode 100644
index 0000000000..4c64bf97f2
--- /dev/null
+++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/sample.jsp
@@ -0,0 +1,7 @@
+<html>
+<head></head>
+
+<body>
+<h1>This is the body of the sample view</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/scopesExample.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/scopesExample.jsp
new file mode 100644
index 0000000000..e9abcf194c
--- /dev/null
+++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/scopesExample.jsp
@@ -0,0 +1,10 @@
+<html>
+<head></head>
+
+<body>
+    <h1>Bean Scopes Examples</h1>
+    <br> Previous Message: ${previousMessage }
+    <br> Current Message: ${currentMessage }
+    <br>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/view/viewPage.html b/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/viewPage.html
similarity index 100%
rename from spring-all/src/main/webapp/WEB-INF/view/viewPage.html
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/view/viewPage.html
diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/welcome.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/welcome.jsp
new file mode 100644
index 0000000000..4eda3c58e2
--- /dev/null
+++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/welcome.jsp
@@ -0,0 +1,11 @@
+<html>
+<head>
+    <title>Spring Web Contexts</title>
+</head>
+<body>
+    <br>
+    <div style="padding: 10px; border-radius: 10px; font-size: 30px; text-align: center;">
+        Normal Web Application : ${message}
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/web-old.xml b/spring-mvc-basics-2/src/main/webapp/WEB-INF/web-old.xml
similarity index 94%
rename from spring-all/src/main/webapp/WEB-INF/web-old.xml
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/web-old.xml
index 42020e75c4..03322279e2 100644
--- a/spring-all/src/main/webapp/WEB-INF/web-old.xml
+++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/web-old.xml
@@ -15,10 +15,10 @@
             org.springframework.web.context.ContextLoaderListener
         </listener-class>
     </listener>-->
-  	<!--<context-param>
-    	<param-name>contextConfigLocation</param-name>
-    	<param-value>/WEB-INF/rootApplicationContext.xml</param-value>
-	</context-param>-->
+    <!--<context-param>
+      <param-name>contextConfigLocation</param-name>
+      <param-value>/WEB-INF/rootApplicationContext.xml</param-value>
+  </context-param>-->
     <!--<context-param>
         <param-name>contextClass</param-name>
         <param-value>org.springframework.web.context.support.AnnotationConfigWebApplicationContext</param-value>
@@ -32,7 +32,7 @@
         <param-value>org.baeldung.bean.config</param-value>
     </context-param>-->
 
-	<!-- secure web app context -->
+    <!-- secure web app context -->
     <!--<servlet>
         <servlet-name>secure-webapp</servlet-name>
         <servlet-class>
@@ -48,7 +48,7 @@
         <servlet-name>secure-webapp</servlet-name>
         <url-pattern>/s/api/*</url-pattern>
     </servlet-mapping>-->
-    
+
     <!-- normal web app context -->
     <!--<servlet>
         <servlet-name>normal-webapp</servlet-name>
diff --git a/spring-all/src/main/webapp/WEB-INF/welcome.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/welcome.jsp
similarity index 62%
rename from spring-all/src/main/webapp/WEB-INF/welcome.jsp
rename to spring-mvc-basics-2/src/main/webapp/WEB-INF/welcome.jsp
index 61ee4bc7d6..c34223b411 100644
--- a/spring-all/src/main/webapp/WEB-INF/welcome.jsp
+++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/welcome.jsp
@@ -1,10 +1,10 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
+         pageEncoding="UTF-8" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Insert title here</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Insert title here</title>
 </head>
 <body>
 Data returned is ${data}
diff --git a/spring-all/src/main/webapp/index.jsp b/spring-mvc-basics-2/src/main/webapp/index.jsp
similarity index 100%
rename from spring-all/src/main/webapp/index.jsp
rename to spring-mvc-basics-2/src/main/webapp/index.jsp
diff --git a/spring-all/src/test/java/org/baeldung/controller/ControllerAnnotationIntegrationTest.java b/spring-mvc-basics-2/src/test/java/org/baeldung/controller/ControllerAnnotationIntegrationTest.java
similarity index 97%
rename from spring-all/src/test/java/org/baeldung/controller/ControllerAnnotationIntegrationTest.java
rename to spring-mvc-basics-2/src/test/java/org/baeldung/controller/ControllerAnnotationIntegrationTest.java
index 82c8704360..e32d9f7aca 100644
--- a/spring-all/src/test/java/org/baeldung/controller/ControllerAnnotationIntegrationTest.java
+++ b/spring-mvc-basics-2/src/test/java/org/baeldung/controller/ControllerAnnotationIntegrationTest.java
@@ -1,79 +1,79 @@
-package org.baeldung.controller;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.baeldung.controller.config.WebConfig;
-import org.baeldung.controller.student.Student;
-import org.junit.Assert;
-import org.junit.Before;
-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.web.AnnotationConfigWebContextLoader;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.servlet.ModelAndView;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = { WebConfig.class }, loader = AnnotationConfigWebContextLoader.class)
-public class ControllerAnnotationIntegrationTest {
-
-    private MockMvc mockMvc;
-
-    @Autowired
-    private WebApplicationContext wac;
-
-    private Student selectedStudent;
-
-    @Before
-    public void setUp() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-
-        selectedStudent = new Student();
-        selectedStudent.setId(1);
-        selectedStudent.setName("Peter");
-    }
-
-    @Test
-    public void testTestController() throws Exception {
-
-        ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/test/")).andReturn().getModelAndView();
-
-        // validate modal data
-        Assert.assertSame(mv.getModelMap().get("data").toString(), "Welcome home man");
-
-        // validate view name
-        Assert.assertSame(mv.getViewName(), "welcome");
-    }
-
-    @Test
-    public void testRestController() throws Exception {
-
-        String responseBody = this.mockMvc.perform(MockMvcRequestBuilders.get("/student/{studentId}", 1)).andReturn().getResponse().getContentAsString();
-
-        ObjectMapper reader = new ObjectMapper();
-
-        Student studentDetails = reader.readValue(responseBody, Student.class);
-
-        Assert.assertEquals(selectedStudent, studentDetails);
-
-    }
-
-    @Test
-    public void testRestAnnotatedController() throws Exception {
-
-        String responseBody = this.mockMvc.perform(MockMvcRequestBuilders.get("/annotated/student/{studentId}", 1)).andReturn().getResponse().getContentAsString();
-
-        ObjectMapper reader = new ObjectMapper();
-
-        Student studentDetails = reader.readValue(responseBody, Student.class);
-
-        Assert.assertEquals(selectedStudent, studentDetails);
-    }
-
-}
+package org.baeldung.controller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.baeldung.controller.config.WebConfig;
+import org.baeldung.controller.student.Student;
+import org.junit.Assert;
+import org.junit.Before;
+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.web.AnnotationConfigWebContextLoader;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.servlet.ModelAndView;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { WebConfig.class }, loader = AnnotationConfigWebContextLoader.class)
+public class ControllerAnnotationIntegrationTest {
+
+    private MockMvc mockMvc;
+
+    @Autowired
+    private WebApplicationContext wac;
+
+    private Student selectedStudent;
+
+    @Before
+    public void setUp() {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+
+        selectedStudent = new Student();
+        selectedStudent.setId(1);
+        selectedStudent.setName("Peter");
+    }
+
+    @Test
+    public void testTestController() throws Exception {
+
+        ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/test/")).andReturn().getModelAndView();
+
+        // validate modal data
+        Assert.assertSame(mv.getModelMap().get("data").toString(), "Welcome home man");
+
+        // validate view name
+        Assert.assertSame(mv.getViewName(), "welcome");
+    }
+
+    @Test
+    public void testRestController() throws Exception {
+
+        String responseBody = this.mockMvc.perform(MockMvcRequestBuilders.get("/student/{studentId}", 1)).andReturn().getResponse().getContentAsString();
+
+        ObjectMapper reader = new ObjectMapper();
+
+        Student studentDetails = reader.readValue(responseBody, Student.class);
+
+        Assert.assertEquals(selectedStudent, studentDetails);
+
+    }
+
+    @Test
+    public void testRestAnnotatedController() throws Exception {
+
+        String responseBody = this.mockMvc.perform(MockMvcRequestBuilders.get("/annotated/student/{studentId}", 1)).andReturn().getResponse().getContentAsString();
+
+        ObjectMapper reader = new ObjectMapper();
+
+        Student studentDetails = reader.readValue(responseBody, Student.class);
+
+        Assert.assertEquals(selectedStudent, studentDetails);
+    }
+
+}
diff --git a/spring-all/src/test/java/org/baeldung/controller/ControllerIntegrationTest.java b/spring-mvc-basics-2/src/test/java/org/baeldung/controller/ControllerIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/controller/ControllerIntegrationTest.java
rename to spring-mvc-basics-2/src/test/java/org/baeldung/controller/ControllerIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/controller/PassParametersControllerIntegrationTest.java b/spring-mvc-basics-2/src/test/java/org/baeldung/controller/PassParametersControllerIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/controller/PassParametersControllerIntegrationTest.java
rename to spring-mvc-basics-2/src/test/java/org/baeldung/controller/PassParametersControllerIntegrationTest.java
diff --git a/spring-all/src/main/resources/test-mvc.xml b/spring-mvc-basics-2/src/test/resources/test-mvc.xml
similarity index 100%
rename from spring-all/src/main/resources/test-mvc.xml
rename to spring-mvc-basics-2/src/test/resources/test-mvc.xml
diff --git a/spring-mvc-basics/README.md b/spring-mvc-basics/README.md
index a04c6e7ae7..0855015e70 100644
--- a/spring-mvc-basics/README.md
+++ b/spring-mvc-basics/README.md
@@ -1,6 +1,7 @@
-=========
+## Spring MVC Basics
 
-## Spring MVC Basics with Java Configuration Example Project
+This module contains articles about the basics of Spring MVC. Articles about more specific areas of Spring MVC have
+their own module. 
 
 ### The Course
 The "REST With Spring" Classes: http://bit.ly/restwithspring
diff --git a/spring-mvc-basics/src/main/java/com/baeldung/config/AppInitializer.java b/spring-mvc-basics/src/main/java/com/baeldung/config/MainWebAppInitializer.java
similarity index 92%
rename from spring-mvc-basics/src/main/java/com/baeldung/config/AppInitializer.java
rename to spring-mvc-basics/src/main/java/com/baeldung/config/MainWebAppInitializer.java
index a76d955e4f..0a2368619a 100644
--- a/spring-mvc-basics/src/main/java/com/baeldung/config/AppInitializer.java
+++ b/spring-mvc-basics/src/main/java/com/baeldung/config/MainWebAppInitializer.java
@@ -9,7 +9,7 @@ import org.springframework.web.context.ContextLoaderListener;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 
-public class AppInitializer implements WebApplicationInitializer {
+public class MainWebAppInitializer implements WebApplicationInitializer {
 
     @Override
     public void onStartup(ServletContext container) throws ServletException {
diff --git a/spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerIntegrationTest.java b/spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerIntegrationTest.java
index bce5ab0a8c..079ea3e5cd 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerIntegrationTest.java
+++ b/spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerIntegrationTest.java
@@ -40,7 +40,7 @@ public class GreetControllerIntegrationTest {
     }
 
     @Test
-    public void givenWAC_whenServletContext_thenItProvidesGreetController() {
+    public void givenWac_whenServletContext_thenItProvidesGreetController() {
         final ServletContext servletContext = wac.getServletContext();
         Assert.assertNotNull(servletContext);
         Assert.assertTrue(servletContext instanceof MockServletContext);
@@ -59,7 +59,7 @@ public class GreetControllerIntegrationTest {
     }
 
     @Test
-    public void givenGreetURIWithPathVariable_whenMockMVC_thenVerifyResponse() throws Exception {
+    public void givenGreetURIWithPathVariable_whenMockMVC_thenResponseOK() throws Exception {
         this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithPathVariable/John")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType(CONTENT_TYPE))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John!!!"));
     }
@@ -71,7 +71,7 @@ public class GreetControllerIntegrationTest {
     }
 
     @Test
-    public void givenGreetURIWithQueryParameter_whenMockMVC_thenVerifyResponse() throws Exception {
+    public void givenGreetURIWithQueryParameter_whenMockMVC_thenResponseOK() throws Exception {
         this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType(CONTENT_TYPE))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!"));
     }
@@ -83,7 +83,7 @@ public class GreetControllerIntegrationTest {
     }
 
     @Test
-    public void givenGreetURIWithPostAndFormData_whenMockMVC_thenVerifyResponse() throws Exception {
+    public void givenGreetURIWithPostAndFormData_whenMockMVC_thenResponseOK() throws Exception {
         this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk())
                 .andExpect(MockMvcResultMatchers.content().contentType(CONTENT_TYPE)).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(MockMvcResultMatchers.jsonPath("$.id").value(1));
     }
diff --git a/spring-mvc-simple-2/README.md b/spring-mvc-simple-2/README.md
index 80456c5732..c03fa6363a 100644
--- a/spring-mvc-simple-2/README.md
+++ b/spring-mvc-simple-2/README.md
@@ -4,4 +4,6 @@ This module contains articles about Spring MVC
 
 ## Relevant articles:
 - [How to Read HTTP Headers in Spring REST Controllers](https://www.baeldung.com/spring-rest-http-headers)
+- [A Custom Data Binder in Spring MVC](https://www.baeldung.com/spring-mvc-custom-data-binder)
+- [Validating Lists in a Spring Controller](https://www.baeldung.com/spring-validate-list-controller)
 - More articles: [[<-- prev]](/spring-mvc-simple)
diff --git a/spring-mvc-simple-2/pom.xml b/spring-mvc-simple-2/pom.xml
index ca911b2719..7faa832552 100644
--- a/spring-mvc-simple-2/pom.xml
+++ b/spring-mvc-simple-2/pom.xml
@@ -1,42 +1,151 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?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-mvc-simple-2</artifactId>
-    <packaging>war</packaging>
     <name>spring-mvc-simple-2</name>
+    <packaging>war</packaging>
+    <description>Demo project for Spring Boot</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
         <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-web</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>${jpa.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.subethamail</groupId>
+            <artifactId>subethasmtp</artifactId>
+            <version>${subethasmtp.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-context</artifactId>
+            <version>${springcloud.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
+        </dependency>
     </dependencies>
 
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>**/conf.properties</exclude>
+                </excludes>
+            </resource>
+        </resources>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>autoconfiguration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>**/*LiveTest.java</exclude>
+                                        <exclude>**/*IntegrationTest.java</exclude>
+                                        <exclude>**/*IntTest.java</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/AutoconfigurationTest.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <test.mime>json</test.mime>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <!-- The main class to start by executing java -jar -->
+        <start-class>org.baeldung.boot.Application</start-class>
+        <jquery.version>3.1.1</jquery.version>
+        <bootstrap.version>3.3.7-1</bootstrap.version>
+        <jpa.version>2.2</jpa.version>
+        <guava.version>18.0</guava.version>
+        <subethasmtp.version>3.1.7</subethasmtp.version>
+        <springcloud.version>2.0.2.RELEASE</springcloud.version>
+        <httpclient.version>4.5.8</httpclient.version>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <finalName>spring-mvc-simple2</finalName>
-    </build>
 </project>
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/Application.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/Application.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/Application.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/Application.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/config/WebConfig.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/config/WebConfig.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/config/WebConfig.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/config/WebConfig.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/controller/GenericEntityController.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/controller/GenericEntityController.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/controller/GenericEntityController.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/controller/GenericEntityController.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/converter/GenericBigDecimalConverter.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/GenericBigDecimalConverter.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/converter/GenericBigDecimalConverter.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/GenericBigDecimalConverter.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/converter/StringToAbstractEntityConverterFactory.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToAbstractEntityConverterFactory.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/converter/StringToAbstractEntityConverterFactory.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToAbstractEntityConverterFactory.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/converter/StringToEmployeeConverter.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToEmployeeConverter.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/converter/StringToEmployeeConverter.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToEmployeeConverter.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/converter/StringToEnumConverter.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToEnumConverter.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/converter/StringToEnumConverter.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToEnumConverter.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/converter/StringToLocalDateTimeConverter.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToLocalDateTimeConverter.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/converter/StringToLocalDateTimeConverter.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/StringToLocalDateTimeConverter.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/converter/controller/AbstractEntityController.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/controller/AbstractEntityController.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/converter/controller/AbstractEntityController.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/controller/AbstractEntityController.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/converter/controller/StringToEmployeeConverterController.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/controller/StringToEmployeeConverterController.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/converter/controller/StringToEmployeeConverterController.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/converter/controller/StringToEmployeeConverterController.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/domain/AbstractEntity.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/AbstractEntity.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/domain/AbstractEntity.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/AbstractEntity.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/domain/Bar.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Bar.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/domain/Bar.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Bar.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/domain/Employee.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Employee.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/domain/Employee.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Employee.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/domain/Foo.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Foo.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/domain/Foo.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Foo.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/domain/GenericEntity.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/GenericEntity.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/domain/GenericEntity.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/GenericEntity.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/domain/Modes.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Modes.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/domain/Modes.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/domain/Modes.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java
diff --git a/spring-boot-ops/src/main/java/org/baeldung/boot/web/resolver/Version.java b/spring-mvc-simple-2/src/main/java/org/baeldung/boot/web/resolver/Version.java
similarity index 100%
rename from spring-boot-ops/src/main/java/org/baeldung/boot/web/resolver/Version.java
rename to spring-mvc-simple-2/src/main/java/org/baeldung/boot/web/resolver/Version.java
diff --git a/spring-mvc-simple-2/src/main/resources/application.properties b/spring-mvc-simple-2/src/main/resources/application.properties
new file mode 100644
index 0000000000..d29338d3d3
--- /dev/null
+++ b/spring-mvc-simple-2/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+spring.main.allow-bean-definition-overriding=true
+spring.mail.host=localhost
+spring.mail.port=8025
\ No newline at end of file
diff --git a/spring-boot-ops/src/test/java/org/baeldung/SpringBootApplicationIntegrationTest.java b/spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootApplicationIntegrationTest.java
similarity index 99%
rename from spring-boot-ops/src/test/java/org/baeldung/SpringBootApplicationIntegrationTest.java
rename to spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootApplicationIntegrationTest.java
index 5627543b62..7190c4f427 100644
--- a/spring-boot-ops/src/test/java/org/baeldung/SpringBootApplicationIntegrationTest.java
+++ b/spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootApplicationIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.baeldung.boot.Application;
 import org.baeldung.boot.domain.Modes;
diff --git a/spring-boot-ops/src/test/java/org/baeldung/SpringBootJPAIntegrationTest.java b/spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java
similarity index 98%
rename from spring-boot-ops/src/test/java/org/baeldung/SpringBootJPAIntegrationTest.java
rename to spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java
index c368cf5219..c283529435 100644
--- a/spring-boot-ops/src/test/java/org/baeldung/SpringBootJPAIntegrationTest.java
+++ b/spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.baeldung.boot.Application;
 import org.baeldung.boot.domain.GenericEntity;
diff --git a/spring-boot-ops/src/test/java/org/baeldung/SpringBootMailIntegrationTest.java b/spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootMailIntegrationTest.java
similarity index 99%
rename from spring-boot-ops/src/test/java/org/baeldung/SpringBootMailIntegrationTest.java
rename to spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootMailIntegrationTest.java
index a6a84184fa..1a2a4e22d9 100644
--- a/spring-boot-ops/src/test/java/org/baeldung/SpringBootMailIntegrationTest.java
+++ b/spring-mvc-simple-2/src/test/java/com/baeldung/SpringBootMailIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.baeldung.boot.Application;
 import org.junit.After;
diff --git a/spring-mvc-xml/README.md b/spring-mvc-xml/README.md
index b6a34475ea..bc530ba295 100644
--- a/spring-mvc-xml/README.md
+++ b/spring-mvc-xml/README.md
@@ -14,6 +14,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [web.xml vs Initializer with Spring](https://www.baeldung.com/spring-xml-vs-java-config)
 - [A Java Web Application Without a web.xml](https://www.baeldung.com/java-web-app-without-web-xml)
 - [Validating RequestParams and PathVariables in Spring](https://www.baeldung.com/spring-validate-requestparam-pathvariable)
-
+- [Debugging the Spring MVC 404 “No mapping found for HTTP request” Error](https://www.baeldung.com/spring-mvc-404-error)
 ## Spring MVC with XML Configuration Example Project
 - access a sample jsp page at: `http://localhost:8080/spring-mvc-xml/sample.html`
diff --git a/spring-remoting/remoting-hessian-burlap/README.md b/spring-remoting/remoting-hessian-burlap/README.md
index bf90c9676f..cacceddc5a 100644
--- a/spring-remoting/remoting-hessian-burlap/README.md
+++ b/spring-remoting/remoting-hessian-burlap/README.md
@@ -1,6 +1,9 @@
-## Spring Remoting with Hessian and Burlap Tutorial
+## Spring Remoting with Hessian and Burlap
+
+This module contains articles about Spring Remoting with Hessian and Burlap
 
 ### Relevant Articles
+
 - [Spring Remoting with Hessian and Burlap](http://www.baeldung.com/spring-remoting-hessian-burlap)
 
 ### Overview
diff --git a/spring-remoting/remoting-http/README.md b/spring-remoting/remoting-http/README.md
new file mode 100644
index 0000000000..a4f3ea82a9
--- /dev/null
+++ b/spring-remoting/remoting-http/README.md
@@ -0,0 +1,8 @@
+## Remoting HTTP
+
+This module contains articles about Spring Remoting over HTTP
+
+### Relevant Articles: 
+
+- [Intro to Spring Remoting with HTTP Invokers](https://www.baeldung.com/spring-remoting-http-invoker)
+
diff --git a/spring-remoting/remoting-jms/README.md b/spring-remoting/remoting-jms/README.md
new file mode 100644
index 0000000000..2f48a8f57f
--- /dev/null
+++ b/spring-remoting/remoting-jms/README.md
@@ -0,0 +1,8 @@
+## Remoting JMS
+
+This module contains articles about Spring Remoting with Java Message Service (JMS)
+
+### Relevant Articles:
+
+- [Spring Remoting with JMS and ActiveMQ](https://www.baeldung.com/spring-remoting-jms)
+
diff --git a/spring-remoting/remoting-rmi/README.md b/spring-remoting/remoting-rmi/README.md
new file mode 100644
index 0000000000..082b5c37ed
--- /dev/null
+++ b/spring-remoting/remoting-rmi/README.md
@@ -0,0 +1,7 @@
+## Remoting RMI
+
+This module contains articles about Spring Remoting with Remote Method Invocation (RMI)
+
+### Relevant Articles:
+
+- [Spring Remoting with RMI](https://www.baeldung.com/spring-remoting-rmi)
\ No newline at end of file
diff --git a/spring-rest-compress/pom.xml b/spring-rest-compress/pom.xml
index d5afc5708d..ca00bdc659 100644
--- a/spring-rest-compress/pom.xml
+++ b/spring-rest-compress/pom.xml
@@ -1,66 +1,65 @@
 <?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>
+    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-rest-compress</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-rest-compress</name>
+
     <parent>
         <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../parent-boot-2</relativePath>
     </parent>
-	<groupId>com.baeldung</groupId>
-	<artifactId>spring-rest-compress</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>spring-rest-compress</name>
 
-	<properties>
-		<java.version>1.8</java.version>
-		<commons-io.version>2.6</commons-io.version>
-	</properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-	<dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jetty</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-tomcat</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-jetty</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>${commons-io.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
+    <properties>
+        <java.version>1.8</java.version>
+        <commons-io.version>2.6</commons-io.version>
+    </properties>
 </project>
diff --git a/spring-rest-query-language/src/main/java/com/baeldung/web/controller/UserController.java b/spring-rest-query-language/src/main/java/com/baeldung/web/controller/UserController.java
index 101231c7ab..54e8618b27 100644
--- a/spring-rest-query-language/src/main/java/com/baeldung/web/controller/UserController.java
+++ b/spring-rest-query-language/src/main/java/com/baeldung/web/controller/UserController.java
@@ -61,7 +61,7 @@ public class UserController {
 
     @RequestMapping(method = RequestMethod.GET, value = "/users")
     @ResponseBody
-    public List<User> findAll(@RequestParam(value = "search", required = false) String search) {
+    public List<User> search(@RequestParam(value = "search", required = false) String search) {
         List<SearchCriteria> params = new ArrayList<SearchCriteria>();
         if (search != null) {
             Pattern pattern = Pattern.compile("(\\w+?)(:|<|>)(\\w+?),");
diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml
index 555eafe40a..93160a9936 100644
--- a/spring-rest/pom.xml
+++ b/spring-rest/pom.xml
@@ -150,6 +150,11 @@
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
+        </dependency>
 
     </dependencies>
 
@@ -276,6 +281,7 @@
         <json.path.version>2.2.0</json.path.version>
         <pact.version>3.5.11</pact.version>
         <rest-assured.version>3.1.0</rest-assured.version>
+        <httpclient.version>4.5.2</httpclient.version>
         <start-class>com.baeldung.sampleapp.config.MainApplication</start-class>
     </properties>
 
diff --git a/spring-rest/src/main/java/com/baeldung/web/log/app/Application.java b/spring-rest/src/main/java/com/baeldung/web/log/app/Application.java
index e9d451b55e..6e2607339c 100644
--- a/spring-rest/src/main/java/com/baeldung/web/log/app/Application.java
+++ b/spring-rest/src/main/java/com/baeldung/web/log/app/Application.java
@@ -1,9 +1,19 @@
 package com.baeldung.web.log.app;
 
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.web.context.ContextLoaderListener;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.servlet.DispatcherServlet;
+
+import com.baeldung.web.log.config.CustomeRequestLoggingFilter;
+
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @EnableAutoConfiguration
@@ -14,4 +24,18 @@ public class Application extends SpringBootServletInitializer {
     public static void main(final String[] args) {
         SpringApplication.run(Application.class, args);
     }
+    
+    @Override
+    public void onStartup(ServletContext container) throws ServletException {
+
+        AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
+        context.setConfigLocation("com.baeldung.web.log");
+        container.addListener(new ContextLoaderListener(context));
+
+        ServletRegistration.Dynamic dispatcher = container.addServlet("dispatcher", new DispatcherServlet(context));
+        dispatcher.setLoadOnStartup(1);
+        dispatcher.addMapping("/"); 
+
+        container.addFilter("customRequestLoggingFilter", CustomeRequestLoggingFilter.class).addMappingForServletNames(null, false, "dispatcher");
+    }
 }
\ No newline at end of file
diff --git a/spring-rest/src/main/java/com/baeldung/web/log/config/CustomeRequestLoggingFilter.java b/spring-rest/src/main/java/com/baeldung/web/log/config/CustomeRequestLoggingFilter.java
new file mode 100644
index 0000000000..3accb0a06e
--- /dev/null
+++ b/spring-rest/src/main/java/com/baeldung/web/log/config/CustomeRequestLoggingFilter.java
@@ -0,0 +1,12 @@
+package com.baeldung.web.log.config;
+
+import org.springframework.web.filter.CommonsRequestLoggingFilter;
+
+public class CustomeRequestLoggingFilter extends CommonsRequestLoggingFilter {
+
+  public CustomeRequestLoggingFilter() {
+      super.setIncludeQueryString(true);
+      super.setIncludePayload(true);
+      super.setMaxPayloadLength(10000);
+  }
+}
diff --git a/spring-rest/src/test/java/com/baeldung/web/controller/TaxiFareControllerIntegrationTest.java b/spring-rest/src/test/java/com/baeldung/web/controller/TaxiFareControllerIntegrationTest.java
new file mode 100644
index 0000000000..1cc098abf1
--- /dev/null
+++ b/spring-rest/src/test/java/com/baeldung/web/controller/TaxiFareControllerIntegrationTest.java
@@ -0,0 +1,35 @@
+package com.baeldung.web.controller;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.web.log.app.Application;
+import com.baeldung.web.log.data.TaxiRide;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = { Application.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class TaxiFareControllerIntegrationTest {
+    
+    @LocalServerPort
+    private int port;
+    
+    @Test
+    public void givenRequest_whenFetchTaxiFareRateCard_thanOK() {
+        
+        String URL = "http://localhost:" + port + "/spring-rest";
+        TestRestTemplate testRestTemplate = new TestRestTemplate();
+        TaxiRide taxiRide = new TaxiRide(true, 10l);
+        String fare = testRestTemplate.postForObject(
+          URL + "/taxifare/calculate/", 
+          taxiRide, String.class);
+      
+        assertThat(fare, equalTo("200"));
+    }
+}
\ No newline at end of file
diff --git a/spring-scheduling/README.md b/spring-scheduling/README.md
new file mode 100644
index 0000000000..2e3bb2b5e5
--- /dev/null
+++ b/spring-scheduling/README.md
@@ -0,0 +1,6 @@
+### Relevant articles:
+- [A Guide to the Spring Task Scheduler](http://www.baeldung.com/spring-task-scheduler)
+- [The @Scheduled Annotation in Spring](https://www.baeldung.com/spring-scheduled-tasks)
+- [Guide to Spring Retry](http://www.baeldung.com/spring-retry)
+- [How To Do @Async in Spring](http://www.baeldung.com/spring-async)
+
diff --git a/spring-scheduling/pom.xml b/spring-scheduling/pom.xml
new file mode 100644
index 0000000000..21327cf52f
--- /dev/null
+++ b/spring-scheduling/pom.xml
@@ -0,0 +1,45 @@
+<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-scheduling</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-scheduling</name>
+    <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>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <annotation-api.version>1.3.2</annotation-api.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-all/src/main/java/com/baeldung/scheduling/ScheduledFixedRateExample.java b/spring-scheduling/src/main/java/com/baeldung/scheduling/ScheduledFixedRateExample.java
similarity index 100%
rename from spring-all/src/main/java/com/baeldung/scheduling/ScheduledFixedRateExample.java
rename to spring-scheduling/src/main/java/com/baeldung/scheduling/ScheduledFixedRateExample.java
diff --git a/spring-all/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java b/spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java
similarity index 100%
rename from spring-all/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java
rename to spring-scheduling/src/main/java/com/baeldung/scheduling/SpringSchedulingFixedRateConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/async/AsyncComponent.java b/spring-scheduling/src/main/java/org/baeldung/async/AsyncComponent.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/async/AsyncComponent.java
rename to spring-scheduling/src/main/java/org/baeldung/async/AsyncComponent.java
diff --git a/spring-all/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java b/spring-scheduling/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java
rename to spring-scheduling/src/main/java/org/baeldung/async/CustomAsyncExceptionHandler.java
diff --git a/spring-all/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java b/spring-scheduling/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java
rename to spring-scheduling/src/main/java/org/baeldung/async/config/SpringAsyncConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java b/spring-scheduling/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java
similarity index 84%
rename from spring-all/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java
rename to spring-scheduling/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java
index 284bcf5e6a..23bbee3bc3 100644
--- a/spring-all/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java
+++ b/spring-scheduling/src/main/java/org/baeldung/scheduling/ScheduledAnnotationExample.java
@@ -31,9 +31,10 @@ public class ScheduledAnnotationExample {
         System.out.println("Fixed rate task - " + System.currentTimeMillis() / 1000);
     }
 
-    @Scheduled(fixedDelay = 1000, initialDelay = 100)
+    @Scheduled(fixedDelay = 1000, initialDelay = 1000)
     public void scheduleFixedRateWithInitialDelayTask() {
-        System.out.println("Fixed delay task with one second initial delay - " + System.currentTimeMillis() / 1000);
+        long now = System.currentTimeMillis() / 1000;
+        System.out.println("Fixed rate task with one second initial delay - " + now);
     }
 
     /**
@@ -41,7 +42,8 @@ public class ScheduledAnnotationExample {
      */
     @Scheduled(cron = "0 15 10 15 * ?")
     public void scheduleTaskUsingCronExpression() {
-        System.out.println("schedule tasks using cron expressions - " + System.currentTimeMillis() / 1000);
+        long now = System.currentTimeMillis() / 1000;
+        System.out.println("schedule tasks using cron jobs - " + now);
     }
 
     @Scheduled(cron = "${cron.expression}")
diff --git a/spring-all/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java b/spring-scheduling/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java
rename to spring-scheduling/src/main/java/org/baeldung/scheduling/SchedulingWithXmlConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java b/spring-scheduling/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java
rename to spring-scheduling/src/main/java/org/baeldung/scheduling/SpringSchedulingConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/springretry/AppConfig.java b/spring-scheduling/src/main/java/org/baeldung/springretry/AppConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springretry/AppConfig.java
rename to spring-scheduling/src/main/java/org/baeldung/springretry/AppConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java b/spring-scheduling/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java
rename to spring-scheduling/src/main/java/org/baeldung/springretry/DefaultListenerSupport.java
diff --git a/spring-all/src/main/java/org/baeldung/springretry/MyService.java b/spring-scheduling/src/main/java/org/baeldung/springretry/MyService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springretry/MyService.java
rename to spring-scheduling/src/main/java/org/baeldung/springretry/MyService.java
diff --git a/spring-all/src/main/java/org/baeldung/springretry/MyServiceImpl.java b/spring-scheduling/src/main/java/org/baeldung/springretry/MyServiceImpl.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/springretry/MyServiceImpl.java
rename to spring-scheduling/src/main/java/org/baeldung/springretry/MyServiceImpl.java
diff --git a/spring-all/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java b/spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
rename to spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerConfig.java
diff --git a/spring-all/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java b/spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
rename to spring-scheduling/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java
diff --git a/spring-all/src/main/resources/retryadvice.xml b/spring-scheduling/src/main/resources/retryadvice.xml
similarity index 97%
rename from spring-all/src/main/resources/retryadvice.xml
rename to spring-scheduling/src/main/resources/retryadvice.xml
index 8de7801a58..79a9fc8660 100644
--- a/spring-all/src/main/resources/retryadvice.xml
+++ b/spring-scheduling/src/main/resources/retryadvice.xml
@@ -7,7 +7,7 @@
                            http://www.springframework.org/schema/beans/spring-beans.xsd">
     <aop:config>
         <aop:pointcut id="transactional"
-            expression="execution(* com.baeldung.springretry..*MyService.defaultXmlRetryService(..))" />
+            expression="execution(* org.baeldung.springretry..*MyService.defaultXmlRetryService(..))" />
         <aop:advisor pointcut-ref="transactional" advice-ref="taskRetryAdvice" order="-1" />
     </aop:config>
 
diff --git a/spring-all/src/main/resources/springAsync-config.xml b/spring-scheduling/src/main/resources/springAsync-config.xml
similarity index 62%
rename from spring-all/src/main/resources/springAsync-config.xml
rename to spring-scheduling/src/main/resources/springAsync-config.xml
index 34e8b33f45..40fc40c79f 100644
--- a/spring-all/src/main/resources/springAsync-config.xml
+++ b/spring-scheduling/src/main/resources/springAsync-config.xml
@@ -1,7 +1,8 @@
 <?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:task="http://www.springframework.org/schema/task"
-    xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.2.xsd
+<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:task="http://www.springframework.org/schema/task"
+       xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.2.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
 >
diff --git a/spring-all/src/main/resources/springScheduled-config.xml b/spring-scheduling/src/main/resources/springScheduled-config.xml
similarity index 61%
rename from spring-all/src/main/resources/springScheduled-config.xml
rename to spring-scheduling/src/main/resources/springScheduled-config.xml
index 65566ee779..4078f535da 100644
--- a/spring-all/src/main/resources/springScheduled-config.xml
+++ b/spring-scheduling/src/main/resources/springScheduled-config.xml
@@ -1,7 +1,8 @@
 <?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:task="http://www.springframework.org/schema/task"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://www.springframework.org/schema/task"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns="http://www.springframework.org/schema/beans"
+       xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
 		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.2.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
@@ -14,12 +15,15 @@
 
     <bean id="myscheduler" class="org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler"/>
 
-    <!-- Configure the fixedDealy, fixedRate or cron based schduled tasks -->
+    <!-- Configure the fixedDealy, fixedRate or cron based scheduled tasks -->
     <bean id="schedulingWithXmlConfig" class="org.baeldung.scheduling.SchedulingWithXmlConfig"/>
 
     <task:scheduled-tasks scheduler="myScheduler">
-        <task:scheduled ref="schedulingWithXmlConfig" method="scheduleFixedDelayTask" fixed-delay="${fixedDelay.in.milliseconds}" initial-delay="1000"/>
-        <task:scheduled ref="schedulingWithXmlConfig" method="scheduleFixedRateTask" fixed-rate="${fixedRate.in.milliseconds}"/>
-        <task:scheduled ref="schedulingWithXmlConfig" method="scheduleTaskUsingCronExpression" cron="${cron.expression}"/>
+        <task:scheduled ref="schedulingWithXmlConfig" method="scheduleFixedDelayTask"
+                        fixed-delay="${fixedDelay.in.milliseconds}" initial-delay="1000"/>
+        <task:scheduled ref="schedulingWithXmlConfig" method="scheduleFixedRateTask"
+                        fixed-rate="${fixedRate.in.milliseconds}"/>
+        <task:scheduled ref="schedulingWithXmlConfig" method="scheduleTaskUsingCronExpression"
+                        cron="${cron.expression}"/>
     </task:scheduled-tasks>
 </beans>
\ No newline at end of file
diff --git a/spring-all/src/main/resources/springScheduled.properties b/spring-scheduling/src/main/resources/springScheduled.properties
similarity index 100%
rename from spring-all/src/main/resources/springScheduled.properties
rename to spring-scheduling/src/main/resources/springScheduled.properties
diff --git a/spring-all/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
rename to spring-scheduling/src/test/java/com/baeldung/scheduling/ScheduledFixedRateExampleIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java b/spring-scheduling/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
rename to spring-scheduling/src/test/java/org/baeldung/async/AsyncAnnotationExampleIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java b/spring-scheduling/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java
rename to spring-scheduling/src/test/java/org/baeldung/async/AsyncWithXMLIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java b/spring-scheduling/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
rename to spring-scheduling/src/test/java/org/baeldung/scheduling/ScheduledAnnotationExampleIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java b/spring-scheduling/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
rename to spring-scheduling/src/test/java/org/baeldung/scheduling/SchedulingWithXmlConfigIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java b/spring-scheduling/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java
rename to spring-scheduling/src/test/java/org/baeldung/springretry/SpringRetryIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java b/spring-scheduling/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
rename to spring-scheduling/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java
diff --git a/spring-security-core/pom.xml b/spring-security-core/pom.xml
index b144357e25..00d12ed7d2 100644
--- a/spring-security-core/pom.xml
+++ b/spring-security-core/pom.xml
@@ -4,7 +4,6 @@
     <groupId>com.baeldung</groupId>
     <artifactId>spring-security-core</artifactId>
     <version>0.1-SNAPSHOT</version>
-
     <name>spring-security-core</name>
     <packaging>war</packaging>
 
diff --git a/spring-security-mvc-boot/README.md b/spring-security-mvc-boot/README.md
index 7dcfe4d70f..a1056cc130 100644
--- a/spring-security-mvc-boot/README.md
+++ b/spring-security-mvc-boot/README.md
@@ -17,3 +17,5 @@ The "REST With Spring" Classes: http://github.learnspringsecurity.com
 - [Spring Security – Whitelist IP Range](https://www.baeldung.com/spring-security-whitelist-ip-range)
 - [Find the Registered Spring Security Filters](https://www.baeldung.com/spring-security-registered-filters)
 - [HTTPS using Self-Signed Certificate in Spring Boot](https://www.baeldung.com/spring-boot-https-self-signed-certificate)
+- [Spring Security: Exploring JDBC Authentication](https://www.baeldung.com/spring-security-jdbc-authentication)
+
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/jdbcauthentication/README.md b/spring-security-mvc-boot/src/main/java/org/baeldung/jdbcauthentication/README.md
deleted file mode 100644
index a7cdfec7d8..0000000000
--- a/spring-security-mvc-boot/src/main/java/org/baeldung/jdbcauthentication/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Relevant Articles:
-
-- [Spring Security: Exploring JDBC Authentication](https://www.baeldung.com/spring-security-jdbc-authentication)
diff --git a/spring-security-mvc-jsonview/pom.xml b/spring-security-mvc-jsonview/pom.xml
index a7f668ae8b..c21978203c 100644
--- a/spring-security-mvc-jsonview/pom.xml
+++ b/spring-security-mvc-jsonview/pom.xml
@@ -1,7 +1,6 @@
 <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-jsonview</artifactId>
     <version>0.1-SNAPSHOT</version>
@@ -16,7 +15,6 @@
     </parent>
 
     <dependencies>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -142,7 +140,6 @@
             <version>${json-path.version}</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -153,9 +150,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
         <plugins>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
@@ -200,15 +195,12 @@
                     </configuration>
                 </configuration>
             </plugin>
-
         </plugins>
-
     </build>
 
     <properties>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <json-path.version>2.4.0</json-path.version>
-
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-mvc-socket/pom.xml b/spring-security-mvc-socket/pom.xml
index f799a7fa9f..96031e02f7 100644
--- a/spring-security-mvc-socket/pom.xml
+++ b/spring-security-mvc-socket/pom.xml
@@ -2,7 +2,6 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>com.baeldung.springsecuredsockets</groupId>
     <artifactId>spring-security-mvc-socket</artifactId>
     <version>1.0.0</version>
@@ -151,35 +150,34 @@
         
         <!-- Test -->
         <dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<version>1.5.10.RELEASE</version>
-			<scope>test</scope>
-		</dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>1.5.10.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
-      
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.tomcat.maven</groupId>
-                    <artifactId>tomcat7-maven-plugin</artifactId>
-                    <version>2.2</version>
-                    <configuration>
-                        <path>/spring-security-mvc-socket</path>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>3.0.0</version>
-                    <configuration>
-                        <warSourceDirectory>src/main/webapp</warSourceDirectory>
-                        <failOnMissingWebXml>false</failOnMissingWebXml>
-                    </configuration>
-                </plugin>
-            </plugins>
-        <finalName>spring-security-mvc-socket</finalName>
+        <finalName>spring-security-mvc-socket</finalName>      
+        <plugins>
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <path>/spring-security-mvc-socket</path>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.0.0</version>
+                <configuration>
+                    <warSourceDirectory>src/main/webapp</warSourceDirectory>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <properties>
diff --git a/spring-security-mvc/src/main/java/com/baeldung/session/bean/Constants.java b/spring-security-mvc/src/main/java/com/baeldung/session/bean/Constants.java
new file mode 100644
index 0000000000..bf204c3b99
--- /dev/null
+++ b/spring-security-mvc/src/main/java/com/baeldung/session/bean/Constants.java
@@ -0,0 +1,5 @@
+package com.baeldung.session.bean;
+
+public class Constants {
+    public static final String FOO = "foo";
+}
diff --git a/spring-security-mvc/src/main/java/com/baeldung/session/bean/Foo.java b/spring-security-mvc/src/main/java/com/baeldung/session/bean/Foo.java
new file mode 100644
index 0000000000..c9c9c011d4
--- /dev/null
+++ b/spring-security-mvc/src/main/java/com/baeldung/session/bean/Foo.java
@@ -0,0 +1,29 @@
+package com.baeldung.session.bean;
+
+import static org.springframework.context.annotation.ScopedProxyMode.TARGET_CLASS;
+import static org.springframework.web.context.WebApplicationContext.SCOPE_SESSION;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = SCOPE_SESSION, proxyMode = TARGET_CLASS)
+public class Foo {
+    private final String created;
+
+    public Foo() {
+        this.created = LocalDateTime.now()
+            .format(DateTimeFormatter.ISO_DATE_TIME);
+    }
+
+    public Foo(Foo theFoo) {
+        this.created = theFoo.created;
+    }
+
+    public String getCreated() {
+        return created;
+    }
+}
diff --git a/spring-security-mvc/src/main/java/com/baeldung/session/security/config/SecSecurityConfig.java b/spring-security-mvc/src/main/java/com/baeldung/session/security/config/SecSecurityConfig.java
index 35b53a0e7f..9a4978c27e 100644
--- a/spring-security-mvc/src/main/java/com/baeldung/session/security/config/SecSecurityConfig.java
+++ b/spring-security-mvc/src/main/java/com/baeldung/session/security/config/SecSecurityConfig.java
@@ -38,7 +38,7 @@ public class SecSecurityConfig extends WebSecurityConfigurerAdapter {
         .csrf().disable()
         .authorizeRequests()
         .antMatchers("/anonymous*").anonymous()
-        .antMatchers("/login*","/invalidSession*", "/sessionExpired*").permitAll()
+        .antMatchers("/login*","/invalidSession*", "/sessionExpired*", "/foo/**").permitAll()
         .anyRequest().authenticated()
         .and()
         .formLogin()
diff --git a/spring-security-mvc/src/main/java/com/baeldung/session/web/FooController.java b/spring-security-mvc/src/main/java/com/baeldung/session/web/FooController.java
new file mode 100644
index 0000000000..7c3385dcbd
--- /dev/null
+++ b/spring-security-mvc/src/main/java/com/baeldung/session/web/FooController.java
@@ -0,0 +1,44 @@
+package com.baeldung.session.web;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import com.baeldung.session.bean.Constants;
+import com.baeldung.session.bean.Foo;
+
+@RestController
+@RequestMapping(path = "/foo")
+public class FooController {
+
+    @Autowired
+    private Foo theFoo;
+
+    @GetMapping(path = "set")
+    public void fooSet(HttpSession session) {
+        session.setAttribute(Constants.FOO, new Foo());
+    }
+
+    @GetMapping(path = "autowired")
+    public Foo getAutowired() {
+        return new Foo(theFoo);
+    }
+
+    @GetMapping(path = "inject")
+    public Foo fooInject(HttpSession session) {
+        return (Foo) session.getAttribute(Constants.FOO);
+    }
+
+    @GetMapping(path = "raw")
+    public Foo fromRaw() {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
+        HttpSession session = attr.getRequest()
+            .getSession(true);
+        return (Foo) session.getAttribute(Constants.FOO);
+    }
+}
diff --git a/spring-security-mvc/src/main/java/com/baeldung/session/web/SessionRestController.java b/spring-security-mvc/src/main/java/com/baeldung/session/web/SessionRestController.java
index 82199a9e4e..79f57246a9 100644
--- a/spring-security-mvc/src/main/java/com/baeldung/session/web/SessionRestController.java
+++ b/spring-security-mvc/src/main/java/com/baeldung/session/web/SessionRestController.java
@@ -3,15 +3,13 @@ package com.baeldung.session.web;
 import javax.servlet.http.HttpSession;
 
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 public class SessionRestController {
 
     @GetMapping("/session-max-interval")
-    @ResponseBody
-    public String retrieveMaxSessionIncativeInterval(HttpSession session) {
+    public String retrieveMaxSessionInactiveInterval(HttpSession session) {
         return "Max Inactive Interval before Session expires: " + session.getMaxInactiveInterval();
     }
 }
diff --git a/spring-security-mvc/src/main/resources/application.properties b/spring-security-mvc/src/main/resources/application.properties
index 56b2b7b123..6f0d0519ef 100644
--- a/spring-security-mvc/src/main/resources/application.properties
+++ b/spring-security-mvc/src/main/resources/application.properties
@@ -1,3 +1,5 @@
+spring.jackson.serialization.fail-on-empty-beans=false
+
 server.servlet.session.timeout=65s
 
 spring.mvc.view.prefix=/WEB-INF/view/
diff --git a/spring-security-mvc/src/main/resources/webSecurityConfig.xml b/spring-security-mvc/src/main/resources/webSecurityConfig.xml
index 42ff4c2186..e91755d394 100644
--- a/spring-security-mvc/src/main/resources/webSecurityConfig.xml
+++ b/spring-security-mvc/src/main/resources/webSecurityConfig.xml
@@ -7,7 +7,7 @@
         http://www.springframework.org/schema/beans/spring-beans.xsd"
 >
 
-    <http create-session="always" use-expressions="true">
+    <http create-session="always" use-expressions="true" disable-url-rewriting="true">
         <intercept-url pattern="/anonymous*" access="isAnonymous()"/>
         <intercept-url pattern="/login*" access="permitAll"/>
         <intercept-url pattern="/**" access="isAuthenticated()"/>
@@ -22,10 +22,9 @@
         <session-management invalid-session-url="/invalidSession.html">
             <concurrency-control max-sessions="2" expired-url="/sessionExpired.html"/>
         </session-management>
-
     </http>
 
-    <beans:bean id="myAuthenticationSuccessHandler" class="org.baeldung.security.MySimpleUrlAuthenticationSuccessHandler"/>
+    <beans:bean id="myAuthenticationSuccessHandler" class="com.baeldung.security.MySimpleUrlAuthenticationSuccessHandler"/>
 
     <authentication-manager>
         <authentication-provider>
diff --git a/spring-security-mvc/src/main/webapp/WEB-INF/web.xml b/spring-security-mvc/src/main/webapp/WEB-INF/web.xml
index 2ef734441b..88087c92ed 100644
--- a/spring-security-mvc/src/main/webapp/WEB-INF/web.xml
+++ b/spring-security-mvc/src/main/webapp/WEB-INF/web.xml
@@ -8,13 +8,14 @@
 
     <session-config>
         <session-timeout>1</session-timeout>
+        <tracking-mode>COOKIE</tracking-mode>
 <!--          <cookie-config>
             <http-only>true</http-only>
             <secure>true</secure>
         </cookie-config>  -->
     </session-config>
     <listener>
-        <listener-class>org.baeldung.web.SessionListenerWithMetrics</listener-class>
+        <listener-class>com.baeldung.web.SessionListenerWithMetrics</listener-class>
     </listener>
    <!--  <listener>
         <listener-class>org.springframework.security.web.session.HttpSessionEventPublisher</listener-class>
diff --git a/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController5.java b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/GetUserWithCustomInterfaceController.java
similarity index 88%
rename from spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController5.java
rename to spring-security-rest-custom/src/main/java/org/baeldung/web/controller/GetUserWithCustomInterfaceController.java
index e1a0c35cc6..b8521d6663 100644
--- a/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController5.java
+++ b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/GetUserWithCustomInterfaceController.java
@@ -9,12 +9,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
-public class SecurityController5 {
+public class GetUserWithCustomInterfaceController {
 
     @Autowired
     private IAuthenticationFacade authenticationFacade;
 
-    public SecurityController5() {
+    public GetUserWithCustomInterfaceController() {
         super();
     }
 
diff --git a/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController4.java b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/GetUserWithHTTPServletRequestController.java
similarity index 86%
rename from spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController4.java
rename to spring-security-rest-custom/src/main/java/org/baeldung/web/controller/GetUserWithHTTPServletRequestController.java
index 0434cc5fdc..ace5688697 100644
--- a/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController4.java
+++ b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/GetUserWithHTTPServletRequestController.java
@@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
-public class SecurityController4 {
+public class GetUserWithHTTPServletRequestController {
 
-    public SecurityController4() {
+    public GetUserWithHTTPServletRequestController() {
         super();
     }
 
diff --git a/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController2.java b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController.java
similarity index 88%
rename from spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController2.java
rename to spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController.java
index ac02738d0c..7cf57a5275 100644
--- a/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController2.java
+++ b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController.java
@@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
-public class SecurityController2 {
+public class SecurityController {
 
-    public SecurityController2() {
+    public SecurityController() {
         super();
     }
 
diff --git a/spring-security-thymeleaf/README.MD b/spring-security-thymeleaf/README.MD
index ad533faefd..e0fca4067c 100644
--- a/spring-security-thymeleaf/README.MD
+++ b/spring-security-thymeleaf/README.MD
@@ -4,4 +4,4 @@ This module contains articles about Spring Security with Thymeleaf.
 
 ### Relevant Articles: 
 
-- [Spring Security with Thymeleaf](https://www.baeldung.com/spring-security-thymeleaf)
+- [Spring Security with Thymeleaf](https://www.baeldung.com/spring-security-thymeleaf)
\ No newline at end of file
diff --git a/spring-all/src/test/resources/.gitignore b/spring-shell/.gitignore
similarity index 86%
rename from spring-all/src/test/resources/.gitignore
rename to spring-shell/.gitignore
index 83c05e60c8..786d76230c 100644
--- a/spring-all/src/test/resources/.gitignore
+++ b/spring-shell/.gitignore
@@ -10,4 +10,6 @@
 # Packaged files #
 *.jar
 *.war
-*.ear
\ No newline at end of file
+*.ear
+
+*-shell.log
\ No newline at end of file
diff --git a/spring-shell/README.md b/spring-shell/README.md
new file mode 100644
index 0000000000..2762f3a9c0
--- /dev/null
+++ b/spring-shell/README.md
@@ -0,0 +1,3 @@
+### Relevant articles:
+
+- [A CLI with Spring Shell](http://www.baeldung.com/spring-shell-cli)
diff --git a/spring-shell/pom.xml b/spring-shell/pom.xml
new file mode 100644
index 0000000000..1b6fe28fdd
--- /dev/null
+++ b/spring-shell/pom.xml
@@ -0,0 +1,28 @@
+<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-shell</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-shell</name>
+    <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>
+        <dependency>
+            <groupId>org.springframework.shell</groupId>
+            <artifactId>spring-shell</artifactId>
+            <version>${org.springframework.shell.version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <org.springframework.shell.version>1.2.0.RELEASE</org.springframework.shell.version>
+    </properties>
+
+</project>
diff --git a/spring-all/src/main/java/org/baeldung/shell/Main.java b/spring-shell/src/main/java/org/baeldung/shell/Main.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/shell/Main.java
rename to spring-shell/src/main/java/org/baeldung/shell/Main.java
diff --git a/spring-all/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java b/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java
rename to spring-shell/src/main/java/org/baeldung/shell/simple/SimpleBannerProvider.java
diff --git a/spring-all/src/main/java/org/baeldung/shell/simple/SimpleCLI.java b/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleCLI.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/shell/simple/SimpleCLI.java
rename to spring-shell/src/main/java/org/baeldung/shell/simple/SimpleCLI.java
diff --git a/spring-all/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java b/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
rename to spring-shell/src/main/java/org/baeldung/shell/simple/SimpleHistoryFileNameProvider.java
diff --git a/spring-all/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java b/spring-shell/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java
rename to spring-shell/src/main/java/org/baeldung/shell/simple/SimplePromptProvider.java
diff --git a/spring-all/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java b/spring-shell/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java
rename to spring-shell/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java
diff --git a/spring-all/src/main/resources/META-INF/spring/spring-shell-plugin.xml b/spring-shell/src/main/resources/META-INF/spring/spring-shell-plugin.xml
similarity index 81%
rename from spring-all/src/main/resources/META-INF/spring/spring-shell-plugin.xml
rename to spring-shell/src/main/resources/META-INF/spring/spring-shell-plugin.xml
index aea1a663c1..1b97ab3b59 100644
--- a/spring-all/src/main/resources/META-INF/spring/spring-shell-plugin.xml
+++ b/spring-shell/src/main/resources/META-INF/spring/spring-shell-plugin.xml
@@ -1,12 +1,13 @@
 <?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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
        xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd
       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd">
 
-    <context:component-scan base-package="org.baeldung.shell.simple" />
+    <context:component-scan base-package="org.baeldung.shell.simple"/>
 
 </beans>
\ No newline at end of file
diff --git a/spring-all/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java b/spring-shell/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java
rename to spring-shell/src/test/java/org/baeldung/shell/simple/SimpleCLIIntegrationTest.java
diff --git a/spring-all/.gitignore b/spring-shell/src/test/resources/.gitignore
similarity index 100%
rename from spring-all/.gitignore
rename to spring-shell/src/test/resources/.gitignore
diff --git a/spring-thymeleaf-2/README.md b/spring-thymeleaf-2/README.md
index ce83032cb5..22a73f06e1 100644
--- a/spring-thymeleaf-2/README.md
+++ b/spring-thymeleaf-2/README.md
@@ -3,3 +3,5 @@
 - [Working with Enums in Thymeleaf](https://www.baeldung.com/thymeleaf-enums)
 - [Changing the Thymeleaf Template Directory in Spring Boot](https://www.baeldung.com/spring-thymeleaf-template-directory)
 - [Spring Request Parameters with Thymeleaf](https://www.baeldung.com/spring-thymeleaf-request-parameters)
+- [Thymeleaf lists Utility Object](https://www.baeldung.com/thymeleaf-lists-utility)
+
diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Detail.java b/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Detail.java
new file mode 100644
index 0000000000..e9a95f133c
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Detail.java
@@ -0,0 +1,28 @@
+package com.baeldung.thymeleaf.pathvariables;
+
+public class Detail {
+    private int id;
+    private String description;
+    
+    public Detail(int id, String description) {
+        super();
+        this.id = id;
+        this.description = description;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }    
+}
diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Item.java b/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Item.java
new file mode 100644
index 0000000000..173c107846
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Item.java
@@ -0,0 +1,39 @@
+package com.baeldung.thymeleaf.pathvariables;
+
+import java.util.List;
+
+public class Item {
+    private int id;
+    private String name;
+    private List<Detail> details;
+
+    public Item(int id, String name) {
+        super();
+        this.id = id;
+        this.name = name;
+    }
+
+    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 List<Detail> getDetails() {
+        return details;
+    }
+
+    public void setDetails(List<Detail> details) {
+        this.details = details;
+    }
+}
diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/PathVariablesController.java b/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/PathVariablesController.java
new file mode 100644
index 0000000000..fde8bf1533
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/PathVariablesController.java
@@ -0,0 +1,62 @@
+package com.baeldung.thymeleaf.pathvariables;
+
+import java.util.ArrayList;
+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.PathVariable;
+
+@Controller
+public class PathVariablesController {
+    private List<Item> items = new ArrayList<Item>();
+    
+    public PathVariablesController() {
+        Item item1 = new Item(1, "First Item");
+        List<Detail> item1Details = new ArrayList<>();
+        item1Details.add(new Detail(1, "Green"));
+        item1Details.add(new Detail(2, "Large"));
+        item1.setDetails(item1Details);
+        items.add(item1);
+        
+        Item item2 = new Item(2, "Second Item");
+        List<Detail> item2Details = new ArrayList<>();
+        item2Details.add(new Detail(1, "Red"));
+        item2Details.add(new Detail(2, "Medium"));
+        item2.setDetails(item2Details);
+        items.add(item2);
+    }
+
+    @GetMapping("/pathvars")
+    public String start(Model model) {        
+        model.addAttribute("items", items);
+        return "pathvariables/index";
+    }
+    
+    @GetMapping("/pathvars/single/{id}")
+    public String singlePathVariable(@PathVariable("id") int id, Model model) {
+        if (id == 1) {
+            model.addAttribute("item", new Item(1, "First Item"));
+        } else {
+            model.addAttribute("item", new Item(2, "Second Item"));
+        }
+        
+        return "pathvariables/view";
+    }
+    
+    @GetMapping("/pathvars/item/{itemId}/detail/{detailId}")
+    public String multiplePathVariable(@PathVariable("itemId") int itemId, @PathVariable("detailId") int detailId, Model model) {
+        for (Item item : items) {
+            if (item.getId() == itemId) {
+                model.addAttribute("item", item);
+                for (Detail detail : item.getDetails()) {
+                    if (detail.getId() == detailId) {
+                        model.addAttribute("detail", detail);
+                    }
+                }
+            }
+        }
+        return "pathvariables/view";
+    }
+}
diff --git a/spring-thymeleaf-2/src/main/resources/templates/pathvariables/index.html b/spring-thymeleaf-2/src/main/resources/templates/pathvariables/index.html
new file mode 100644
index 0000000000..a3e34dcba1
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/resources/templates/pathvariables/index.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="UTF-8">
+<title>PathVariables in Thymeleaf</title>
+</head>
+<body>
+    <h3>Items</h3>
+    <div th:each="item : ${items}">
+        <a th:href="@{/pathvars/single/{id}(id = ${item.id})}">
+            <span th:text="${item.name}"></span>
+        </a>
+        <ul>
+            <li th:each="detail : ${item.details}">
+                <a th:href="@{/pathvars/item/{itemId}/detail/{detailId}(itemId = ${item.id}, detailId = ${detail.id})}">
+                    <span th:text="${detail.description}"></span>
+                </a>
+            </li>
+        </ul>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-thymeleaf-2/src/main/resources/templates/pathvariables/view.html b/spring-thymeleaf-2/src/main/resources/templates/pathvariables/view.html
new file mode 100644
index 0000000000..f635c1113c
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/resources/templates/pathvariables/view.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="UTF-8">
+<title>Pathvariables in Thymeleaf</title>
+</head>
+<body>
+    <h3>View Item</h3>
+    <div>
+        <label for="name">Name: </label>
+        <span th:text="${item.name}"></span>
+    </div>
+    <h4 th:if="${detail}">Detail</h4>
+    <div th:if="${detail}">
+        <label for="description">Description: </label>
+        <span th:text="${detail.description}"></span>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/README.md b/testing-modules/junit-5-advanced/README.md
index 61a65b2e5a..9dfa676c5c 100644
--- a/testing-modules/junit-5-advanced/README.md
+++ b/testing-modules/junit-5-advanced/README.md
@@ -2,3 +2,5 @@
 
 - [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)
+- [@TestInstance Annotation in JUnit 5](https://www.baeldung.com/junit-testinstance-annotation)
+
diff --git a/testing-modules/mocks/pom.xml b/testing-modules/mocks/pom.xml
index bf75cfc3a2..cbda386af8 100644
--- a/testing-modules/mocks/pom.xml
+++ b/testing-modules/mocks/pom.xml
@@ -1,55 +1,62 @@
-<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>mocks</artifactId>
-    <name>mocks</name>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.github.javafaker</groupId>
-            <artifactId>javafaker</artifactId>
-            <version>${javafaker.version}</version>
-        </dependency>
- <dependency>
-            <groupId>org.jmockit</groupId>
-            <artifactId>jmockit</artifactId>
-            <version>${jmockit.version}</version>
-            <scope>test</scope>
-        </dependency>
-  <dependency>
-            <groupId>org.jukito</groupId>
-            <artifactId>jukito</artifactId>
-            <version>${jukito.version}</version>
-            <scope>test</scope>
-        </dependency>
- <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>${easymock.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <javafaker.version>0.15</javafaker.version>
-        <jukito.version>1.5</jukito.version>
-<mockito.version>2.21.0</mockito.version>
-        <easymock.version>3.5.1</easymock.version>
-        <jmockit.version>1.41</jmockit.version>
-    </properties>
-
-</project>
+<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>mocks</artifactId>
+    <name>mocks</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.github.javafaker</groupId>
+            <artifactId>javafaker</artifactId>
+            <version>${javafaker.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jmockit</groupId>
+            <artifactId>jmockit</artifactId>
+            <version>${jmockit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jukito</groupId>
+            <artifactId>jukito</artifactId>
+            <version>${jukito.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>${easymock.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.jimfs</groupId>
+            <artifactId>jimfs</artifactId>
+            <version>${jimf.version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <javafaker.version>0.15</javafaker.version>
+        <jukito.version>1.5</jukito.version>
+        <mockito.version>2.21.0</mockito.version>
+        <easymock.version>3.5.1</easymock.version>
+        <jmockit.version>1.41</jmockit.version>
+        <jimf.version>1.1</jimf.version>
+    </properties>
+
+</project>
diff --git a/testing-modules/mocks/src/main/java/com/baeldung/jimfs/FileManipulation.java b/testing-modules/mocks/src/main/java/com/baeldung/jimfs/FileManipulation.java
new file mode 100644
index 0000000000..ae163b094f
--- /dev/null
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jimfs/FileManipulation.java
@@ -0,0 +1,19 @@
+package com.baeldung.jimfs;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+
+public class FileManipulation {
+
+    void move(final Path origin, final Path destination) {
+        try {
+            Files.createDirectories(destination);
+            Files.move(origin, destination, StandardCopyOption.REPLACE_EXISTING);
+        } catch (final IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+    }
+}
diff --git a/testing-modules/mocks/src/main/java/com/baeldung/jimfs/FilePathReader.java b/testing-modules/mocks/src/main/java/com/baeldung/jimfs/FilePathReader.java
new file mode 100644
index 0000000000..9c5371910e
--- /dev/null
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jimfs/FilePathReader.java
@@ -0,0 +1,18 @@
+package com.baeldung.jimfs;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Path;
+
+class FilePathReader {
+
+    String getSystemPath(final Path path) {
+        try {
+            return path
+              .toRealPath()
+              .toString();
+        } catch (final IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+    }
+}
diff --git a/testing-modules/mocks/src/main/java/com/baeldung/jimfs/FileRepository.java b/testing-modules/mocks/src/main/java/com/baeldung/jimfs/FileRepository.java
new file mode 100644
index 0000000000..55bd87ee81
--- /dev/null
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jimfs/FileRepository.java
@@ -0,0 +1,43 @@
+package com.baeldung.jimfs;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class FileRepository {
+
+    void create(final Path path, final String fileName) {
+        final Path filePath = path.resolve(fileName);
+        try {
+            Files.createFile(filePath);
+        } catch (final IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+    }
+
+    String read(final Path path) {
+        try {
+            return new String(Files.readAllBytes(path));
+        } catch (final IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+    }
+
+    String update(final Path path, final String newContent) {
+        try {
+            Files.write(path, newContent.getBytes());
+            return newContent;
+        } catch (final IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+    }
+
+    void delete(final Path path) {
+        try {
+            Files.deleteIfExists(path);
+        } catch (final IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+    }
+}
diff --git a/testing-modules/mocks/src/test/java/com/baeldung/jimfs/FileManipulationUnitTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jimfs/FileManipulationUnitTest.java
new file mode 100644
index 0000000000..05f3405e57
--- /dev/null
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jimfs/FileManipulationUnitTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.jimfs;
+
+import com.google.common.jimfs.Configuration;
+import com.google.common.jimfs.Jimfs;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.nio.file.FileSystem;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class FileManipulationUnitTest implements FileTestProvider {
+
+    private final FileManipulation fileManipulation = new FileManipulation();
+
+    private static Stream<Arguments> provideFileSystem() {
+        return Stream.of(Arguments.of(Jimfs.newFileSystem(Configuration.unix())), Arguments.of(Jimfs.newFileSystem(Configuration.windows())), Arguments.of(Jimfs.newFileSystem(Configuration.osX())));
+    }
+
+    @ParameterizedTest
+    @DisplayName("Should move file to new destination")
+    @MethodSource("provideFileSystem")
+    void givenEachSystem_whenMovingFile_thenMovedToNewPath(final FileSystem fileSystem) throws Exception {
+        final Path origin = fileSystem.getPath(RESOURCE_FILE_NAME);
+        Files.copy(getResourceFilePath(), origin);
+        final Path destination = fileSystem.getPath("newDirectory", RESOURCE_FILE_NAME);
+
+        fileManipulation.move(origin, destination);
+
+        assertFalse(Files.exists(origin));
+        assertTrue(Files.exists(destination));
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/mocks/src/test/java/com/baeldung/jimfs/FilePathReaderUnitTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jimfs/FilePathReaderUnitTest.java
new file mode 100644
index 0000000000..f95b76a86d
--- /dev/null
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jimfs/FilePathReaderUnitTest.java
@@ -0,0 +1,48 @@
+package com.baeldung.jimfs;
+
+import com.google.common.jimfs.Configuration;
+import com.google.common.jimfs.Jimfs;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.FileSystem;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class FilePathReaderUnitTest {
+
+    private static final String DIRECTORY_NAME = "baeldung";
+
+    private final FilePathReader filePathReader = new FilePathReader();
+
+    @Test
+    @DisplayName("Should get path on windows")
+    void givenWindowsSystem_shouldGetPath_thenReturnWindowsPath() throws Exception {
+        final FileSystem fileSystem = Jimfs.newFileSystem(Configuration.windows());
+        final Path path = getPathToFile(fileSystem);
+
+        final String stringPath = filePathReader.getSystemPath(path);
+
+        assertEquals("C:\\work\\" + DIRECTORY_NAME, stringPath);
+    }
+
+    @Test
+    @DisplayName("Should get path on unix")
+    void givenUnixSystem_shouldGetPath_thenReturnUnixPath() throws Exception {
+        final FileSystem fileSystem = Jimfs.newFileSystem(Configuration.unix());
+        final Path path = getPathToFile(fileSystem);
+
+        final String stringPath = filePathReader.getSystemPath(path);
+
+        assertEquals("/work/" + DIRECTORY_NAME, stringPath);
+    }
+
+    private Path getPathToFile(final FileSystem fileSystem) throws Exception {
+        final Path path = fileSystem.getPath(DIRECTORY_NAME);
+        Files.createDirectory(path);
+
+        return path;
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/mocks/src/test/java/com/baeldung/jimfs/FileRepositoryUnitTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jimfs/FileRepositoryUnitTest.java
new file mode 100644
index 0000000000..c72c2f1a1f
--- /dev/null
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jimfs/FileRepositoryUnitTest.java
@@ -0,0 +1,67 @@
+package com.baeldung.jimfs;
+
+import com.google.common.jimfs.Configuration;
+import com.google.common.jimfs.Jimfs;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.FileSystem;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class FileRepositoryUnitTest implements FileTestProvider {
+
+    private final FileRepository fileRepository = new FileRepository();
+
+    @Test
+    @DisplayName("Should create a file on a file system")
+    void givenUnixSystem_whenCreatingFile_thenCreatedInPath() {
+        final FileSystem fileSystem = Jimfs.newFileSystem(Configuration.unix());
+        final String fileName = "newFile.txt";
+        final Path pathToStore = fileSystem.getPath("");
+
+        fileRepository.create(pathToStore, fileName);
+
+        assertTrue(Files.exists(pathToStore.resolve(fileName)));
+    }
+
+    @Test
+    @DisplayName("Should read the content of the file")
+    void givenOSXSystem_whenReadingFile_thenContentIsReturned() throws Exception {
+        final FileSystem fileSystem = Jimfs.newFileSystem(Configuration.osX());
+        final Path resourceFilePath = fileSystem.getPath(RESOURCE_FILE_NAME);
+        Files.copy(getResourceFilePath(), resourceFilePath);
+
+        final String content = fileRepository.read(resourceFilePath);
+
+        assertEquals(FILE_CONTENT, content);
+    }
+
+    @Test
+    @DisplayName("Should update the content of the file")
+    void givenWindowsSystem_whenUpdatingFile_thenContentHasChanged() throws Exception {
+        final FileSystem fileSystem = Jimfs.newFileSystem(Configuration.windows());
+        final Path resourceFilePath = fileSystem.getPath(RESOURCE_FILE_NAME);
+        Files.copy(getResourceFilePath(), resourceFilePath);
+        final String newContent = "I'm updating you.";
+
+        final String content = fileRepository.update(resourceFilePath, newContent);
+
+        assertEquals(newContent, content);
+        assertEquals(newContent, fileRepository.read(resourceFilePath));
+    }
+
+    @Test
+    @DisplayName("Should delete file")
+    void givenCurrentSystem_whenDeletingFile_thenFileHasBeenDeleted() throws Exception {
+        final FileSystem fileSystem = Jimfs.newFileSystem();
+        final Path resourceFilePath = fileSystem.getPath(RESOURCE_FILE_NAME);
+        Files.copy(getResourceFilePath(), resourceFilePath);
+
+        fileRepository.delete(resourceFilePath);
+
+        assertFalse(Files.exists(resourceFilePath));
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/mocks/src/test/java/com/baeldung/jimfs/FileTestProvider.java b/testing-modules/mocks/src/test/java/com/baeldung/jimfs/FileTestProvider.java
new file mode 100644
index 0000000000..51b584ee8c
--- /dev/null
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jimfs/FileTestProvider.java
@@ -0,0 +1,16 @@
+package com.baeldung.jimfs;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public interface FileTestProvider {
+    String FILE_CONTENT = "I'm the file content.";
+    String RESOURCE_FILE_NAME = "fileRepositoryRead.txt";
+
+    default Path getResourceFilePath() {
+        final String resourceFilePath = getClass()
+          .getResource("/" + RESOURCE_FILE_NAME)
+          .getPath();
+        return Paths.get(resourceFilePath);
+    }
+}
diff --git a/testing-modules/mocks/src/test/resources/fileRepositoryRead.txt b/testing-modules/mocks/src/test/resources/fileRepositoryRead.txt
new file mode 100644
index 0000000000..b63f63cdd6
--- /dev/null
+++ b/testing-modules/mocks/src/test/resources/fileRepositoryRead.txt
@@ -0,0 +1 @@
+I'm the file content.
\ No newline at end of file
diff --git a/testing-modules/spring-testing/pom.xml b/testing-modules/spring-testing/pom.xml
index 8a76dc903c..15431cfb77 100644
--- a/testing-modules/spring-testing/pom.xml
+++ b/testing-modules/spring-testing/pom.xml
@@ -84,6 +84,11 @@
             <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${junit.commons.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
@@ -112,7 +117,8 @@
         <!-- testing -->
         <hamcrest.version>2.0.0.0</hamcrest.version>
         <awaitility.version>3.1.6</awaitility.version>
-        <junit.jupiter.version>5.4.0</junit.jupiter.version>
+        <junit.jupiter.version>5.5.0</junit.jupiter.version>
+        <junit.commons.version>1.5.2</junit.commons.version>
         <spring.version>5.1.4.RELEASE</spring.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <javax.persistence.version>2.1.1</javax.persistence.version>
diff --git a/testing-modules/spring-testing/src/test/java/com/baeldung/dirtiescontext/DirtiesContextIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/dirtiescontext/DirtiesContextIntegrationTest.java
index f3e7b8c228..7afd4a22d4 100644
--- a/testing-modules/spring-testing/src/test/java/com/baeldung/dirtiescontext/DirtiesContextIntegrationTest.java
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/dirtiescontext/DirtiesContextIntegrationTest.java
@@ -10,10 +10,12 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.MethodMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @TestMethodOrder(OrderAnnotation.class)
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = SpringDataRestApplication.class)
+@EnableWebMvc
 class DirtiesContextIntegrationTest {
 
     @Autowired
diff --git a/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/ProfilePropertySourceResolverIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/ProfilePropertySourceResolverIntegrationTest.java
index 95d83420b7..815b628f0a 100644
--- a/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/ProfilePropertySourceResolverIntegrationTest.java
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/ProfilePropertySourceResolverIntegrationTest.java
@@ -1,21 +1,25 @@
 package com.baeldung.overrideproperties;
 
-import com.baeldung.overrideproperties.resolver.PropertySourceResolver;
+import static org.junit.Assert.assertEquals;
+
 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.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
-import static org.junit.Assert.assertEquals;
+import com.baeldung.overrideproperties.resolver.PropertySourceResolver;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @ActiveProfiles("test")
+@EnableWebMvc
 public class ProfilePropertySourceResolverIntegrationTest {
 
-    @Autowired private PropertySourceResolver propertySourceResolver;
+    @Autowired
+    private PropertySourceResolver propertySourceResolver;
 
     @Test
     public void shouldProfiledProperty_overridePropertyValues() {
diff --git a/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/SpringBootPropertySourceResolverIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/SpringBootPropertySourceResolverIntegrationTest.java
index 573a46dd5f..d00aa51e6c 100644
--- a/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/SpringBootPropertySourceResolverIntegrationTest.java
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/SpringBootPropertySourceResolverIntegrationTest.java
@@ -1,18 +1,22 @@
 package com.baeldung.overrideproperties;
 
-import com.baeldung.overrideproperties.resolver.PropertySourceResolver;
 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.junit4.SpringRunner;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+
+import com.baeldung.overrideproperties.resolver.PropertySourceResolver;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(properties = { "example.firstProperty=annotation" })
+@EnableWebMvc
 public class SpringBootPropertySourceResolverIntegrationTest {
 
-    @Autowired private PropertySourceResolver propertySourceResolver;
+    @Autowired
+    private PropertySourceResolver propertySourceResolver;
 
     @Test
     public void shouldSpringBootTestAnnotation_overridePropertyValues() {
diff --git a/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/TestResourcePropertySourceResolverIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/TestResourcePropertySourceResolverIntegrationTest.java
index c724713854..dc15851277 100644
--- a/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/TestResourcePropertySourceResolverIntegrationTest.java
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/TestResourcePropertySourceResolverIntegrationTest.java
@@ -1,19 +1,23 @@
 package com.baeldung.overrideproperties;
 
-import com.baeldung.overrideproperties.resolver.PropertySourceResolver;
+import static org.junit.Assert.assertEquals;
+
 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.junit4.SpringRunner;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
-import static org.junit.Assert.assertEquals;
+import com.baeldung.overrideproperties.resolver.PropertySourceResolver;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
+@EnableWebMvc
 public class TestResourcePropertySourceResolverIntegrationTest {
 
-    @Autowired private PropertySourceResolver propertySourceResolver;
+    @Autowired
+    private PropertySourceResolver propertySourceResolver;
 
     @Test
     public void shouldTestResourceFile_overridePropertyValues() {
diff --git a/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java b/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
index fcc646e8ea..1fa7f241e7 100644
--- a/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
+++ b/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
@@ -25,7 +25,7 @@ public class MockAnnotationUnitTest {
     }
     
     @Test
-    public void givenCountMethodOfLocalMockVariableMocked_WhenCountInvoked_ThenMockedValueReturned() {
+    public void givenCountMethodMocked_WhenCountInvoked_ThenMockedValueReturned() {
         UserRepository localMockRepository = Mockito.mock(UserRepository.class);
         Mockito.when(localMockRepository.count()).thenReturn(111L);
 
diff --git a/twitter4j/README.md b/twitter4j/README.md
index 8c9ee92348..e7295fe809 100644
--- a/twitter4j/README.md
+++ b/twitter4j/README.md
@@ -1,6 +1,6 @@
 ## Twitter4J
 
-This module contains articles about Twitter4J
+This module contains articles about Twitter4J.
 
 ### Relevant articles
 
diff --git a/vaadin/README.md b/vaadin/README.md
index 1d570d1f58..92ee8b938e 100644
--- a/vaadin/README.md
+++ b/vaadin/README.md
@@ -1,4 +1,8 @@
-## Relevant articles:
+## Vaadin
+
+This module contains articles about Vaadin. 
+
+### Relevant articles:
 
 - [Introduction to Vaadin](https://www.baeldung.com/vaadin)
 - [Sample Application with Spring Boot and Vaadin](https://www.baeldung.com/spring-boot-vaadin)
diff --git a/vavr/README.md b/vavr/README.md
index 6832f78a62..2b8bb25356 100644
--- a/vavr/README.md
+++ b/vavr/README.md
@@ -1,3 +1,7 @@
+## Vavr
+
+This module contains articles about Vavr.
+
 ### Relevant Articles:
 - [Introduction to Vavr](https://www.baeldung.com/vavr)
 - [Guide to Try in Vavr](https://www.baeldung.com/vavr-try)
diff --git a/wildfly/pom.xml b/wildfly/pom.xml
index bd2c93a633..d7dd1e835b 100644
--- a/wildfly/pom.xml
+++ b/wildfly/pom.xml
@@ -4,8 +4,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.springframework</groupId>
-    <artifactId>gs-spring-boot-wildfly</artifactId>
+    <artifactId>wildfly</artifactId>
     <version>0.1.0</version>
+    <name>wildfly</name>
 
     <packaging>war</packaging>
 
@@ -38,11 +39,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <scope>provided</scope>
-            </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <!-- end::tests[] -->
     </dependencies>
 
diff --git a/xml/README.md b/xml/README.md
index d1aa3a798b..b609a1e078 100644
--- a/xml/README.md
+++ b/xml/README.md
@@ -10,3 +10,5 @@ This module contains articles about eXtensible Markup Language (XML)
 - [Write an org.w3.dom.Document to a File](https://www.baeldung.com/java-write-xml-document-file)
 - [Modifying an XML Attribute in Java](https://www.baeldung.com/java-modify-xml-attribute)
 - [Convert XML to HTML in Java](https://www.baeldung.com/java-convert-xml-to-html)
+- [Parsing an XML File Using StAX](https://www.baeldung.com/java-stax)
+