diff --git a/libraries/src/test/java/com/baeldung/eclipsecollections/CollectPatternTest.java b/libraries/src/test/java/com/baeldung/eclipsecollections/CollectPatternTest.java
index f1c665f085..ee384c2f9d 100644
--- a/libraries/src/test/java/com/baeldung/eclipsecollections/CollectPatternTest.java
+++ b/libraries/src/test/java/com/baeldung/eclipsecollections/CollectPatternTest.java
@@ -2,7 +2,6 @@ package com.baeldung.eclipsecollections;
 
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.impl.list.mutable.FastList;
-import static org.junit.Assert.assertEquals;
 
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
diff --git a/libraries/src/test/java/com/baeldung/eclipsecollections/FlatCollectTest.java b/libraries/src/test/java/com/baeldung/eclipsecollections/FlatCollectTest.java
index 9190625993..021c72e91e 100644
--- a/libraries/src/test/java/com/baeldung/eclipsecollections/FlatCollectTest.java
+++ b/libraries/src/test/java/com/baeldung/eclipsecollections/FlatCollectTest.java
@@ -3,7 +3,6 @@ package com.baeldung.eclipsecollections;
 import org.assertj.core.api.Assertions;
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.impl.list.mutable.FastList;
-import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/libraries/src/test/java/com/baeldung/eclipsecollections/ZipTest.java b/libraries/src/test/java/com/baeldung/eclipsecollections/ZipTest.java
index 56ae8d2133..29f0c23954 100644
--- a/libraries/src/test/java/com/baeldung/eclipsecollections/ZipTest.java
+++ b/libraries/src/test/java/com/baeldung/eclipsecollections/ZipTest.java
@@ -4,7 +4,6 @@ import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.tuple.Pair;
 import org.eclipse.collections.impl.factory.Lists;
 import org.eclipse.collections.impl.tuple.Tuples;
-import static org.junit.Assert.assertEquals;
 
 import org.assertj.core.api.Assertions;
 import org.junit.Before;
diff --git a/libraries/src/test/java/com/baeldung/eclipsecollections/ZipWithIndexTest.java b/libraries/src/test/java/com/baeldung/eclipsecollections/ZipWithIndexTest.java
index d6f9846fe0..a2d8be44ec 100644
--- a/libraries/src/test/java/com/baeldung/eclipsecollections/ZipWithIndexTest.java
+++ b/libraries/src/test/java/com/baeldung/eclipsecollections/ZipWithIndexTest.java
@@ -1,7 +1,5 @@
 package com.baeldung.eclipsecollections;
 
-import static org.junit.Assert.assertEquals;
-
 import org.assertj.core.api.Assertions;
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.tuple.Pair;
diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index 2a1de00039..0cf7df86cd 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -52,7 +52,7 @@
             <scope>test</scope>		
         </dependency>
         
-        <dependency>
+<!--         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
             <version>${tomcat.version}</version>
@@ -62,7 +62,7 @@
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-jasper</artifactId>
             <version>${tomcat.version}</version>
-        </dependency>
+        </dependency> -->
 
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
diff --git a/spring-boot/src/main/java/com/baeldung/servlets/props/PropertySourcesLoader.java b/spring-boot/src/main/java/com/baeldung/servlets/props/PropertySourcesLoader.java
index 56a6751326..aa70bac777 100644
--- a/spring-boot/src/main/java/com/baeldung/servlets/props/PropertySourcesLoader.java
+++ b/spring-boot/src/main/java/com/baeldung/servlets/props/PropertySourcesLoader.java
@@ -9,7 +9,7 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;
 
 @Configuration
-@ComponentScan(basePackages = { "com.baeldung.*" })
+@ComponentScan(basePackages = { "com.baeldung.servlets.*" })
 @PropertySource("classpath:custom.properties") public class PropertySourcesLoader {
 
     private static final Logger log = LoggerFactory.getLogger(PropertySourcesLoader.class);
diff --git a/spring-boot/src/main/java/com/baeldung/utils/Application.java b/spring-boot/src/main/java/com/baeldung/utils/UtilsApplication.java
similarity index 83%
rename from spring-boot/src/main/java/com/baeldung/utils/Application.java
rename to spring-boot/src/main/java/com/baeldung/utils/UtilsApplication.java
index 9d5d75bce2..b63ada9eee 100644
--- a/spring-boot/src/main/java/com/baeldung/utils/Application.java
+++ b/spring-boot/src/main/java/com/baeldung/utils/UtilsApplication.java
@@ -10,11 +10,11 @@ import com.baeldung.autoconfiguration.MySQLAutoconfiguration;
 
 @SpringBootApplication(exclude=MySQLAutoconfiguration.class)
 @ComponentScan(basePackages="com.baeldung.utils")
-public class Application {
+public class UtilsApplication {
 
 	@RolesAllowed("*")
 	public static void main(String[] args) {
-            SpringApplication.run(Application.class, args);
+            SpringApplication.run(UtilsApplication.class, args);
 	}
 
 }
diff --git a/spring-boot/src/main/webapp/WEB-INF/context.xml b/spring-boot/src/main/webapp/WEB-INF/context.xml
index 263bed4430..32f11f78f6 100644
--- a/spring-boot/src/main/webapp/WEB-INF/context.xml
+++ b/spring-boot/src/main/webapp/WEB-INF/context.xml
@@ -6,7 +6,7 @@
                            http://www.springframework.org/schema/context
                            http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
-    <context:component-scan base-package="com.baeldung"/>
+    <context:component-scan base-package="com.baeldung.servlets"/>
 
-    <bean class="com.baeldung.configuration.WebAppInitializer"/>
+    <bean class="com.baeldung.servlets.configuration.WebAppInitializer"/>
 </beans>
\ No newline at end of file
diff --git a/spring-boot/src/main/webapp/WEB-INF/dispatcher.xml b/spring-boot/src/main/webapp/WEB-INF/dispatcher.xml
index ade8e66777..54e62921be 100644
--- a/spring-boot/src/main/webapp/WEB-INF/dispatcher.xml
+++ b/spring-boot/src/main/webapp/WEB-INF/dispatcher.xml
@@ -7,7 +7,7 @@
    http://www.springframework.org/schema/context
    http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-    <context:component-scan base-package="com.baeldung"/>
+    <context:component-scan base-package="com.baeldung.servlets"/>
 
     <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
         <property name="prefix" value="/WEB-INF/jsp/"/>