diff --git a/.project b/.project
new file mode 100644
index 0000000000..594b00d611
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>parent-modules</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/apache-fop/pom.xml b/apache-fop/pom.xml
index 7d1968cf58..40dc03a7a1 100644
--- a/apache-fop/pom.xml
+++ b/apache-fop/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+	<groupId>com.baeldung</groupId>
 	<artifactId>apache-fop</artifactId>
 	<version>0.1-SNAPSHOT</version>
 
diff --git a/core-java-8/pom.xml b/core-java-8/pom.xml
index e350e42694..016bc171d4 100644
--- a/core-java-8/pom.xml
+++ b/core-java-8/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>core-java8</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/core-java/pom.xml b/core-java/pom.xml
index 33c8fb72e1..33ce787acb 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>core-java</artifactId>
-    <version>0.1-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
 
     <name>core-java</name>
 
diff --git a/gson-jackson-performance/pom.xml b/gson-jackson-performance/pom.xml
index 1a65ed54a0..1ea43bd7fa 100644
--- a/gson-jackson-performance/pom.xml
+++ b/gson-jackson-performance/pom.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.baeldung</groupId>
+	<groupId>com.baeldung</groupId>
 	<artifactId>gson-jackson-performance</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
diff --git a/gson/pom.xml b/gson/pom.xml
index 34796bd994..edf3e03669 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>gson</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/guava/pom.xml b/guava/pom.xml
index e3868b2786..08ee0640f7 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>guava</artifactId>
-    <version>0.1-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
 
     <name>guava</name>
 
diff --git a/guava18/pom.xml b/guava18/pom.xml
index 21f4697a73..6002b37d74 100644
--- a/guava18/pom.xml
+++ b/guava18/pom.xml
@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.baeldung</groupId>
-    <artifactId>guava</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>guava18</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/guava19/pom.xml b/guava19/pom.xml
index 97c1b0ea4e..13f3b471f1 100644
--- a/guava19/pom.xml
+++ b/guava19/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.baeldung</groupId>
-    <artifactId>guava</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>guava19</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -25,6 +23,7 @@
             <version>1.3</version>
         </dependency>
     </dependencies>
+    
     <build>
         <plugins>
             <plugin>
diff --git a/handling-spring-static-resources/pom.xml b/handling-spring-static-resources/pom.xml
index 4e12d2c49e..b7c5d9dbe0 100644
--- a/handling-spring-static-resources/pom.xml
+++ b/handling-spring-static-resources/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-static-resources</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <packaging>war</packaging>
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
index 79adbf0674..affe4f4777 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>httpclient</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/jackson/pom.xml b/jackson/pom.xml
index 2421abe7ec..911e0b4168 100644
--- a/jackson/pom.xml
+++ b/jackson/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>jackson</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/javaxval/bin/pom.xml b/javaxval/bin/pom.xml
index 592f3c3431..7606f0d072 100644
--- a/javaxval/bin/pom.xml
+++ b/javaxval/bin/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	 <groupId>org.baeldung</groupId>
+	 <groupId>com.baeldung</groupId>
 	<artifactId>javaxval</artifactId>
 	 <version>0.1-SNAPSHOT</version>
 
diff --git a/javaxval/pom.xml b/javaxval/pom.xml
index 775dcb50e8..493119d92e 100644
--- a/javaxval/pom.xml
+++ b/javaxval/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>javaxval</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/mockito/pom.xml b/mockito/pom.xml
index 7863e0a477..e7951df787 100644
--- a/mockito/pom.xml
+++ b/mockito/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>mockito</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000..1bf6edfb4f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,35 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>parent-modules</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <name>parent-modules</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>apache-fop</module>
+        <module>core-java</module>
+        <module>core-java-8</module>
+        <module>gson</module>
+        <!-- <module>gson-jackson-performance</module> -->
+        <module>guava</module>
+        <module>guava18</module>
+        <module>guava19</module>
+        <module>handling-spring-static-resources</module>
+        <module>httpclient</module>
+        <module>jackson</module>
+        <module>javaxval</module>
+        <module>json-path</module>
+        <module>mockito</module>
+        <!-- <module>persistence-jpa</module> -->
+        <module>querydsl</module>
+        <!-- <module>raml</module> -->
+        <module>rest-testing</module>
+        <!-- <module>resteasy</module> -->
+        
+    </modules>
+
+</project>
+
+<!-- <module></module> -->
\ No newline at end of file
diff --git a/querydsl/pom.xml b/querydsl/pom.xml
index 4efb5dcb8b..ab9de9c004 100644
--- a/querydsl/pom.xml
+++ b/querydsl/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>querydsl</artifactId>
     <version>0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
