diff --git a/jee7schedule/README.md b/jee7/README.md
similarity index 100%
rename from jee7schedule/README.md
rename to jee7/README.md
diff --git a/jee7schedule/pom.xml b/jee7/pom.xml
similarity index 100%
rename from jee7schedule/pom.xml
rename to jee7/pom.xml
diff --git a/jee7schedule/src/main/java/com/baeldung/timer/AutomaticTimerBean.java b/jee7/src/main/java/com/baeldung/timer/AutomaticTimerBean.java
similarity index 100%
rename from jee7schedule/src/main/java/com/baeldung/timer/AutomaticTimerBean.java
rename to jee7/src/main/java/com/baeldung/timer/AutomaticTimerBean.java
diff --git a/jee7schedule/src/main/java/com/baeldung/timer/FixedDelayTimerBean.java b/jee7/src/main/java/com/baeldung/timer/FixedDelayTimerBean.java
similarity index 100%
rename from jee7schedule/src/main/java/com/baeldung/timer/FixedDelayTimerBean.java
rename to jee7/src/main/java/com/baeldung/timer/FixedDelayTimerBean.java
diff --git a/jee7schedule/src/main/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBean.java b/jee7/src/main/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBean.java
similarity index 100%
rename from jee7schedule/src/main/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBean.java
rename to jee7/src/main/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBean.java
diff --git a/jee7schedule/src/main/java/com/baeldung/timer/ProgrammaticTimerBean.java b/jee7/src/main/java/com/baeldung/timer/ProgrammaticTimerBean.java
similarity index 100%
rename from jee7schedule/src/main/java/com/baeldung/timer/ProgrammaticTimerBean.java
rename to jee7/src/main/java/com/baeldung/timer/ProgrammaticTimerBean.java
diff --git a/jee7schedule/src/main/java/com/baeldung/timer/ProgrammaticWithInitialFixedDelayTimerBean.java b/jee7/src/main/java/com/baeldung/timer/ProgrammaticWithInitialFixedDelayTimerBean.java
similarity index 100%
rename from jee7schedule/src/main/java/com/baeldung/timer/ProgrammaticWithInitialFixedDelayTimerBean.java
rename to jee7/src/main/java/com/baeldung/timer/ProgrammaticWithInitialFixedDelayTimerBean.java
diff --git a/jee7schedule/src/main/java/com/baeldung/timer/ScheduleTimerBean.java b/jee7/src/main/java/com/baeldung/timer/ScheduleTimerBean.java
similarity index 100%
rename from jee7schedule/src/main/java/com/baeldung/timer/ScheduleTimerBean.java
rename to jee7/src/main/java/com/baeldung/timer/ScheduleTimerBean.java
diff --git a/jee7schedule/src/main/java/com/baeldung/timer/TimerEvent.java b/jee7/src/main/java/com/baeldung/timer/TimerEvent.java
similarity index 100%
rename from jee7schedule/src/main/java/com/baeldung/timer/TimerEvent.java
rename to jee7/src/main/java/com/baeldung/timer/TimerEvent.java
diff --git a/jee7schedule/src/main/java/com/baeldung/timer/TimerEventListener.java b/jee7/src/main/java/com/baeldung/timer/TimerEventListener.java
similarity index 100%
rename from jee7schedule/src/main/java/com/baeldung/timer/TimerEventListener.java
rename to jee7/src/main/java/com/baeldung/timer/TimerEventListener.java
diff --git a/jee7schedule/src/main/java/com/baeldung/timer/WorkerBean.java b/jee7/src/main/java/com/baeldung/timer/WorkerBean.java
similarity index 100%
rename from jee7schedule/src/main/java/com/baeldung/timer/WorkerBean.java
rename to jee7/src/main/java/com/baeldung/timer/WorkerBean.java
diff --git a/jee7schedule/src/main/webapp/WEB-INF/beans.xml b/jee7/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from jee7schedule/src/main/webapp/WEB-INF/beans.xml
rename to jee7/src/main/webapp/WEB-INF/beans.xml
diff --git a/jee7schedule/src/test/java/com/baeldung/timer/AutomaticTimerBeanTest.java b/jee7/src/test/java/com/baeldung/timer/AutomaticTimerBeanTest.java
similarity index 100%
rename from jee7schedule/src/test/java/com/baeldung/timer/AutomaticTimerBeanTest.java
rename to jee7/src/test/java/com/baeldung/timer/AutomaticTimerBeanTest.java
diff --git a/jee7schedule/src/test/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBeanTest.java b/jee7/src/test/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBeanTest.java
similarity index 100%
rename from jee7schedule/src/test/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBeanTest.java
rename to jee7/src/test/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBeanTest.java
diff --git a/jee7schedule/src/test/java/com/baeldung/timer/ProgrammaticTimerBeanTest.java b/jee7/src/test/java/com/baeldung/timer/ProgrammaticTimerBeanTest.java
similarity index 100%
rename from jee7schedule/src/test/java/com/baeldung/timer/ProgrammaticTimerBeanTest.java
rename to jee7/src/test/java/com/baeldung/timer/ProgrammaticTimerBeanTest.java
diff --git a/jee7schedule/src/test/java/com/baeldung/timer/ProgrammaticWithFixedDelayTimerBeanTest.java b/jee7/src/test/java/com/baeldung/timer/ProgrammaticWithFixedDelayTimerBeanTest.java
similarity index 100%
rename from jee7schedule/src/test/java/com/baeldung/timer/ProgrammaticWithFixedDelayTimerBeanTest.java
rename to jee7/src/test/java/com/baeldung/timer/ProgrammaticWithFixedDelayTimerBeanTest.java
diff --git a/jee7schedule/src/test/java/com/baeldung/timer/ScheduleTimerBeanTest.java b/jee7/src/test/java/com/baeldung/timer/ScheduleTimerBeanTest.java
similarity index 100%
rename from jee7schedule/src/test/java/com/baeldung/timer/ScheduleTimerBeanTest.java
rename to jee7/src/test/java/com/baeldung/timer/ScheduleTimerBeanTest.java
diff --git a/jee7schedule/src/test/java/com/baeldung/timer/WithinWindowMatcher.java b/jee7/src/test/java/com/baeldung/timer/WithinWindowMatcher.java
similarity index 100%
rename from jee7schedule/src/test/java/com/baeldung/timer/WithinWindowMatcher.java
rename to jee7/src/test/java/com/baeldung/timer/WithinWindowMatcher.java
diff --git a/pom.xml b/pom.xml
index f1c23bfb55..4e8b54446d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
         <module>json</module>
         <module>json-path</module>
         <module>junit5</module>
