diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index 1c65a36..804d2f4 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -8,15 +8,11 @@
 name: Deploy
 on: [push]
 
-concurrency: production
-
 jobs:
   deploy:
     name: "Deploy to server"
     runs-on: ubuntu-latest
 
-    environment: production
-
     steps:
       - name: configure SSH
         run: |
diff --git a/index.html b/html/index.html
similarity index 94%
rename from index.html
rename to html/index.html
index b81af23..11e39ce 100644
--- a/index.html
+++ b/html/index.html
@@ -162,10 +162,10 @@ <h1>LEADERBOARD</h1>
 
 
 
-    <script src="bootstrap-5.3.3-dist/js/bootstrap.js"></script>
-    <script src="bootstrap-5.3.3-dist/js/js.js"></script>
+    <script src="../bootstrap-5.3.3-dist/js/bootstrap.js"></script>
+    <script src="../bootstrap-5.3.3-dist/js/js.js"></script>
     <script src="https://unpkg.com/aos@next/dist/aos.js"></script>
-    <script src="bootstrap-5.3.3-dist/js/usernameValidation.js"></script>
+    <script src="../bootstrap-5.3.3-dist/js/usernameValidation.js"></script>
 
     <script>AOS.init();</script>
     <script src="usernameValidation.js"></script>
diff --git a/match.html b/html/match.html
similarity index 93%
rename from match.html
rename to html/match.html
index 5535900..7b96a72 100644
--- a/match.html
+++ b/html/match.html
@@ -8,9 +8,9 @@
     <title id="appName"></title>
     <meta name="author" content="Tien Dung Le">
     <!-- Bootstrap CSS -->
-    <link rel="stylesheet" href="bootstrap-5.3.3-dist/css/bootstrap.css">
-    <link rel="stylesheet" href="bootstrap-5.3.3-dist/css/styling.css">
-    <link rel="script" href="bootstrap-5.3.3-dist/js/js.js">
+    <link rel="stylesheet" href="../bootstrap-5.3.3-dist/css/bootstrap.css">
+    <link rel="stylesheet" href="../bootstrap-5.3.3-dist/css/styling.css">
+    <link rel="script" href="../bootstrap-5.3.3-dist/js/js.js">
     <!--suppress JSUnresolvedLibraryURL -->
     <link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css" />
     <style>
@@ -125,8 +125,8 @@
         </div>
     </section>
 
-    <script src="bootstrap-5.3.3-dist/js/bootstrap.js"></script>
-    <script src="bootstrap-5.3.3-dist/js/js.js"></script>
+    <script src="../bootstrap-5.3.3-dist/js/bootstrap.js"></script>
+    <script src="../bootstrap-5.3.3-dist/js/js.js"></script>
     <script src="https://unpkg.com/aos@next/dist/aos.js"></script>
     <script>
         let userJSON = localStorage.getItem("userJSON")
diff --git a/target/classes/com/cse3310/App.class b/target/classes/com/cse3310/App.class
index f1f02c1..fd795dd 100644
Binary files a/target/classes/com/cse3310/App.class and b/target/classes/com/cse3310/App.class differ
diff --git a/target/classes/com/cse3310/Coordinate.class b/target/classes/com/cse3310/Coordinate.class
index 0c216b8..f984aef 100644
Binary files a/target/classes/com/cse3310/Coordinate.class and b/target/classes/com/cse3310/Coordinate.class differ
diff --git a/target/classes/com/cse3310/Game.class b/target/classes/com/cse3310/Game.class
index fa96215..4e5b09b 100644
Binary files a/target/classes/com/cse3310/Game.class and b/target/classes/com/cse3310/Game.class differ
diff --git a/target/classes/com/cse3310/HttpServer$1.class b/target/classes/com/cse3310/HttpServer$1.class
index ff5f4de..3218db9 100644
Binary files a/target/classes/com/cse3310/HttpServer$1.class and b/target/classes/com/cse3310/HttpServer$1.class differ
diff --git a/target/classes/com/cse3310/HttpServer.class b/target/classes/com/cse3310/HttpServer.class
index 2b6716b..586c59a 100644
Binary files a/target/classes/com/cse3310/HttpServer.class and b/target/classes/com/cse3310/HttpServer.class differ
diff --git a/target/classes/com/cse3310/Locations.class b/target/classes/com/cse3310/Locations.class
index a69f779..21d4d2a 100644
Binary files a/target/classes/com/cse3310/Locations.class and b/target/classes/com/cse3310/Locations.class differ
diff --git a/target/classes/com/cse3310/ServerEvent.class b/target/classes/com/cse3310/ServerEvent.class
index c29c1ae..2ec5abb 100644
Binary files a/target/classes/com/cse3310/ServerEvent.class and b/target/classes/com/cse3310/ServerEvent.class differ
diff --git a/target/classes/com/cse3310/User.class b/target/classes/com/cse3310/User.class
index d376a46..906400f 100644
Binary files a/target/classes/com/cse3310/User.class and b/target/classes/com/cse3310/User.class differ
diff --git a/target/classes/com/cse3310/UserEvent.class b/target/classes/com/cse3310/UserEvent.class
index 2049cc9..3acce81 100644
Binary files a/target/classes/com/cse3310/UserEvent.class and b/target/classes/com/cse3310/UserEvent.class differ
diff --git a/target/cse3310-wordsearch.jar b/target/cse3310-wordsearch.jar
index b17328d..f0d4389 100644
Binary files a/target/cse3310-wordsearch.jar and b/target/cse3310-wordsearch.jar differ
diff --git a/target/surefire-reports/TEST-com.cse3310.AppTest.xml b/target/surefire-reports/TEST-com.cse3310.AppTest.xml
index c4e4251..8bed0a5 100644
--- a/target/surefire-reports/TEST-com.cse3310.AppTest.xml
+++ b/target/surefire-reports/TEST-com.cse3310.AppTest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.cse3310.AppTest" time="0.05" tests="1" errors="0" skipped="0" failures="0">
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.cse3310.AppTest" time="0.051" tests="1" errors="0" skipped="0" failures="0">
   <properties>
     <property name="java.specification.version" value="21"/>
     <property name="sun.jnu.encoding" value="UTF-8"/>