diff --git a/rest-testing/pom.xml b/rest-testing/pom.xml
index 430ebcc96f..907ac0fd08 100644
--- a/rest-testing/pom.xml
+++ b/rest-testing/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>rest-testing</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-all/pom.xml b/spring-all/pom.xml
index 6ce8ad7196..10cfc9fa2f 100644
--- a/spring-all/pom.xml
+++ b/spring-all/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-all</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-batch/pom.xml b/spring-batch/pom.xml
index c85aeff6f3..5538dd912f 100644
--- a/spring-batch/pom.xml
+++ b/spring-batch/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-batch</artifactId>
     <version>0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index 3a116a2974..bedab2391e 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-boot</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml
index 7e21859b5d..f60090cdfd 100644
--- a/spring-data-cassandra/pom.xml
+++ b/spring-data-cassandra/pom.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.baeldung</groupId>
+	<groupId>com.baeldung</groupId>
 	<artifactId>spring-data-cassandra</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
diff --git a/spring-data-elasticsearch/pom.xml b/spring-data-elasticsearch/pom.xml
index 7ac6dd0fcf..f1179bd445 100644
--- a/spring-data-elasticsearch/pom.xml
+++ b/spring-data-elasticsearch/pom.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.baeldung</groupId>
+	<groupId>com.baeldung</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml
index 558af930b3..a92831d65b 100644
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-data-mongodb</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
diff --git a/spring-data-redis/pom.xml b/spring-data-redis/pom.xml
index 98da69934c..5f457d7e44 100644
--- a/spring-data-redis/pom.xml
+++ b/spring-data-redis/pom.xml
@@ -2,7 +2,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.baeldung</groupId>
+  <groupId>com.baeldung</groupId>
   <artifactId>sprint-data-redis</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml
