diff --git a/pom.xml b/pom.xml
index 1ebd3cb675..e9ddd2161f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -630,7 +630,7 @@
                 <module>spring-di-3</module>
                 <module>spring-drools</module>
 
-                <module>spring-ejb</module>
+                <module>spring-ejb-modules</module>
                 <module>spring-exceptions</module>
 
                 <module>spring-freemarker</module>
@@ -750,7 +750,7 @@
                 <module>libraries-6</module>
 
                 <module>spring-boot-modules/spring-boot-react</module>
-                <module>spring-ejb/ejb-beans</module>
+                <module>spring-ejb-modules/ejb-beans</module>
 
                 <module>vaadin</module>
                 <module>vavr</module>
@@ -1084,7 +1084,7 @@
                 <module>spring-di-3</module>
                 <module>spring-drools</module>
 
-                <module>spring-ejb</module>
+                <module>spring-ejb-modules</module>
                 <module>spring-exceptions</module>
 
                 <module>spring-freemarker</module>
@@ -1197,7 +1197,7 @@
                 <module>libraries-6</module>
 
                 <module>spring-boot-modules/spring-boot-react</module>
-                <module>spring-ejb/ejb-beans</module>
+                <module>spring-ejb-modules/ejb-beans</module>
 
                 <module>vaadin</module>
                 <module>vavr</module>
diff --git a/spring-ejb/README.md b/spring-ejb-modules/README.md
similarity index 100%
rename from spring-ejb/README.md
rename to spring-ejb-modules/README.md
diff --git a/spring-ejb/ejb-beans/README.md b/spring-ejb-modules/ejb-beans/README.md
similarity index 100%
rename from spring-ejb/ejb-beans/README.md
rename to spring-ejb-modules/ejb-beans/README.md
diff --git a/spring-ejb/ejb-beans/pom.xml b/spring-ejb-modules/ejb-beans/pom.xml
similarity index 91%
rename from spring-ejb/ejb-beans/pom.xml
rename to spring-ejb-modules/ejb-beans/pom.xml
index 37b67beec4..d51509ce36 100644
--- a/spring-ejb/ejb-beans/pom.xml
+++ b/spring-ejb-modules/ejb-beans/pom.xml
@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung.spring.ejb</groupId>
-        <artifactId>spring-ejb</artifactId>
+        <artifactId>spring-ejb-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
@@ -37,7 +37,18 @@
             <groupId>org.apache.tomee</groupId>
             <artifactId>tomee-embedded</artifactId>
             <version>${tomee-embedded.version}</version>
+            <exclusions>
+            	<exclusion>
+            		<groupId>com.sun.xml.messaging.saaj</groupId>
+            		<artifactId>saaj-impl</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
+		<dependency>
+		    <groupId>com.sun.xml.messaging.saaj</groupId>
+		    <artifactId>saaj-impl</artifactId>
+		    <version>3.0.0-M2</version>
+		</dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
@@ -94,12 +105,12 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
-                <dependency>
-                    <groupId>org.wildfly</groupId>
-                    <artifactId>wildfly-arquillian-container-managed</artifactId>
-                    <version>${wildfly.version}</version>
-                    <scope>test</scope>
-                </dependency>
+				<dependency>
+				    <groupId>org.wildfly.arquillian</groupId>
+				    <artifactId>wildfly-arquillian-container-managed</artifactId>
+				    <version>5.0.0.Alpha3</version>
+				    <scope>test</scope>
+				</dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -181,7 +192,7 @@
 
     <properties>
         <arquillian-bom.version>1.6.0.Final</arquillian-bom.version>