@@ -11,7 +11,7 @@
     <property name="java.vm.specification.version" value="21"/>
     <property name="sun.java.launcher" value="SUN_STANDARD"/>
     <property name="sun.boot.library.path" value="/usr/local/sdkman/candidates/java/21.0.2-ms/lib"/>
-    <property name="sun.java.command" value="/workspaces/cse3310_sp24_group_26/target/surefire/surefirebooter5972284328267880397.jar /workspaces/cse3310_sp24_group_26/target/surefire 2024-04-13T06-51-21_617-jvmRun1 surefire14162063764419139343tmp surefire_017489560524494552720tmp"/>
+    <property name="sun.java.command" value="/workspaces/cse3310_sp24_group_26/target/surefire/surefirebooter14039090773852145503.jar /workspaces/cse3310_sp24_group_26/target/surefire 2024-04-13T19-37-40_596-jvmRun1 surefire17408383254445461201tmp surefire_01577500218245761020tmp"/>
     <property name="jdk.debug" value="release"/>
     <property name="surefire.test.class.path" value="/workspaces/cse3310_sp24_group_26/target/test-classes:/workspaces/cse3310_sp24_group_26/target/classes:/home/codespace/.m2/repository/junit/junit/4.11/junit-4.11.jar:/home/codespace/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/home/codespace/.m2/repository/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar:/home/codespace/.m2/repository/net/freeutils/jlhttp/2.6/jlhttp-2.6.jar:/home/codespace/.m2/repository/org/java-websocket/Java-WebSocket/1.5.4/Java-WebSocket-1.5.4.jar:/home/codespace/.m2/repository/org/slf4j/slf4j-api/2.0.6/slf4j-api-2.0.6.jar:"/>
     <property name="sun.cpu.endian" value="little"/>
@@ -26,7 +26,7 @@
     <property name="line.separator" value="&#10;"/>
     <property name="java.specification.name" value="Java Platform API Specification"/>
     <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
-    <property name="surefire.real.class.path" value="/workspaces/cse3310_sp24_group_26/target/surefire/surefirebooter5972284328267880397.jar"/>
+    <property name="surefire.real.class.path" value="/workspaces/cse3310_sp24_group_26/target/surefire/surefirebooter14039090773852145503.jar"/>
     <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
     <property name="java.runtime.version" value="21.0.2+13-LTS"/>
     <property name="user.name" value="codespace"/>
@@ -53,5 +53,5 @@
     <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
     <property name="java.class.version" value="65.0"/>
   </properties>
-  <testcase name="shouldAnswerWithTrue" classname="com.cse3310.AppTest" time="0.011"/>
+  <testcase name="shouldAnswerWithTrue" classname="com.cse3310.AppTest" time="0.004"/>
 </testsuite>
\ No newline at end of file
diff --git a/target/surefire-reports/com.cse3310.AppTest.txt b/target/surefire-reports/com.cse3310.AppTest.txt
index 9ecb73e..1bfe75a 100644
--- a/target/surefire-reports/com.cse3310.AppTest.txt
+++ b/target/surefire-reports/com.cse3310.AppTest.txt
@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.cse3310.AppTest
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.05 s - in com.cse3310.AppTest
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.051 s - in com.cse3310.AppTest
diff --git a/target/test-classes/com/cse3310/AppTest.class b/target/test-classes/com/cse3310/AppTest.class
index 35d0340..50dc4d7 100644
Binary files a/target/test-classes/com/cse3310/AppTest.class and b/target/test-classes/com/cse3310/AppTest.class differ