-        <module>jee7schedule</module>
+        <module>jee7</module>
         <!-- <module>jpa-storedprocedure</module> -->
 
         <module>log4j</module>
diff --git a/xmlunit2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java b/xmlunit2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java
index 175250f47b..5af3d48433 100644
--- a/xmlunit2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java
+++ b/xmlunit2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java
@@ -1,37 +1,30 @@
 package com.baeldung.xmlunit;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.core.IsNot.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.xmlunit.matchers.CompareMatcher.isIdenticalTo;
-import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
-import static org.xmlunit.matchers.HasXPathMatcher.hasXPath;
-
-import java.io.File;
-import java.util.Iterator;
-
 import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.xmlunit.builder.DiffBuilder;
 import org.xmlunit.builder.Input;
-import org.xmlunit.diff.ComparisonControllers;
-import org.xmlunit.diff.DefaultNodeMatcher;
-import org.xmlunit.diff.Diff;
-import org.xmlunit.diff.Difference;
-import org.xmlunit.diff.ElementSelectors;
+import org.xmlunit.diff.*;
 import org.xmlunit.validation.Languages;
 import org.xmlunit.validation.ValidationProblem;
 import org.xmlunit.validation.ValidationResult;
 import org.xmlunit.validation.Validator;
 import org.xmlunit.xpath.JAXPXPathEngine;
 
+import java.io.File;
+import java.util.Iterator;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.*;
+import static org.xmlunit.matchers.CompareMatcher.isIdenticalTo;
+import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
+import static org.xmlunit.matchers.HasXPathMatcher.hasXPath;
+
 public class XMLUnitTest {
 	@Test
 	public void givenWrongXml_whenValidateFailsAgainstXsd_thenCorrect() {