diff --git a/Server/Client/ext/popper.js b/Server/static/ext/popper.js
similarity index 100%
rename from Server/Client/ext/popper.js
rename to Server/static/ext/popper.js
diff --git a/Server/Client/ext/qrcode.min.js b/Server/static/ext/qrcode.min.js
similarity index 100%
rename from Server/Client/ext/qrcode.min.js
rename to Server/static/ext/qrcode.min.js
diff --git a/Server/Client/favicon.ico b/Server/static/favicon.ico
similarity index 100%
rename from Server/Client/favicon.ico
rename to Server/static/favicon.ico
diff --git a/Server/Client/images/Icon-144.png b/Server/static/images/Icon-144.png
similarity index 100%
rename from Server/Client/images/Icon-144.png
rename to Server/static/images/Icon-144.png
diff --git a/Server/Client/images/Screenshot-Main-Desktop.png b/Server/static/images/Screenshot-Main-Desktop.png
similarity index 100%
rename from Server/Client/images/Screenshot-Main-Desktop.png
rename to Server/static/images/Screenshot-Main-Desktop.png
diff --git a/Server/Client/images/Screenshot-Main-Mobile.png b/Server/static/images/Screenshot-Main-Mobile.png
similarity index 100%
rename from Server/Client/images/Screenshot-Main-Mobile.png
rename to Server/static/images/Screenshot-Main-Mobile.png
diff --git a/Server/Client/images/placeholder.png b/Server/static/images/placeholder.png
similarity index 100%
rename from Server/Client/images/placeholder.png
rename to Server/static/images/placeholder.png
diff --git a/Server/Client/images/play-pause-old.png b/Server/static/images/play-pause-old.png
similarity index 100%
rename from Server/Client/images/play-pause-old.png
rename to Server/static/images/play-pause-old.png
diff --git a/Server/Client/images/play-pause.png b/Server/static/images/play-pause.png
similarity index 100%
rename from Server/Client/images/play-pause.png
rename to Server/static/images/play-pause.png
diff --git a/Server/Client/images/playlist.png b/Server/static/images/playlist.png
similarity index 100%
rename from Server/Client/images/playlist.png
rename to Server/static/images/playlist.png
diff --git a/Server/Client/images/search.png b/Server/static/images/search.png
similarity index 100%
rename from Server/Client/images/search.png
rename to Server/static/images/search.png
diff --git a/Server/Client/images/settings.png b/Server/static/images/settings.png
similarity index 100%
rename from Server/Client/images/settings.png
rename to Server/static/images/settings.png
diff --git a/Server/Client/images/skip.png b/Server/static/images/skip.png
similarity index 100%
rename from Server/Client/images/skip.png
rename to Server/static/images/skip.png
diff --git a/Server/Client/manifest.json b/Server/static/manifest.json
similarity index 100%
rename from Server/Client/manifest.json
rename to Server/static/manifest.json
diff --git a/Server/Client/scripts.js b/Server/static/scripts.js
similarity index 100%
rename from Server/Client/scripts.js
rename to Server/static/scripts.js
diff --git a/Server/Client/styles.css b/Server/static/styles.css
similarity index 100%
rename from Server/Client/styles.css
rename to Server/static/styles.css
diff --git a/Server/Client/index.html b/Server/templates/index.html
similarity index 100%
rename from Server/Client/index.html
rename to Server/templates/index.html
diff --git a/Server/webbyBits.py b/Server/webbyBits.py
index 25e245b..fea2afe 100644
--- a/Server/webbyBits.py
+++ b/Server/webbyBits.py
@@ -1,5 +1,5 @@
 from flask import Flask
-from flask import request
+from flask import request,render_template
 from flask_cors import CORS
 from flask_socketio import SocketIO
 import sqlite3 as sql
@@ -143,6 +143,10 @@ def playQueuedSongs():
 def handleConnect():
     pass
 
+@app.route("/",methods=['GET'])
+def returnStaticFile():
+    return render_template("index.html")
+
 @app.route("/controls", methods=['POST'])
 def playerControls():
     # recieve control inputs (play/pause and skip) from the webUI