diff --git a/client/build.sh b/client/build.sh
index 8056530..299ee64 100755
--- a/client/build.sh
+++ b/client/build.sh
@@ -10,8 +10,10 @@ ES6_FILE="out/libcurl_module.mjs"
 MODULE_FILE="out/emscripten_compiled.js"
 COMPILED_FILE="out/emscripten_compiled.wasm"
 WASM_FILE="out/libcurl.wasm"
+
+C_DIR="libcurl"
 FRAGMENTS_DIR="fragments"
-WRAPPER_SOURCE="main.js"
+JAVSCRIPT_DIR="javascript"
 WISP_CLIENT="wisp_client"
 
 #read exported functions
@@ -46,22 +48,22 @@ tools/generate_cert.sh
 rm -rf out
 mkdir -p out
 
-#compile the main c file - but only if the source has been modified
-COMPILE_CMD="emcc *.c $COMPILER_OPTIONS $EMSCRIPTEN_OPTIONS"
+#compile the main c file
+COMPILE_CMD="emcc $C_DIR/*.c $COMPILER_OPTIONS $EMSCRIPTEN_OPTIONS"
 echo $COMPILE_CMD
 $COMPILE_CMD
 mv $COMPILED_FILE $WASM_FILE || true
 
 #merge compiled emscripten module and wrapper code
-cp $WRAPPER_SOURCE $OUT_FILE
+cp $JAVSCRIPT_DIR/main.js $OUT_FILE
 sed -i "/__emscripten_output__/r $MODULE_FILE" $OUT_FILE
 rm $MODULE_FILE
 
 #add extra libraries
 sed -i "/__extra_libraries__/r $WISP_CLIENT/polyfill.js" $OUT_FILE
 sed -i "/__extra_libraries__/r $WISP_CLIENT/wisp.js" $OUT_FILE
-sed -i "/__extra_libraries__/r ./messages.js" $OUT_FILE
-sed -i "/__extra_libraries__/r ./websocket.js" $OUT_FILE
+sed -i "/__extra_libraries__/r $JAVSCRIPT_DIR/messages.js" $OUT_FILE
+sed -i "/__extra_libraries__/r $JAVSCRIPT_DIR/websocket.js" $OUT_FILE
 
 #apply patches
 python3 scripts/patcher.py $FRAGMENTS_DIR $OUT_FILE
diff --git a/client/main.js b/client/javascript/main.js
similarity index 100%
rename from client/main.js
rename to client/javascript/main.js
diff --git a/client/messages.js b/client/javascript/messages.js
similarity index 100%
rename from client/messages.js
rename to client/javascript/messages.js
diff --git a/client/websocket.js b/client/javascript/websocket.js
similarity index 99%
rename from client/websocket.js
rename to client/javascript/websocket.js
index c6451d3..26f9094 100644
--- a/client/websocket.js
+++ b/client/javascript/websocket.js
@@ -80,7 +80,6 @@ class CurlWebSocket extends EventTarget {
     let converted;
     if (is_text) {
       converted = new TextDecoder().decode(data);
-      console.log(is_text);
     }
     else {
       if (this.binaryType == "blob") {
diff --git a/client/main.c b/client/libcurl/main.c
similarity index 100%
rename from client/main.c
rename to client/libcurl/main.c
diff --git a/client/types.h b/client/libcurl/types.h
similarity index 100%
rename from client/types.h
rename to client/libcurl/types.h
diff --git a/client/util.c b/client/libcurl/util.c
similarity index 100%
rename from client/util.c
rename to client/libcurl/util.c
diff --git a/client/util.h b/client/libcurl/util.h
similarity index 100%
rename from client/util.h
rename to client/libcurl/util.h
diff --git a/client/websocket.c b/client/libcurl/websocket.c
similarity index 100%
rename from client/websocket.c
rename to client/libcurl/websocket.c