diff --git a/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebApp.java b/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebApp.java
deleted file mode 100644
index 583d083c1c..0000000000
--- a/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebApp.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.baeldung.servlet;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration.Dynamic;
-
-import org.springframework.web.WebApplicationInitializer;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
-
-public class WebApp implements WebApplicationInitializer {
-
-    public WebApp() {
-        super();
-    }
-
-    // API
-
-    @Override
-    public void onStartup(final ServletContext servletContext) throws ServletException {
-        final AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext();
-        root.setServletContext(servletContext);
-        root.scan("org.baeldung.spring");
-        root.refresh();
-
-        final Dynamic servlet = servletContext.addServlet("mvc", new DispatcherServlet(root));
-        servlet.setLoadOnStartup(1);
-        servlet.addMapping("/");
-    }
-
-}
diff --git a/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppNew.java b/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppNew.java
new file mode 100644
index 0000000000..81a74b5616
--- /dev/null
+++ b/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppNew.java
@@ -0,0 +1,29 @@
+package org.baeldung.servlet;
+
+import org.baeldung.spring.ClientWebConfig;
+import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
+
+public class WebAppNew extends AbstractAnnotationConfigDispatcherServletInitializer {
+
+    public WebAppNew() {
+        super();
+    }
+
+    // API
+
+    @Override
+    protected Class<?>[] getRootConfigClasses() {
+        return null;
+    }
+
+    @Override
+    protected Class<?>[] getServletConfigClasses() {
+        return new Class<?>[] { ClientWebConfig.class };
+    }
+
+    @Override
+    protected String[] getServletMappings() {
+        return new String[] { "/" };
+    }
+
+}
diff --git a/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/NewWebApp.java b/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppOld.java
similarity index 52%
rename from spring-mvc-no-xml/src/main/java/org/baeldung/servlet/NewWebApp.java
rename to spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppOld.java
index a0181aedaa..155597e888 100644
--- a/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/NewWebApp.java
+++ b/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppOld.java
@@ -1,9 +1,9 @@
 package org.baeldung.servlet;
 
+
+//public class WebApp implements WebApplicationInitializer {
 //
-//public class NewWebApp extends AbstractAnnotationConfigDispatcherServletInitializer {
-//
-//    public NewWebApp() {
+//    public WebApp() {
 //        super();
 //    }
 //
@@ -18,23 +18,7 @@ package org.baeldung.servlet;
 //
 //        final Dynamic servlet = servletContext.addServlet("mvc", new DispatcherServlet(root));
 //        servlet.setLoadOnStartup(1);
-//        servlet.addMapping("/*");
+//        servlet.addMapping("/");
 //    }
 //
-//    @Override
-//    protected Class<?>[] getRootConfigClasses() {
-//        return null;
-//    }
-//
-//    @Override
-//    protected Class<?>[] getServletConfigClasses() {
-//        return new Class<?>[] { ClientWebConfig.class };
-//    }
-//
-//    @Override
-//    protected String[] getServletMappings() {
-//        return new String[] { "/*" };
-//    }
-//
-//}
-
+// }