diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index d1117e714c..03242e9037 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -21,6 +21,7 @@
         <module name="junit-5-basics" />
         <module name="activejdbc" />
         <module name="spring-data-jpa-repo" />
+        <module name="apache-velocity" />
         <module name="codebank" />
         <module name="core-java-collections-list" />
         <module name="image-compressing" />
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index ffb87cefe3..85bcf86ab4 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -3,6 +3,8 @@
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/apache/apache-httpclient/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/apache/apache-httpclient/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/apache/apache-velocity/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/apache/apache-velocity/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/apache/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/apache/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-10/src/main/java" charset="UTF-8" />
diff --git a/apache-velocity/README.md b/apache/apache-velocity/README.md
similarity index 100%
rename from apache-velocity/README.md
rename to apache/apache-velocity/README.md
diff --git a/apache-velocity/pom.xml b/apache/apache-velocity/pom.xml
similarity index 94%
rename from apache-velocity/pom.xml
rename to apache/apache-velocity/pom.xml
index 5dd56a1d68..4954d97c2a 100644
--- a/apache-velocity/pom.xml
+++ b/apache/apache-velocity/pom.xml
@@ -9,9 +9,9 @@
     <name>apache-velocity</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>com.ossez.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>0.0.2-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/apache-velocity/src/main/java/com/baeldung/apache/velocity/model/Product.java b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/model/Product.java
