diff --git a/html/index.html b/client/index.html
similarity index 97%
rename from html/index.html
rename to client/index.html
index 7ab3c41..5e09512 100644
--- a/html/index.html
+++ b/client/index.html
@@ -54,7 +54,7 @@
 			<div class="container" id="serverContainer" style="display: none;">
 				<h1 class="mt-5" id="serverTitle"></h1>
 				<div class="input-group mb-3">
-					<textarea class="form-control" rows="20" id="consoleTextArea" disabled></textarea>
+					<textarea class="form-control" rows="20" id="consoleTextArea" disabled style="resize: none;"></textarea>
 				</div>
 				<div class="input-group mb-3">
 					<input type="text" class="form-control" id="commandInput">
diff --git a/html/scripts/WebConsole.js b/client/scripts/WebConsole.js
similarity index 94%
rename from html/scripts/WebConsole.js
rename to client/scripts/WebConsole.js
index 8adaf63..27318bb 100644
--- a/html/scripts/WebConsole.js
+++ b/client/scripts/WebConsole.js
@@ -149,7 +149,7 @@ function onWebSocketsMessage(message){
 * Write to console
 */
 function writeToWebConsole(msg){
-	$("#consoleTextArea").append(msg + "\n");
+	$("#consoleTextArea").append(msg.replace("<", "&lt;") + "\n");
 }
 
 /**
diff --git a/html/scripts/WebConsoleConnector.js b/client/scripts/WebConsoleConnector.js
similarity index 100%
rename from html/scripts/WebConsoleConnector.js
rename to client/scripts/WebConsoleConnector.js
diff --git a/html/scripts/WebConsoleManager.js b/client/scripts/WebConsoleManager.js
similarity index 100%
rename from html/scripts/WebConsoleManager.js
rename to client/scripts/WebConsoleManager.js
diff --git a/html/scripts/WebConsolePersistenceManager.js b/client/scripts/WebConsolePersistenceManager.js
similarity index 100%
rename from html/scripts/WebConsolePersistenceManager.js
rename to client/scripts/WebConsolePersistenceManager.js