-        <tomee-embedded.version>8.0.8</tomee-embedded.version>
+        <tomee-embedded.version>8.0.11</tomee-embedded.version>
         <glassfish-embedded-all.version>6.2.2</glassfish-embedded-all.version>
         <arquillian-glassfish-embedded-3.1.version>1.0.2</arquillian-glassfish-embedded-3.1.version>
         <wildfly.version>8.2.1.Final</wildfly.version>
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/messagedriven/RecieverMDB.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/messagedriven/RecieverMDB.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/messagedriven/RecieverMDB.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/messagedriven/RecieverMDB.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJB.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJB.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJB.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJB.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJBRemote.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJBRemote.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJBRemote.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJBRemote.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJB.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJB.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJB.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJB.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJBRemote.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJBRemote.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJBRemote.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJBRemote.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJB.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJB.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJB.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJB.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJBRemote.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJBRemote.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJBRemote.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJBRemote.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/config/ApplicationConfig.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/config/ApplicationConfig.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/config/ApplicationConfig.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/config/ApplicationConfig.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Producer.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Producer.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Producer.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Producer.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Receiver.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Receiver.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Receiver.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Receiver.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/singleton/CounterBean.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/singleton/CounterBean.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/singleton/CounterBean.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/singleton/CounterBean.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/stateful/ShoppingCartBean.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/stateful/ShoppingCartBean.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/stateful/ShoppingCartBean.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/stateful/ShoppingCartBean.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryState.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryState.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryState.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryState.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateBeanManagedBean.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateBeanManagedBean.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateBeanManagedBean.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateBeanManagedBean.java
diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateContainerManagedBean.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateContainerManagedBean.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateContainerManagedBean.java
rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateContainerManagedBean.java
diff --git a/spring-ejb/ejb-beans/src/main/resources/logback.xml b/spring-ejb-modules/ejb-beans/src/main/resources/logback.xml
similarity index 100%
rename from spring-ejb/ejb-beans/src/main/resources/logback.xml
rename to spring-ejb-modules/ejb-beans/src/main/resources/logback.xml
diff --git a/spring-ejb/ejb-beans/src/test/java/com/baeldung/ejb/stateful/StatefulEJBIntegrationTest.java b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejb/stateful/StatefulEJBIntegrationTest.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/test/java/com/baeldung/ejb/stateful/StatefulEJBIntegrationTest.java
rename to spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejb/stateful/StatefulEJBIntegrationTest.java
diff --git a/spring-ejb/ejb-beans/src/test/java/com/baeldung/ejb/stateless/StatelessEJBIntegrationTest.java b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejb/stateless/StatelessEJBIntegrationTest.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/test/java/com/baeldung/ejb/stateless/StatelessEJBIntegrationTest.java
rename to spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejb/stateless/StatelessEJBIntegrationTest.java
diff --git a/spring-ejb/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/ejb/EJBUnitTest.java b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/ejb/EJBUnitTest.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/ejb/EJBUnitTest.java
rename to spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/ejb/EJBUnitTest.java
diff --git a/spring-ejb/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/spring/SpringUnitTest.java b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/spring/SpringUnitTest.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/spring/SpringUnitTest.java
rename to spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/spring/SpringUnitTest.java
diff --git a/spring-ejb/ejb-beans/src/test/java/com/baeldung/singletonbean/CountryStateCacheBeanUnitTest.java b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/singletonbean/CountryStateCacheBeanUnitTest.java
similarity index 100%
rename from spring-ejb/ejb-beans/src/test/java/com/baeldung/singletonbean/CountryStateCacheBeanUnitTest.java
rename to spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/singletonbean/CountryStateCacheBeanUnitTest.java
diff --git a/spring-ejb/ejb-beans/src/test/resources/arquillian.xml b/spring-ejb-modules/ejb-beans/src/test/resources/arquillian.xml
similarity index 100%
rename from spring-ejb/ejb-beans/src/test/resources/arquillian.xml
rename to spring-ejb-modules/ejb-beans/src/test/resources/arquillian.xml
diff --git a/spring-ejb/ejb-beans/src/test/resources/logging.properties b/spring-ejb-modules/ejb-beans/src/test/resources/logging.properties
similarity index 100%
rename from spring-ejb/ejb-beans/src/test/resources/logging.properties
rename to spring-ejb-modules/ejb-beans/src/test/resources/logging.properties
diff --git a/spring-ejb/pom.xml b/spring-ejb-modules/pom.xml
similarity index 96%
rename from spring-ejb/pom.xml
rename to spring-ejb-modules/pom.xml
index 896df6e8d8..9a4bfa2823 100755
--- a/spring-ejb/pom.xml
+++ b/spring-ejb-modules/pom.xml
@@ -4,9 +4,9 @@
     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.spring.ejb</groupId>
-    <artifactId>spring-ejb</artifactId>
+    <artifactId>spring-ejb-modules</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>spring-ejb</name>
+    <name>spring-ejb-modules</name>
     <packaging>pom</packaging>
     <description>Spring EJB Tutorial</description>
 
@@ -24,7 +24,7 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- for junit5 to successfully be able to discover junit4 tests, we need 4.12+ version of 
+            <!-- for junit5 to successfully be able to discover junit4 tests, we need 4.12+ version of
                 junit:junit in the classpath. hence forcing the latest 4.13.2 available version for junit5 compatibility -->
             <dependency>
                 <groupId>junit</groupId>
