diff --git a/.gitignore b/.gitignore
index 248cbeae5d..90daf38dee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,7 @@ out/
 .DS_Store
 
 # Maven
-log/
+log/*
 target/
 
 # Gradle
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-sorting/README.md b/algorithms-sorting/README.md
index f19705f113..4fd9d5e0c6 100644
--- a/algorithms-sorting/README.md
+++ b/algorithms-sorting/README.md
@@ -12,3 +12,7 @@ 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)
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/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-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-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-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-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/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-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-jvm/README.md b/core-java-modules/core-java-jvm/README.md
index 82067ad952..a1a57c83c5 100644
--- a/core-java-modules/core-java-jvm/README.md
+++ b/core-java-modules/core-java-jvm/README.md
@@ -4,3 +4,5 @@
 
 ### Relevant Articles: 
 - [Method Inlining in the JVM](https://www.baeldung.com/jvm-method-inlining)
+- [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-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-oop-2/README.md b/core-java-modules/core-java-lang-oop-2/README.md
index e2c30bbb40..f387e8d4a2 100644
--- a/core-java-modules/core-java-lang-oop-2/README.md
+++ b/core-java-modules/core-java-lang-oop-2/README.md
@@ -14,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/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 f9fa49ee0d..c4f5049d61 100644
--- a/core-java-modules/core-java-lang-operators/README.md
+++ b/core-java-modules/core-java-lang-operators/README.md
@@ -5,3 +5,5 @@
 - [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-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-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-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-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-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/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/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/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/java-dates/README.md b/java-dates/README.md
index 3a215f9094..2c962ece64 100644
--- a/java-dates/README.md
+++ b/java-dates/README.md
@@ -30,3 +30,4 @@
 - [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)
+- [Convert String to Date in Java](https://www.baeldung.com/java-string-to-date)
diff --git a/java-strings-2/README.md b/java-strings-2/README.md
index 82f33997c5..9865019f74 100644
--- a/java-strings-2/README.md
+++ b/java-strings-2/README.md
@@ -8,14 +8,12 @@ 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)
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..3b00cd11ed 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,6 @@ 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/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/README.md b/java-strings/README.md
index 1faa11f606..3146b54fa8 100644
--- a/java-strings/README.md
+++ b/java-strings/README.md
@@ -4,21 +4,16 @@ 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/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/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/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/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/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/pom.xml b/pom.xml
index e44c939a26..a00190c874 100644
--- a/pom.xml
+++ b/pom.xml
@@ -428,6 +428,8 @@
                 <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</module>
                 <module>core-java-modules/core-java-jvm</module>
                 <module>core-scala</module>
@@ -594,6 +596,7 @@
 
 				<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>
@@ -605,6 +608,7 @@
 				
 				<module>spring-boot-nashorn</module>
 				<module>java-blockchain</module>
+				<module>wildfly</module>
 			
 			</modules>
 
@@ -681,6 +685,7 @@
 				<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>
@@ -1044,6 +1049,8 @@
 				<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>
@@ -1184,6 +1191,8 @@
 				<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-scala</module>
 				<module>couchbase</module>
 				<module>custom-pmd</module>
@@ -1602,6 +1611,8 @@
 
 				<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>
 
diff --git a/spring-5-reactive-client/README.md b/spring-5-reactive-client/README.md
index 97afeccb64..221c333d5b 100644
--- a/spring-5-reactive-client/README.md
+++ b/spring-5-reactive-client/README.md
@@ -7,4 +7,5 @@ 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-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-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-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/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-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/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-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-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-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/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/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>