diff --git a/ejb/ejbclient/src/main/java/com/baeldung/ejbclient/application/TextApplication.java b/ejb/ejb-client/src/main/java/com/baeldung/ejb/wildfly/TextApplication.java
similarity index 92%
rename from ejb/ejbclient/src/main/java/com/baeldung/ejbclient/application/TextApplication.java
rename to ejb/ejb-client/src/main/java/com/baeldung/ejb/wildfly/TextApplication.java
index b65c21100d..3b63761c73 100644
--- a/ejb/ejbclient/src/main/java/com/baeldung/ejbclient/application/TextApplication.java
+++ b/ejb/ejb-client/src/main/java/com/baeldung/ejb/wildfly/TextApplication.java
@@ -1,7 +1,5 @@
-package com.baeldung.ejbclient.application;
+package com.baeldung.ejb.wildfly;
 
-import com.baeldung.ejbmodule.TextProcessorBean;
-import com.baeldung.ejbmodule.TextProcessorRemote;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
diff --git a/ejb/ejbclient/src/test/java/com/baeldung/ejbclient/application/TextApplicationTest.java b/ejb/ejb-client/src/test/java/com/baeldung/ejb/wildfly/TextApplicationTest.java
similarity index 94%
rename from ejb/ejbclient/src/test/java/com/baeldung/ejbclient/application/TextApplicationTest.java
rename to ejb/ejb-client/src/test/java/com/baeldung/ejb/wildfly/TextApplicationTest.java
index 947c72d0b0..c0446eaea6 100644
--- a/ejb/ejbclient/src/test/java/com/baeldung/ejbclient/application/TextApplicationTest.java
+++ b/ejb/ejb-client/src/test/java/com/baeldung/ejb/wildfly/TextApplicationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.ejbclient.application;
+package com.baeldung.ejb.wildfly;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/ejb/ejbmodule/src/main/java/com/baeldung/ejbmodule/TextProcessorBean.java b/ejb/ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorBean.java
similarity index 85%
rename from ejb/ejbmodule/src/main/java/com/baeldung/ejbmodule/TextProcessorBean.java
rename to ejb/ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorBean.java
index dc0db5fc53..4f0c013b0f 100644
--- a/ejb/ejbmodule/src/main/java/com/baeldung/ejbmodule/TextProcessorBean.java
+++ b/ejb/ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorBean.java
@@ -1,4 +1,4 @@
-package com.baeldung.ejbmodule;
+package com.baeldung.ejb.wildfly;
 
 import javax.ejb.Stateless;
 
diff --git a/ejb/ejbmodule/src/main/java/com/baeldung/ejbmodule/TextProcessorRemote.java b/ejb/ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorRemote.java
similarity index 76%
rename from ejb/ejbmodule/src/main/java/com/baeldung/ejbmodule/TextProcessorRemote.java
rename to ejb/ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorRemote.java
index 680d8f4e10..b51af8528d 100644
--- a/ejb/ejbmodule/src/main/java/com/baeldung/ejbmodule/TextProcessorRemote.java
+++ b/ejb/ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorRemote.java
@@ -1,4 +1,4 @@
-package com.baeldung.ejbmodule;
+package com.baeldung.ejb.wildfly;
 
 import javax.ejb.Remote;
 
diff --git a/ejb/ejbclient/src/main/resources/jboss-ejb-client.properties b/ejb/ejbclient/src/main/resources/jboss-ejb-client.properties
deleted file mode 100644
index 67533b7825..0000000000
--- a/ejb/ejbclient/src/main/resources/jboss-ejb-client.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-endpoint.name=client-endpoint
-remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
-remote.connections=default
-remote.connection.default.host=127.0.0.1
-remote.connection.default.port=8080
-remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
-remote.connection.default.username=myusername
-remote.connection.default.password=mypassword
\ No newline at end of file
diff --git a/ejb/ejbmodule/src/test/java/com/baeldung/ejbmodule/TextProcessorBeanTest.java b/ejb/ejbmodule/src/test/java/com/baeldung/ejbmodule/TextProcessorBeanTest.java
deleted file mode 100644
index d8693420d4..0000000000
--- a/ejb/ejbmodule/src/test/java/com/baeldung/ejbmodule/TextProcessorBeanTest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.baeldung.ejbmodule;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class TextProcessorBeanTest {
-    @Test
-    public void givenInputString_whenComparedToStringParsedByBean_thenSuccessful() {
-        TextProcessorBean textProcessor = new TextProcessorBean();
-        assertEquals("TEST", textProcessor.processText("test"));
-    }
-}
\ No newline at end of file
diff --git a/ejb/pom.xml b/ejb/pom.xml
index b8aa32fab1..78e40a7b7c 100755
--- a/ejb/pom.xml
+++ b/ejb/pom.xml
@@ -81,6 +81,5 @@
         <module>ejb-remote</module>
         <module>ejb-client</module>
         <module>ejb-session-beans</module>
-        <module>ejb-session-beans-client</module>
     </modules>
 </project>
\ No newline at end of file