diff --git a/jws/java-core-samples-lib/jardiff.jar b/jws/java-core-samples-lib/jardiff.jar
deleted file mode 100644
index 08b5bb61ab00..000000000000
Binary files a/jws/java-core-samples-lib/jardiff.jar and /dev/null differ
diff --git a/jws/java-core-samples-lib/jnlp-servlet.jar b/jws/java-core-samples-lib/jnlp-servlet.jar
deleted file mode 100644
index c27167c64700..000000000000
Binary files a/jws/java-core-samples-lib/jnlp-servlet.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 89c030428d20..c7d617bb5fee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -687,7 +687,6 @@
                 <module>json-modules</module>
                 <module>jsoup</module>
                 <module>jts</module>
-                <module>jws</module>
                 <module>ksqldb</module>
                 <module>kubernetes-modules</module>
                 <module>libraries</module> <!-- very long running -->
@@ -1128,7 +1127,6 @@
                 <module>jmonkeyengine</module>
                 <module>json-modules</module>
                 <module>jsoup</module>
-                <module>jws</module>
                 <module>ksqldb</module>
                 <module>kubernetes-modules</module>
                 <module>libraries</module> <!-- very long running -->
diff --git a/jws/.gitignore b/security-modules/jws/.gitignore
similarity index 100%
rename from jws/.gitignore
rename to security-modules/jws/.gitignore
diff --git a/jws/pom.xml b/security-modules/jws/pom.xml
similarity index 78%
rename from jws/pom.xml
rename to security-modules/jws/pom.xml
index 2e5a29feea98..731b1af80108 100644
--- a/jws/pom.xml
+++ b/security-modules/jws/pom.xml
@@ -1,64 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>jws</artifactId>
-    <packaging>war</packaging>
-    <name>jws</name>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven-jar-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <archive>
-                                <manifest>
-                                    <mainClass>com.example.Hello</mainClass>
-                                </manifest>
-                            </archive>
-                            <outputDirectory>${project.basedir}/target/jws</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>${maven-war-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                    </execution>
-                </executions>
-                <configuration>
-                    <webResources>
-                        <resource>
-                            <directory>${project.basedir}/java-core-samples-lib/</directory>
-                            <includes>
-                                <include>**/*.jar</include>
-                            </includes>
-                            <targetPath>WEB-INF/lib</targetPath>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jws</artifactId>
+    <packaging>war</packaging>
+    <name>jws</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>security-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>${maven-jar-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <mainClass>com.example.Hello</mainClass>
+                                </manifest>
+                            </archive>
+                            <outputDirectory>${project.basedir}/target/jws</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/jws/src/main/java/com/example/Hello.java b/security-modules/jws/src/main/java/com/example/Hello.java
similarity index 100%
rename from jws/src/main/java/com/example/Hello.java
rename to security-modules/jws/src/main/java/com/example/Hello.java
diff --git a/jws/src/main/resources/logback.xml b/security-modules/jws/src/main/resources/logback.xml
similarity index 100%
rename from jws/src/main/resources/logback.xml
rename to security-modules/jws/src/main/resources/logback.xml
diff --git a/jws/src/main/webapp/WEB-INF/web.xml b/security-modules/jws/src/main/webapp/WEB-INF/web.xml
similarity index 96%
rename from jws/src/main/webapp/WEB-INF/web.xml
rename to security-modules/jws/src/main/webapp/WEB-INF/web.xml
index 18f29ddd128a..2399a4445e85 100644
--- a/jws/src/main/webapp/WEB-INF/web.xml
+++ b/security-modules/jws/src/main/webapp/WEB-INF/web.xml
@@ -1,24 +1,24 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-	<display-name>Java Web Start</display-name>
-	<description>JNLP Example for Java Web Start Article</description>
-
-	<servlet>
-		<servlet-name>JnlpDownloadServlet</servlet-name>
-		<servlet-class>jnlp.sample.servlet.JnlpDownloadServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>JnlpDownloadServlet</servlet-name>
-		<url-pattern>*.jar</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>JnlpDownloadServlet</servlet-name>
-		<url-pattern>*.jnlp</url-pattern>
-	</servlet-mapping>
-
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
-</web-app>
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+	<display-name>Java Web Start</display-name>
+	<description>JNLP Example for Java Web Start Article</description>
+
+	<servlet>
+		<servlet-name>JnlpDownloadServlet</servlet-name>
+		<servlet-class>jnlp.sample.servlet.JnlpDownloadServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>JnlpDownloadServlet</servlet-name>
+		<url-pattern>*.jar</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>JnlpDownloadServlet</servlet-name>
+		<url-pattern>*.jnlp</url-pattern>
+	</servlet-mapping>
+
+	<welcome-file-list>
+		<welcome-file>index.html</welcome-file>
+	</welcome-file-list>
+</web-app>
diff --git a/jws/src/main/webapp/hello.jnlp b/security-modules/jws/src/main/webapp/hello.jnlp
similarity index 100%
rename from jws/src/main/webapp/hello.jnlp
rename to security-modules/jws/src/main/webapp/hello.jnlp
diff --git a/jws/src/main/webapp/index.html b/security-modules/jws/src/main/webapp/index.html
similarity index 100%
rename from jws/src/main/webapp/index.html
rename to security-modules/jws/src/main/webapp/index.html
diff --git a/security-modules/pom.xml b/security-modules/pom.xml
index 20f2ccee2a87..55192364d0d4 100644
--- a/security-modules/pom.xml
+++ b/security-modules/pom.xml
@@ -21,6 +21,7 @@
         <module>jee-7-security</module>
         <module>jjwt</module>
         <module>jwt</module>
+        <module>jws</module>
         <module>oauth2-framework-impl</module>
         <module>sql-injection-samples</module>
     </modules>