index 324b7475b3..fd09a929bb 100644
--- a/spring-exceptions/pom.xml
+++ b/spring-exceptions/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-exceptions</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml
index d88358168f..589ca80886 100644
--- a/spring-hibernate3/pom.xml
+++ b/spring-hibernate3/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-hibernate3</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml
index 2e8f818776..70255c7a5f 100644
--- a/spring-jpa/pom.xml
+++ b/spring-jpa/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-jpa</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/mockito-mocks-spring-beans/.classpath b/spring-mockito/.classpath
similarity index 100%
rename from mockito-mocks-spring-beans/.classpath
rename to spring-mockito/.classpath
diff --git a/mockito-mocks-spring-beans/.gitignore b/spring-mockito/.gitignore
similarity index 100%
rename from mockito-mocks-spring-beans/.gitignore
rename to spring-mockito/.gitignore
diff --git a/mockito-mocks-spring-beans/.project b/spring-mockito/.project
similarity index 100%
rename from mockito-mocks-spring-beans/.project
rename to spring-mockito/.project
diff --git a/mockito-mocks-spring-beans/README.md b/spring-mockito/README.md
similarity index 100%
rename from mockito-mocks-spring-beans/README.md
rename to spring-mockito/README.md
diff --git a/mockito-mocks-spring-beans/pom.xml b/spring-mockito/pom.xml
similarity index 100%
rename from mockito-mocks-spring-beans/pom.xml
rename to spring-mockito/pom.xml
diff --git a/mockito-mocks-spring-beans/src/main/java/com/baeldung/MocksApplication.java b/spring-mockito/src/main/java/com/baeldung/MocksApplication.java
similarity index 100%
rename from mockito-mocks-spring-beans/src/main/java/com/baeldung/MocksApplication.java
rename to spring-mockito/src/main/java/com/baeldung/MocksApplication.java
diff --git a/mockito-mocks-spring-beans/src/main/java/com/baeldung/NameService.java b/spring-mockito/src/main/java/com/baeldung/NameService.java
similarity index 100%
rename from mockito-mocks-spring-beans/src/main/java/com/baeldung/NameService.java
rename to spring-mockito/src/main/java/com/baeldung/NameService.java
diff --git a/mockito-mocks-spring-beans/src/main/java/com/baeldung/UserService.java b/spring-mockito/src/main/java/com/baeldung/UserService.java
similarity index 100%
rename from mockito-mocks-spring-beans/src/main/java/com/baeldung/UserService.java
rename to spring-mockito/src/main/java/com/baeldung/UserService.java
diff --git a/mockito-mocks-spring-beans/src/main/resources/application.properties b/spring-mockito/src/main/resources/application.properties
similarity index 100%
rename from mockito-mocks-spring-beans/src/main/resources/application.properties
rename to spring-mockito/src/main/resources/application.properties
diff --git a/mockito-mocks-spring-beans/src/test/java/com/baeldung/NameServiceTestConfiguration.java b/spring-mockito/src/test/java/com/baeldung/NameServiceTestConfiguration.java
similarity index 100%
rename from mockito-mocks-spring-beans/src/test/java/com/baeldung/NameServiceTestConfiguration.java
rename to spring-mockito/src/test/java/com/baeldung/NameServiceTestConfiguration.java
diff --git a/mockito-mocks-spring-beans/src/test/java/com/baeldung/UserServiceTest.java b/spring-mockito/src/test/java/com/baeldung/UserServiceTest.java
similarity index 100%
rename from mockito-mocks-spring-beans/src/test/java/com/baeldung/UserServiceTest.java
rename to spring-mockito/src/test/java/com/baeldung/UserServiceTest.java
diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml
index d9a578cb8c..b699fd4526 100644
--- a/spring-mvc-java/pom.xml
+++ b/spring-mvc-java/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-mvc-java</artifactId>
     <version>0.1-SNAPSHOT</version>
     <name>spring-mvc-java</name>
diff --git a/spring-mvc-no-xml/pom.xml b/spring-mvc-no-xml/pom.xml
index da71a699db..47f010d05f 100644
--- a/spring-mvc-no-xml/pom.xml
+++ b/spring-mvc-no-xml/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <version>0.1-SNAPSHOT</version>
     <artifactId>spring-mvc-no-xml</artifactId>
 
diff --git a/spring-openid/pom.xml b/spring-openid/pom.xml
index daec685b4d..39cf3e9d4e 100644
--- a/spring-openid/pom.xml
+++ b/spring-openid/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-openid</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
diff --git a/spring-quartz/pom.xml b/spring-quartz/pom.xml
index ce286f3d1f..709cfb9e3d 100644
--- a/spring-quartz/pom.xml
+++ b/spring-quartz/pom.xml
@@ -3,7 +3,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.baeldung</groupId>
+	<groupId>com.baeldung</groupId>
 	<artifactId>spring-quartz</artifactId>
 	<name>spring-quartz</name>
 	<version>0.0.1-SNAPSHOT</version>
diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml
index 54ac868b95..118c544fae 100644
--- a/spring-rest/pom.xml
+++ b/spring-rest/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-rest</artifactId>
     <version>0.1-SNAPSHOT</version>
     <name>spring-rest</name>