@@ -93,4 +93,4 @@
         <ejb.version>3.2</ejb.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-ejb/spring-ejb-client/README.md b/spring-ejb-modules/spring-ejb-client/README.md
similarity index 100%
rename from spring-ejb/spring-ejb-client/README.md
rename to spring-ejb-modules/spring-ejb-client/README.md
diff --git a/spring-ejb/spring-ejb-client/pom.xml b/spring-ejb-modules/spring-ejb-client/pom.xml
similarity index 97%
rename from spring-ejb/spring-ejb-client/pom.xml
rename to spring-ejb-modules/spring-ejb-client/pom.xml
index ecf9d0eb49..b3a65db32b 100644
--- a/spring-ejb/spring-ejb-client/pom.xml
+++ b/spring-ejb-modules/spring-ejb-client/pom.xml
@@ -10,7 +10,7 @@
 
     <parent>
         <groupId>com.baeldung.spring.ejb</groupId>
-        <artifactId>spring-ejb</artifactId>
+        <artifactId>spring-ejb-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java b/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java
similarity index 100%
rename from spring-ejb/spring-ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java
rename to spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java
diff --git a/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/ejb/wildfly/TextApplication.java b/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/ejb/wildfly/TextApplication.java
similarity index 100%
rename from spring-ejb/spring-ejb-client/src/main/java/com/baeldung/ejb/wildfly/TextApplication.java
rename to spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/ejb/wildfly/TextApplication.java
diff --git a/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/SpringEjbClientApplication.java b/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/springejbclient/SpringEjbClientApplication.java
similarity index 100%
rename from spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/SpringEjbClientApplication.java
rename to spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/springejbclient/SpringEjbClientApplication.java
diff --git a/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/endpoint/HomeEndpoint.java b/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/springejbclient/endpoint/HomeEndpoint.java
similarity index 100%
rename from spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/endpoint/HomeEndpoint.java
rename to spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/springejbclient/endpoint/HomeEndpoint.java
diff --git a/spring-ejb/spring-ejb-client/src/main/resources/application.properties b/spring-ejb-modules/spring-ejb-client/src/main/resources/application.properties
similarity index 100%
rename from spring-ejb/spring-ejb-client/src/main/resources/application.properties
rename to spring-ejb-modules/spring-ejb-client/src/main/resources/application.properties
diff --git a/spring-ejb/spring-ejb-client/src/main/resources/jboss-ejb-client.properties b/spring-ejb-modules/spring-ejb-client/src/main/resources/jboss-ejb-client.properties
similarity index 100%
rename from spring-ejb/spring-ejb-client/src/main/resources/jboss-ejb-client.properties
rename to spring-ejb-modules/spring-ejb-client/src/main/resources/jboss-ejb-client.properties
diff --git a/spring-ejb/spring-ejb-client/src/main/resources/logback.xml b/spring-ejb-modules/spring-ejb-client/src/main/resources/logback.xml
similarity index 100%
rename from spring-ejb/spring-ejb-client/src/main/resources/logback.xml
rename to spring-ejb-modules/spring-ejb-client/src/main/resources/logback.xml
diff --git a/spring-ejb/spring-ejb-client/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/SpringContextLiveTest.java
similarity index 100%
rename from spring-ejb/spring-ejb-client/src/test/java/com/baeldung/SpringContextLiveTest.java
rename to spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/SpringContextLiveTest.java
diff --git a/spring-ejb/spring-ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupLiveTest.java b/spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupLiveTest.java
similarity index 100%
rename from spring-ejb/spring-ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupLiveTest.java
rename to spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupLiveTest.java
diff --git a/spring-ejb/spring-ejb-client/src/test/java/com/baeldung/ejb/wildfly/TextApplicationLiveTest.java b/spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/ejb/wildfly/TextApplicationLiveTest.java
similarity index 100%
rename from spring-ejb/spring-ejb-client/src/test/java/com/baeldung/ejb/wildfly/TextApplicationLiveTest.java
rename to spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/ejb/wildfly/TextApplicationLiveTest.java
diff --git a/spring-ejb/spring-ejb-remote/README.md b/spring-ejb-modules/spring-ejb-remote/README.md
similarity index 100%
rename from spring-ejb/spring-ejb-remote/README.md
rename to spring-ejb-modules/spring-ejb-remote/README.md
diff --git a/spring-ejb/spring-ejb-remote/pom.xml b/spring-ejb-modules/spring-ejb-remote/pom.xml
similarity index 98%
rename from spring-ejb/spring-ejb-remote/pom.xml
rename to spring-ejb-modules/spring-ejb-remote/pom.xml
index a180955dcf..4a40c497e9 100644
--- a/spring-ejb/spring-ejb-remote/pom.xml
+++ b/spring-ejb-modules/spring-ejb-remote/pom.xml
@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung.spring.ejb</groupId>
-        <artifactId>spring-ejb</artifactId>
+        <artifactId>spring-ejb-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorld.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorld.java
similarity index 100%
rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorld.java
rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorld.java
diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorldBean.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorldBean.java
similarity index 100%
rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorldBean.java
rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorldBean.java
diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorld.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorld.java
similarity index 100%
rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorld.java
rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorld.java
diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorldBean.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorldBean.java
similarity index 100%
rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorldBean.java
rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorldBean.java
diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorld.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorld.java
similarity index 100%
rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorld.java
rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorld.java
diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java
similarity index 100%
rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java
rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java
diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorBean.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorBean.java
similarity index 100%
rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorBean.java
rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorBean.java
diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorRemote.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorRemote.java
similarity index 100%
rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorRemote.java
rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorRemote.java
diff --git a/spring-ejb/spring-ejb-remote/src/main/resources/META-INF/ejb-jar.xml b/spring-ejb-modules/spring-ejb-remote/src/main/resources/META-INF/ejb-jar.xml
similarity index 100%
rename from spring-ejb/spring-ejb-remote/src/main/resources/META-INF/ejb-jar.xml
rename to spring-ejb-modules/spring-ejb-remote/src/main/resources/META-INF/ejb-jar.xml
diff --git a/spring-ejb/spring-ejb-remote/src/main/resources/logback.xml b/spring-ejb-modules/spring-ejb-remote/src/main/resources/logback.xml
similarity index 100%
rename from spring-ejb/spring-ejb-remote/src/main/resources/logback.xml
rename to spring-ejb-modules/spring-ejb-remote/src/main/resources/logback.xml
diff --git a/spring-ejb/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatefulWorldTestUnitTest.java b/spring-ejb-modules/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatefulWorldTestUnitTest.java
similarity index 100%
rename from spring-ejb/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatefulWorldTestUnitTest.java
rename to spring-ejb-modules/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatefulWorldTestUnitTest.java
diff --git a/spring-ejb/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatelessWorldTestUnitTest.java b/spring-ejb-modules/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatelessWorldTestUnitTest.java
similarity index 100%
rename from spring-ejb/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatelessWorldTestUnitTest.java
rename to spring-ejb-modules/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatelessWorldTestUnitTest.java
diff --git a/spring-ejb/wildfly/pom.xml b/spring-ejb-modules/wildfly/pom.xml
similarity index 98%
rename from spring-ejb/wildfly/pom.xml
rename to spring-ejb-modules/wildfly/pom.xml
index 8a6d41ea82..c73a1f128d 100644
--- a/spring-ejb/wildfly/pom.xml
+++ b/spring-ejb-modules/wildfly/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>com.baeldung.spring.ejb</groupId>
-        <artifactId>spring-ejb</artifactId>
+        <artifactId>spring-ejb-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/spring-ejb/wildfly/widlfly-web/pom.xml b/spring-ejb-modules/wildfly/widlfly-web/pom.xml
similarity index 100%
rename from spring-ejb/wildfly/widlfly-web/pom.xml
rename to spring-ejb-modules/wildfly/widlfly-web/pom.xml
diff --git a/spring-ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java b/spring-ejb-modules/wildfly/widlfly-web/src/main/java/TestEJBServlet.java
similarity index 100%
rename from spring-ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java
rename to spring-ejb-modules/wildfly/widlfly-web/src/main/java/TestEJBServlet.java
diff --git a/spring-ejb/wildfly/widlfly-web/src/main/java/TestJPAServlet.java b/spring-ejb-modules/wildfly/widlfly-web/src/main/java/TestJPAServlet.java
similarity index 100%
rename from spring-ejb/wildfly/widlfly-web/src/main/java/TestJPAServlet.java
rename to spring-ejb-modules/wildfly/widlfly-web/src/main/java/TestJPAServlet.java
diff --git a/spring-ejb/wildfly/widlfly-web/src/main/resources/logback.xml b/spring-ejb-modules/wildfly/widlfly-web/src/main/resources/logback.xml
similarity index 100%
rename from spring-ejb/wildfly/widlfly-web/src/main/resources/logback.xml
rename to spring-ejb-modules/wildfly/widlfly-web/src/main/resources/logback.xml
diff --git a/spring-ejb/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml b/spring-ejb-modules/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from spring-ejb/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml
rename to spring-ejb-modules/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml
diff --git a/spring-ejb/wildfly/wildfly-ear/pom.xml b/spring-ejb-modules/wildfly/wildfly-ear/pom.xml
similarity index 100%
rename from spring-ejb/wildfly/wildfly-ear/pom.xml
rename to spring-ejb-modules/wildfly/wildfly-ear/pom.xml
diff --git a/spring-ejb/wildfly/wildfly-ejb-interfaces/pom.xml b/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/pom.xml
similarity index 100%
rename from spring-ejb/wildfly/wildfly-ejb-interfaces/pom.xml
rename to spring-ejb-modules/wildfly/wildfly-ejb-interfaces/pom.xml
diff --git a/spring-ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java b/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java
similarity index 100%
rename from spring-ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java
rename to spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java
diff --git a/spring-ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java b/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java
similarity index 100%
rename from spring-ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java
rename to spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java
diff --git a/spring-ejb/wildfly/wildfly-ejb-interfaces/src/main/resources/logback.xml b/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/resources/logback.xml
similarity index 100%
rename from spring-ejb/wildfly/wildfly-ejb-interfaces/src/main/resources/logback.xml
rename to spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/resources/logback.xml
diff --git a/spring-ejb/wildfly/wildfly-ejb/pom.xml b/spring-ejb-modules/wildfly/wildfly-ejb/pom.xml
similarity index 100%
rename from spring-ejb/wildfly/wildfly-ejb/pom.xml
rename to spring-ejb-modules/wildfly/wildfly-ejb/pom.xml
diff --git a/spring-ejb/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java b/spring-ejb-modules/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java
similarity index 100%
rename from spring-ejb/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java
rename to spring-ejb-modules/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java
diff --git a/spring-ejb/wildfly/wildfly-ejb/src/main/resources/logback.xml b/spring-ejb-modules/wildfly/wildfly-ejb/src/main/resources/logback.xml
similarity index 100%
rename from spring-ejb/wildfly/wildfly-ejb/src/main/resources/logback.xml
rename to spring-ejb-modules/wildfly/wildfly-ejb/src/main/resources/logback.xml
diff --git a/spring-ejb/wildfly/wildfly-jpa/pom.xml b/spring-ejb-modules/wildfly/wildfly-jpa/pom.xml
similarity index 100%
rename from spring-ejb/wildfly/wildfly-jpa/pom.xml
rename to spring-ejb-modules/wildfly/wildfly-jpa/pom.xml
diff --git a/spring-ejb/wildfly/wildfly-jpa/src/main/java/model/User.java b/spring-ejb-modules/wildfly/wildfly-jpa/src/main/java/model/User.java
similarity index 100%
rename from spring-ejb/wildfly/wildfly-jpa/src/main/java/model/User.java
rename to spring-ejb-modules/wildfly/wildfly-jpa/src/main/java/model/User.java
diff --git a/spring-ejb/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml b/spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from spring-ejb/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml
rename to spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml
diff --git a/spring-ejb/wildfly/wildfly-jpa/src/main/resources/data.sql b/spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/data.sql
similarity index 100%
rename from spring-ejb/wildfly/wildfly-jpa/src/main/resources/data.sql
rename to spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/data.sql
diff --git a/spring-ejb/wildfly/wildfly-jpa/src/main/resources/logback.xml b/spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/logback.xml
similarity index 100%
rename from spring-ejb/wildfly/wildfly-jpa/src/main/resources/logback.xml
rename to spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/logback.xml
diff --git a/spring-ejb/wildfly/wildfly-mdb/pom.xml b/spring-ejb-modules/wildfly/wildfly-mdb/pom.xml
similarity index 100%
rename from spring-ejb/wildfly/wildfly-mdb/pom.xml
rename to spring-ejb-modules/wildfly/wildfly-mdb/pom.xml
diff --git a/spring-ejb/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java b/spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java
similarity index 100%
rename from spring-ejb/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java
rename to spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java
diff --git a/spring-ejb/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java b/spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java
similarity index 100%
rename from spring-ejb/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java
rename to spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java