diff --git a/.gitignore b/.gitignore
index ca3a110..fab09f1 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,3 @@
-/node_modules/
-/npm-debug.log
 /.vscode/
 /private/
-/js/
-/highscoreData.json
-/staticData/
 /.env
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 41a566e..5393315 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,6 +1,6 @@
 # Overrides for running in development.
 version: "3.6"
 services:
-  cml:
+  webserver:
     ports:
       - "8080:8080"
diff --git a/docker-compose.yml b/docker-compose.yml
index 85a0168..69f98f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,8 @@
 version: "3.6"
 services:
-  cml:
+  webserver:
     build:
-      context: ./
+      context: ./webserver
     volumes:
       - "staticData:/cml/staticData/"
       - "highscoreData:/cml/highscoreData"
diff --git a/.dockerignore b/webserver/.dockerignore
similarity index 67%
rename from .dockerignore
rename to webserver/.dockerignore
index 5906fea..f1a881a 100644
--- a/.dockerignore
+++ b/webserver/.dockerignore
@@ -1,7 +1,4 @@
-node_modules/
-.vscode/
-private/
 js/
 highscoreData.json
 staticData/
-.git/
+node_modules/
diff --git a/webserver/.gitignore b/webserver/.gitignore
new file mode 100644
index 0000000..ccdb399
--- /dev/null
+++ b/webserver/.gitignore
@@ -0,0 +1,5 @@
+/js/
+/staticData/
+/highscoreData.json
+/node_modules/
+/npm-debug.log
diff --git a/Dockerfile b/webserver/Dockerfile
similarity index 100%
rename from Dockerfile
rename to webserver/Dockerfile
diff --git a/package-lock.json b/webserver/package-lock.json
similarity index 100%
rename from package-lock.json
rename to webserver/package-lock.json
diff --git a/package.json b/webserver/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from package.json
rename to webserver/package.json
diff --git a/public/android-chrome-192x192.png b/webserver/public/android-chrome-192x192.png
similarity index 100%
rename from public/android-chrome-192x192.png
rename to webserver/public/android-chrome-192x192.png
diff --git a/public/android-chrome-512x512.png b/webserver/public/android-chrome-512x512.png
similarity index 100%
rename from public/android-chrome-512x512.png
rename to webserver/public/android-chrome-512x512.png
diff --git a/public/apple-touch-icon.png b/webserver/public/apple-touch-icon.png
similarity index 100%
rename from public/apple-touch-icon.png
rename to webserver/public/apple-touch-icon.png
diff --git a/public/browserconfig.xml b/webserver/public/browserconfig.xml
similarity index 100%
rename from public/browserconfig.xml
rename to webserver/public/browserconfig.xml
diff --git a/public/css/champion.css b/webserver/public/css/champion.css
old mode 100755
new mode 100644
similarity index 100%
rename from public/css/champion.css
rename to webserver/public/css/champion.css
diff --git a/public/css/error.css b/webserver/public/css/error.css
similarity index 100%
rename from public/css/error.css
rename to webserver/public/css/error.css
diff --git a/public/css/faq.css b/webserver/public/css/faq.css
old mode 100755
new mode 100644
similarity index 100%
rename from public/css/faq.css
rename to webserver/public/css/faq.css
diff --git a/public/css/highscores.css b/webserver/public/css/highscores.css
old mode 100755
new mode 100644
similarity index 100%
rename from public/css/highscores.css
rename to webserver/public/css/highscores.css
diff --git a/public/css/home.css b/webserver/public/css/home.css
similarity index 100%
rename from public/css/home.css
rename to webserver/public/css/home.css
diff --git a/public/css/styles.css b/webserver/public/css/styles.css
old mode 100755
new mode 100644
similarity index 100%
rename from public/css/styles.css
rename to webserver/public/css/styles.css
diff --git a/public/css/summoner.css b/webserver/public/css/summoner.css
old mode 100755
new mode 100644
similarity index 100%
rename from public/css/summoner.css
rename to webserver/public/css/summoner.css
diff --git a/public/favicon-16x16.png b/webserver/public/favicon-16x16.png
similarity index 100%
rename from public/favicon-16x16.png
rename to webserver/public/favicon-16x16.png
diff --git a/public/favicon-32x32.png b/webserver/public/favicon-32x32.png
similarity index 100%
rename from public/favicon-32x32.png
rename to webserver/public/favicon-32x32.png
diff --git a/public/favicon.ico b/webserver/public/favicon.ico
similarity index 100%
rename from public/favicon.ico
rename to webserver/public/favicon.ico
diff --git a/public/img/arrow-ascending.gif b/webserver/public/img/arrow-ascending.gif
old mode 100755
new mode 100644
similarity index 100%
rename from public/img/arrow-ascending.gif
rename to webserver/public/img/arrow-ascending.gif
diff --git a/public/img/arrow-descending.gif b/webserver/public/img/arrow-descending.gif
old mode 100755
new mode 100644
similarity index 100%
rename from public/img/arrow-descending.gif
rename to webserver/public/img/arrow-descending.gif
diff --git a/public/img/arrow-unsorted.gif b/webserver/public/img/arrow-unsorted.gif
old mode 100755
new mode 100644
similarity index 100%
rename from public/img/arrow-unsorted.gif
rename to webserver/public/img/arrow-unsorted.gif
diff --git a/public/img/championMasteryPoro.jpg b/webserver/public/img/championMasteryPoro.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from public/img/championMasteryPoro.jpg
rename to webserver/public/img/championMasteryPoro.jpg
diff --git a/public/img/chest.png b/webserver/public/img/chest.png
old mode 100755
new mode 100644
similarity index 100%
rename from public/img/chest.png
rename to webserver/public/img/chest.png
diff --git a/public/img/logo-icon.png b/webserver/public/img/logo-icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from public/img/logo-icon.png
rename to webserver/public/img/logo-icon.png
diff --git a/public/img/logo-text.png b/webserver/public/img/logo-text.png
similarity index 100%
rename from public/img/logo-text.png
rename to webserver/public/img/logo-text.png
diff --git a/public/img/masteryIcon.png b/webserver/public/img/masteryIcon.png
old mode 100755
new mode 100644
similarity index 100%
rename from public/img/masteryIcon.png
rename to webserver/public/img/masteryIcon.png
diff --git a/public/img/token.png b/webserver/public/img/token.png
old mode 100755
new mode 100644
similarity index 100%
rename from public/img/token.png
rename to webserver/public/img/token.png
diff --git a/public/js/highscores.js b/webserver/public/js/highscores.js
old mode 100755
new mode 100644
similarity index 100%
rename from public/js/highscores.js
rename to webserver/public/js/highscores.js
diff --git a/public/js/rgea.js b/webserver/public/js/rgea.js
similarity index 100%
rename from public/js/rgea.js
rename to webserver/public/js/rgea.js
diff --git a/public/js/script.js b/webserver/public/js/script.js
old mode 100755
new mode 100644
similarity index 100%
rename from public/js/script.js
rename to webserver/public/js/script.js
diff --git a/public/js/summoner.js b/webserver/public/js/summoner.js
old mode 100755
new mode 100644
similarity index 100%
rename from public/js/summoner.js
rename to webserver/public/js/summoner.js
diff --git a/public/mstile-150x150.png b/webserver/public/mstile-150x150.png
similarity index 100%
rename from public/mstile-150x150.png
rename to webserver/public/mstile-150x150.png
diff --git a/public/safari-pinned-tab.svg b/webserver/public/safari-pinned-tab.svg
similarity index 100%
rename from public/safari-pinned-tab.svg
rename to webserver/public/safari-pinned-tab.svg
diff --git a/public/site.webmanifest b/webserver/public/site.webmanifest
similarity index 100%
rename from public/site.webmanifest
rename to webserver/public/site.webmanifest
diff --git a/ts/CacheHandler.ts b/webserver/ts/CacheHandler.ts
old mode 100755
new mode 100644
similarity index 100%
rename from ts/CacheHandler.ts
rename to webserver/ts/CacheHandler.ts
diff --git a/ts/Champion.ts b/webserver/ts/Champion.ts
similarity index 100%
rename from ts/Champion.ts
rename to webserver/ts/Champion.ts
diff --git a/ts/Config.ts b/webserver/ts/Config.ts
similarity index 100%
rename from ts/Config.ts
rename to webserver/ts/Config.ts
diff --git a/ts/Highscores.ts b/webserver/ts/Highscores.ts
similarity index 100%
rename from ts/Highscores.ts
rename to webserver/ts/Highscores.ts
diff --git a/ts/RateLimit.ts b/webserver/ts/RateLimit.ts
similarity index 100%
rename from ts/RateLimit.ts
rename to webserver/ts/RateLimit.ts
diff --git a/ts/RateLimiter.ts b/webserver/ts/RateLimiter.ts
similarity index 100%
rename from ts/RateLimiter.ts
rename to webserver/ts/RateLimiter.ts
diff --git a/ts/Region.ts b/webserver/ts/Region.ts
similarity index 100%
rename from ts/Region.ts
rename to webserver/ts/Region.ts
diff --git a/ts/apiHandler.ts b/webserver/ts/apiHandler.ts
old mode 100755
new mode 100644
similarity index 100%
rename from ts/apiHandler.ts
rename to webserver/ts/apiHandler.ts
diff --git a/ts/routes/champion.ts b/webserver/ts/routes/champion.ts
similarity index 100%
rename from ts/routes/champion.ts
rename to webserver/ts/routes/champion.ts
diff --git a/ts/routes/highscores.ts b/webserver/ts/routes/highscores.ts
similarity index 100%
rename from ts/routes/highscores.ts
rename to webserver/ts/routes/highscores.ts
diff --git a/ts/routes/summoner.ts b/webserver/ts/routes/summoner.ts
similarity index 100%
rename from ts/routes/summoner.ts
rename to webserver/ts/routes/summoner.ts
diff --git a/ts/server.ts b/webserver/ts/server.ts
old mode 100755
new mode 100644
similarity index 100%
rename from ts/server.ts
rename to webserver/ts/server.ts
diff --git a/ts/staticDataUpdater.ts b/webserver/ts/staticDataUpdater.ts
similarity index 100%
rename from ts/staticDataUpdater.ts
rename to webserver/ts/staticDataUpdater.ts
diff --git a/ts/types.ts b/webserver/ts/types.ts
old mode 100755
new mode 100644
similarity index 100%
rename from ts/types.ts
rename to webserver/ts/types.ts
diff --git a/tsconfig.json b/webserver/tsconfig.json
old mode 100755
new mode 100644
similarity index 100%
rename from tsconfig.json
rename to webserver/tsconfig.json
diff --git a/tslint.json b/webserver/tslint.json
similarity index 100%
rename from tslint.json
rename to webserver/tslint.json
diff --git a/views/champion.handlebars b/webserver/views/champion.handlebars
similarity index 100%
rename from views/champion.handlebars
rename to webserver/views/champion.handlebars
diff --git a/views/error.handlebars b/webserver/views/error.handlebars
similarity index 100%
rename from views/error.handlebars
rename to webserver/views/error.handlebars
diff --git a/views/faq.handlebars b/webserver/views/faq.handlebars
similarity index 100%
rename from views/faq.handlebars
rename to webserver/views/faq.handlebars
diff --git a/views/highscores.handlebars b/webserver/views/highscores.handlebars
similarity index 100%
rename from views/highscores.handlebars
rename to webserver/views/highscores.handlebars
diff --git a/views/home.handlebars b/webserver/views/home.handlebars
similarity index 100%
rename from views/home.handlebars
rename to webserver/views/home.handlebars
diff --git a/views/layout.handlebars b/webserver/views/layout.handlebars
similarity index 100%
rename from views/layout.handlebars
rename to webserver/views/layout.handlebars
diff --git a/views/legal.handlebars b/webserver/views/legal.handlebars
similarity index 100%
rename from views/legal.handlebars
rename to webserver/views/legal.handlebars
diff --git a/views/summoner.handlebars b/webserver/views/summoner.handlebars
old mode 100755
new mode 100644
similarity index 100%
rename from views/summoner.handlebars
rename to webserver/views/summoner.handlebars