diff --git a/spring-security-basic-auth/pom.xml b/spring-security-basic-auth/pom.xml
index 1e15cd5b53..bbcb93a484 100644
--- a/spring-security-basic-auth/pom.xml
+++ b/spring-security-basic-auth/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-security-mvc-basic-auth</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml
index b5f71847f5..d53cd51764 100644
--- a/spring-security-mvc-custom/pom.xml
+++ b/spring-security-mvc-custom/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-security-mvc-custom</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml
index dc2c4d80a5..8490a67314 100644
--- a/spring-security-mvc-digest-auth/pom.xml
+++ b/spring-security-mvc-digest-auth/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-security-mvc-digest-auth</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-security-mvc-ldap/pom.xml b/spring-security-mvc-ldap/pom.xml
index 79894d4867..b001a86955 100644
--- a/spring-security-mvc-ldap/pom.xml
+++ b/spring-security-mvc-ldap/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-security-mvc-ldap</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-security-mvc-login/pom.xml b/spring-security-mvc-login/pom.xml
index ee6b37743b..d369d90bc9 100644
--- a/spring-security-mvc-login/pom.xml
+++ b/spring-security-mvc-login/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-security-mvc-login</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-security-mvc-persisted-remember-me/pom.xml b/spring-security-mvc-persisted-remember-me/pom.xml
index 1691f10f43..b01b07d150 100644
--- a/spring-security-mvc-persisted-remember-me/pom.xml
+++ b/spring-security-mvc-persisted-remember-me/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.baeldung</groupId>
+	<groupId>com.baeldung</groupId>
 	<artifactId>spring-security-mvc-persisted-remember-me</artifactId>
 	<version>0.1-SNAPSHOT</version>
 
diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc-session/pom.xml
index fd90be6cc8..5898d48934 100644
--- a/spring-security-mvc-session/pom.xml
+++ b/spring-security-mvc-session/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-security-mvc-session</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-security-rest-basic-auth/pom.xml b/spring-security-rest-basic-auth/pom.xml
index 767edb7778..a8ce5be2c6 100644
--- a/spring-security-rest-basic-auth/pom.xml
+++ b/spring-security-rest-basic-auth/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-security-rest-basic-auth</artifactId>
     <version>0.2-SNAPSHOT</version>
 
diff --git a/spring-security-rest-custom/pom.xml b/spring-security-rest-custom/pom.xml
index 702302b199..18342df607 100644
--- a/spring-security-rest-custom/pom.xml
+++ b/spring-security-rest-custom/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-security-rest-custom</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-security-rest-digest-auth/pom.xml b/spring-security-rest-digest-auth/pom.xml
index 88e760458b..44d10b15e3 100644
--- a/spring-security-rest-digest-auth/pom.xml
+++ b/spring-security-rest-digest-auth/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-security-rest-digest-auth</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml
index c549ceee84..ae02738ff5 100644
--- a/spring-security-rest-full/pom.xml
+++ b/spring-security-rest-full/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-security-rest-full</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml
index 265da0bbcd..e8cb433102 100644
--- a/spring-security-rest/pom.xml
+++ b/spring-security-rest/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-security-rest</artifactId>
     <version>0.1-SNAPSHOT</version>
 
diff --git a/spring-zuul/pom.xml b/spring-zuul/pom.xml
index 09af259e3b..96085182b6 100644
--- a/spring-zuul/pom.xml
+++ b/spring-zuul/pom.xml
@@ -1,6 +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>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-zuul</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/spring-zuul/spring-zuul-foos-resource/pom.xml b/spring-zuul/spring-zuul-foos-resource/pom.xml
index 6d5e0e52cf..56ca1959ca 100644
--- a/spring-zuul/spring-zuul-foos-resource/pom.xml
+++ b/spring-zuul/spring-zuul-foos-resource/pom.xml
@@ -6,7 +6,7 @@
 	<packaging>war</packaging>
 
 	<parent>
-		<groupId>org.baeldung</groupId>
+		<groupId>com.baeldung</groupId>
 		<artifactId>spring-zuul</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
diff --git a/spring-zuul/spring-zuul-ui/pom.xml b/spring-zuul/spring-zuul-ui/pom.xml
index 65a025f849..9eaf4b7c45 100644
--- a/spring-zuul/spring-zuul-ui/pom.xml
+++ b/spring-zuul/spring-zuul-ui/pom.xml
@@ -6,7 +6,7 @@
     <packaging>war</packaging>
 
     <parent>
-        <groupId>org.baeldung</groupId>
+        <groupId>com.baeldung</groupId>
         <artifactId>spring-zuul</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>