similarity index 91%
rename from apache-velocity/src/main/java/com/baeldung/apache/velocity/model/Product.java
rename to apache/apache-velocity/src/main/java/com/ossez/apache/velocity/model/Product.java
index c215223181..0ef386c6e4 100644
--- a/apache-velocity/src/main/java/com/baeldung/apache/velocity/model/Product.java
+++ b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/model/Product.java
@@ -1,4 +1,4 @@
-package com.baeldung.apache.velocity.model;
+package com.ossez.apache.velocity.model;
 
 public class Product {
 
diff --git a/apache-velocity/src/main/java/com/baeldung/apache/velocity/service/ProductService.java b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/service/ProductService.java
similarity index 83%
rename from apache-velocity/src/main/java/com/baeldung/apache/velocity/service/ProductService.java
rename to apache/apache-velocity/src/main/java/com/ossez/apache/velocity/service/ProductService.java
index 0a623d4d65..07f2e53152 100644
--- a/apache-velocity/src/main/java/com/baeldung/apache/velocity/service/ProductService.java
+++ b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/service/ProductService.java
@@ -1,6 +1,6 @@
-package com.baeldung.apache.velocity.service;
+package com.ossez.apache.velocity.service;
 
-import com.baeldung.apache.velocity.model.Product;
+import com.ossez.apache.velocity.model.Product;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/LayoutServlet.java b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/LayoutServlet.java
similarity index 86%
rename from apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/LayoutServlet.java
rename to apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/LayoutServlet.java
index d4208a3880..282e2dd08b 100644
--- a/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/LayoutServlet.java
+++ b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/LayoutServlet.java
@@ -1,7 +1,7 @@
-package com.baeldung.apache.velocity.servlet;
+package com.ossez.apache.velocity.servlet;
 
-import com.baeldung.apache.velocity.model.Product;
-import com.baeldung.apache.velocity.service.ProductService;
+import com.ossez.apache.velocity.model.Product;
+import com.ossez.apache.velocity.service.ProductService;
 import org.apache.velocity.Template;
 import org.apache.velocity.context.Context;
 import org.apache.velocity.tools.view.VelocityLayoutServlet;
diff --git a/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/ProductServlet.java b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/ProductServlet.java
similarity index 85%
rename from apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/ProductServlet.java
rename to apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/ProductServlet.java
index 60c9169fce..40fb7a82e8 100644
--- a/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/ProductServlet.java
+++ b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/ProductServlet.java
@@ -1,7 +1,7 @@
-package com.baeldung.apache.velocity.servlet;
+package com.ossez.apache.velocity.servlet;
 
-import com.baeldung.apache.velocity.model.Product;
-import com.baeldung.apache.velocity.service.ProductService;
+import com.ossez.apache.velocity.model.Product;
+import com.ossez.apache.velocity.service.ProductService;
 import org.apache.velocity.Template;
 import org.apache.velocity.context.Context;
 import org.apache.velocity.tools.view.VelocityViewServlet;
diff --git a/apache-velocity/src/main/resources/logback.xml b/apache/apache-velocity/src/main/resources/logback.xml
similarity index 100%
rename from apache-velocity/src/main/resources/logback.xml
rename to apache/apache-velocity/src/main/resources/logback.xml
diff --git a/apache-velocity/src/main/webapp/WEB-INF/velocity.properties b/apache/apache-velocity/src/main/webapp/WEB-INF/velocity.properties
similarity index 100%
rename from apache-velocity/src/main/webapp/WEB-INF/velocity.properties
rename to apache/apache-velocity/src/main/webapp/WEB-INF/velocity.properties
diff --git a/apache-velocity/src/main/webapp/WEB-INF/web.xml b/apache/apache-velocity/src/main/webapp/WEB-INF/web.xml
similarity index 87%
rename from apache-velocity/src/main/webapp/WEB-INF/web.xml
rename to apache/apache-velocity/src/main/webapp/WEB-INF/web.xml
index 95b41b36dd..1e89f41865 100644
--- a/apache-velocity/src/main/webapp/WEB-INF/web.xml
+++ b/apache/apache-velocity/src/main/webapp/WEB-INF/web.xml
@@ -6,12 +6,12 @@
 	<display-name>apache-velocity</display-name>
 	<servlet>
 		<servlet-name>ProductServlet</servlet-name>
-		<servlet-class>com.baeldung.apache.velocity.servlet.ProductServlet</servlet-class>
+		<servlet-class>com.ossez.apache.velocity.servlet.ProductServlet</servlet-class>
 	</servlet>
 
 	<servlet>
 		<servlet-name>LayoutServlet</servlet-name>
-		<servlet-class>com.baeldung.apache.velocity.servlet.LayoutServlet</servlet-class>
+		<servlet-class>com.ossez.apache.velocity.servlet.LayoutServlet</servlet-class>
 	</servlet>
 	<servlet>
 		<servlet-name>velocityLayout</servlet-name>
diff --git a/apache-velocity/src/main/webapp/fragments/footer.vm b/apache/apache-velocity/src/main/webapp/fragments/footer.vm
similarity index 100%
rename from apache-velocity/src/main/webapp/fragments/footer.vm
rename to apache/apache-velocity/src/main/webapp/fragments/footer.vm
diff --git a/apache-velocity/src/main/webapp/fragments/header.vm b/apache/apache-velocity/src/main/webapp/fragments/header.vm
similarity index 100%
rename from apache-velocity/src/main/webapp/fragments/header.vm
rename to apache/apache-velocity/src/main/webapp/fragments/header.vm
diff --git a/apache-velocity/src/main/webapp/layout/Default.vm b/apache/apache-velocity/src/main/webapp/layout/Default.vm
similarity index 100%
rename from apache-velocity/src/main/webapp/layout/Default.vm
rename to apache/apache-velocity/src/main/webapp/layout/Default.vm
diff --git a/apache-velocity/src/main/webapp/templates/index.vm b/apache/apache-velocity/src/main/webapp/templates/index.vm
similarity index 100%
rename from apache-velocity/src/main/webapp/templates/index.vm
rename to apache/apache-velocity/src/main/webapp/templates/index.vm
diff --git a/apache-velocity/src/main/webapp/templates/layoutdemo.vm b/apache/apache-velocity/src/main/webapp/templates/layoutdemo.vm
similarity index 100%
rename from apache-velocity/src/main/webapp/templates/layoutdemo.vm
rename to apache/apache-velocity/src/main/webapp/templates/layoutdemo.vm
diff --git a/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/LayoutServletLiveTest.java b/apache/apache-velocity/src/test/java/com/ossez/apache/velocity/servlet/LayoutServletLiveTest.java
similarity index 93%
rename from apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/LayoutServletLiveTest.java
rename to apache/apache-velocity/src/test/java/com/ossez/apache/velocity/servlet/LayoutServletLiveTest.java
index f1f166b119..09cb37d2ed 100644
--- a/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/LayoutServletLiveTest.java
+++ b/apache/apache-velocity/src/test/java/com/ossez/apache/velocity/servlet/LayoutServletLiveTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.apache.velocity.servlet;
+package com.ossez.apache.velocity.servlet;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
diff --git a/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/ProductServletLiveTest.java b/apache/apache-velocity/src/test/java/com/ossez/apache/velocity/servlet/ProductServletLiveTest.java
similarity index 93%
rename from apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/ProductServletLiveTest.java
rename to apache/apache-velocity/src/test/java/com/ossez/apache/velocity/servlet/ProductServletLiveTest.java
index 397e575d4d..169cd7c6fe 100644
--- a/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/ProductServletLiveTest.java
+++ b/apache/apache-velocity/src/test/java/com/ossez/apache/velocity/servlet/ProductServletLiveTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.apache.velocity.servlet;
+package com.ossez.apache.velocity.servlet;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
diff --git a/apache/pom.xml b/apache/pom.xml
index 6282eb98e5..6c6d44384b 100644
--- a/apache/pom.xml
+++ b/apache/pom.xml
@@ -16,6 +16,7 @@
 
     <modules>
         <module>apache-httpclient</module>
+        <module>apache-velocity</module>
     </modules>
 
     <dependencyManagement>
diff --git a/pom.xml b/pom.xml
index e8b5a3b708..35d77b6f28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
         <commons-cli.version>1.4</commons-cli.version>
         <commons-io.version>2.11.0</commons-io.version>
 
-        <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
+
 
         <!-- UTILS -->
         <guava.version>31.1-jre</guava.version>
@@ -126,9 +126,10 @@
 
         <!-- PLUGINS -->
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
-        <maven-surefire-plugin.version>3.0.0-M8</maven-surefire-plugin.version>
-        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
+        <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
 
     </properties>