diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml
index 7407666309..a75af414cd 100644
--- a/javax-servlets/pom.xml
+++ b/javax-servlets/pom.xml
@@ -3,7 +3,6 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.baeldung</groupId>
     <artifactId>javax-servlets</artifactId>
     <version>1.0-SNAPSHOT</version>
 
@@ -13,8 +12,6 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-
-
     <dependencies>
 
         <dependency>
@@ -35,6 +32,12 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.0.5.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <properties>
diff --git a/spring-boot-bootstrap/pom.xml b/spring-boot-bootstrap/pom.xml
index eb97d6d426..ad2512846b 100644
--- a/spring-boot-bootstrap/pom.xml
+++ b/spring-boot-bootstrap/pom.xml
@@ -5,7 +5,6 @@
 
     <groupId>org.baeldung</groupId>
     <artifactId>spring-boot-bootstrap</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>spring-boot-bootstrap</name>
diff --git a/spring-mvc-simple/pom.xml b/spring-mvc-simple/pom.xml
index 10d267aeb5..4e7f39bad3 100644
--- a/spring-mvc-simple/pom.xml
+++ b/spring-mvc-simple/pom.xml
@@ -1,17 +1,17 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
     <artifactId>spring-mvc-simple</artifactId>
     <packaging>war</packaging>
     <version>0.0.1-SNAPSHOT</version>
     <name>Spring MVC simple Maven Webapp</name>
     <url>http://maven.apache.org</url>
-	<parent>
-	    <groupId>com.baeldung</groupId>
-	    <artifactId>parent-modules</artifactId>
-	    <version>1.0.0-SNAPSHOT</version>
-	 </parent>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -19,7 +19,7 @@
         <springframework.version>5.0.2.RELEASE</springframework.version>
         <maven-war-plugin.version>3.2.0</maven-war-plugin.version>
         <maven.compiler.version>3.7.0</maven.compiler.version>
-        <maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <jstl.version>1.2</jstl.version>
         <javax.servlet.jsp-api.version>2.3.2-b02</javax.servlet.jsp-api.version>
         <javax.servlet-api.version>4.0.0</javax.servlet-api.version>
@@ -172,6 +172,14 @@
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${maven-surefire-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>default-test</id>
+                            <configuration>
+                                <skip>true</skip>
+                            </configuration>
+                        </execution>
+                    </executions>
                     <dependencies>
                         <dependency>
                             <groupId>org.junit.platform</groupId>
diff --git a/spring-boot-bootstrap/src/main/java/org/baeldung/ForwardedServlet.java b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/ForwardedServlet.java
similarity index 94%
rename from spring-boot-bootstrap/src/main/java/org/baeldung/ForwardedServlet.java
rename to spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/ForwardedServlet.java
index e42da22852..222ed16c17 100644
--- a/spring-boot-bootstrap/src/main/java/org/baeldung/ForwardedServlet.java
+++ b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/ForwardedServlet.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung.spring.servlets;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
diff --git a/spring-boot-bootstrap/src/main/java/org/baeldung/HelloServlet.java b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/HelloServlet.java
similarity index 94%
rename from spring-boot-bootstrap/src/main/java/org/baeldung/HelloServlet.java
rename to spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/HelloServlet.java
index 63673143d6..89bfca795f 100644
--- a/spring-boot-bootstrap/src/main/java/org/baeldung/HelloServlet.java
+++ b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/HelloServlet.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung.spring.servlets;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
diff --git a/spring-boot-bootstrap/src/main/java/org/baeldung/RedirectedServlet.java b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/RedirectedServlet.java
similarity index 94%
rename from spring-boot-bootstrap/src/main/java/org/baeldung/RedirectedServlet.java
rename to spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/RedirectedServlet.java
index 6d4b1ebce9..3074eec018 100644
--- a/spring-boot-bootstrap/src/main/java/org/baeldung/RedirectedServlet.java
+++ b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/RedirectedServlet.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung.spring.servlets;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
diff --git a/spring-boot-bootstrap/src/main/java/org/baeldung/WelcomeServlet.java b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/WelcomeServlet.java
similarity index 93%
rename from spring-boot-bootstrap/src/main/java/org/baeldung/WelcomeServlet.java
rename to spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/WelcomeServlet.java
index b4a51fc4dc..6f9ee8e7c4 100644
--- a/spring-boot-bootstrap/src/main/java/org/baeldung/WelcomeServlet.java
+++ b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/WelcomeServlet.java
@@ -1,5 +1,4 @@
-package org.baeldung;
-
+package com.baeldung.spring.servlets;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
diff --git a/spring-boot-bootstrap/src/test/java/org/baeldung/HelloServletTest.java b/spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/HelloServletTest.java
similarity index 84%
rename from spring-boot-bootstrap/src/test/java/org/baeldung/HelloServletTest.java
rename to spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/HelloServletTest.java
index 93e52cf0be..e8dd8f1b73 100644
--- a/spring-boot-bootstrap/src/test/java/org/baeldung/HelloServletTest.java
+++ b/spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/HelloServletTest.java
@@ -1,13 +1,12 @@
-package org.baeldung;
+package com.baeldung.spring.servlets;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-
 import javax.servlet.ServletException;
 import java.io.IOException;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class HelloServletTest {
     @Test
@@ -16,9 +15,9 @@ public class HelloServletTest {
         request.addParameter("name", "Dennis");
         MockHttpServletResponse response = new MockHttpServletResponse();
         HelloServlet servlet = new HelloServlet();
-        
+
         servlet.doGet(request, response);
-        
+
         assertEquals("/forwarded", response.getForwardedUrl());
         assertEquals(200, response.getStatus());
     }
diff --git a/spring-boot-bootstrap/src/test/java/org/baeldung/WelcomeServletTest.java b/spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/WelcomeServletTest.java
similarity index 85%
rename from spring-boot-bootstrap/src/test/java/org/baeldung/WelcomeServletTest.java
rename to spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/WelcomeServletTest.java
index a52b2a5c01..9ec177a452 100644
--- a/spring-boot-bootstrap/src/test/java/org/baeldung/WelcomeServletTest.java
+++ b/spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/WelcomeServletTest.java
@@ -1,13 +1,12 @@
-package org.baeldung;
+package com.baeldung.spring.servlets;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-
 import javax.servlet.ServletException;
 import java.io.IOException;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class WelcomeServletTest {
     @Test