diff --git a/WebHostLib/__init__.py b/WebHostLib/__init__.py
index 2c0bb9c5..d6d05064 100644
--- a/WebHostLib/__init__.py
+++ b/WebHostLib/__init__.py
@@ -131,7 +131,7 @@ def host_room(room: UUID):
 
 @app.route('/favicon.ico')
 def favicon():
-    return send_from_directory(os.path.join(app.root_path, 'static'),
+    return send_from_directory(os.path.join(app.root_path, 'static/static'),
                                'favicon.ico', mimetype='image/vnd.microsoft.icon')
 
 
diff --git a/WebHostLib/static/generate.js b/WebHostLib/static/assets/generate.js
similarity index 100%
rename from WebHostLib/static/generate.js
rename to WebHostLib/static/assets/generate.js
diff --git a/WebHostLib/static/jquery.scrollsync.js b/WebHostLib/static/assets/jquery.scrollsync.js
similarity index 100%
rename from WebHostLib/static/jquery.scrollsync.js
rename to WebHostLib/static/assets/jquery.scrollsync.js
diff --git a/WebHostLib/static/layout.js b/WebHostLib/static/assets/layout.js
similarity index 100%
rename from WebHostLib/static/layout.js
rename to WebHostLib/static/assets/layout.js
diff --git a/WebHostLib/static/tracker.js b/WebHostLib/static/assets/tracker.js
similarity index 100%
rename from WebHostLib/static/tracker.js
rename to WebHostLib/static/assets/tracker.js
diff --git a/WebHostLib/static/tutorial.js b/WebHostLib/static/assets/tutorial.js
similarity index 100%
rename from WebHostLib/static/tutorial.js
rename to WebHostLib/static/assets/tutorial.js
diff --git a/WebHostLib/static/uploads.js b/WebHostLib/static/assets/uploads.js
similarity index 100%
rename from WebHostLib/static/uploads.js
rename to WebHostLib/static/assets/uploads.js
diff --git a/WebHostLib/static/view_seed.js b/WebHostLib/static/assets/view_seed.js
similarity index 100%
rename from WebHostLib/static/view_seed.js
rename to WebHostLib/static/assets/view_seed.js
diff --git a/WebHostLib/static/favicon.ico b/WebHostLib/static/static/favicon.ico
similarity index 100%
rename from WebHostLib/static/favicon.ico
rename to WebHostLib/static/static/favicon.ico
diff --git a/WebHostLib/static/host_room.css b/WebHostLib/static/styles/host_room.css
similarity index 100%
rename from WebHostLib/static/host_room.css
rename to WebHostLib/static/styles/host_room.css
diff --git a/WebHostLib/static/landing.css b/WebHostLib/static/styles/landing.css
similarity index 100%
rename from WebHostLib/static/landing.css
rename to WebHostLib/static/styles/landing.css
diff --git a/WebHostLib/static/layout.css b/WebHostLib/static/styles/layout.css
similarity index 100%
rename from WebHostLib/static/layout.css
rename to WebHostLib/static/styles/layout.css
diff --git a/WebHostLib/static/tablepage.css b/WebHostLib/static/styles/tablepage.css
similarity index 100%
rename from WebHostLib/static/tablepage.css
rename to WebHostLib/static/styles/tablepage.css
diff --git a/WebHostLib/static/tooltip.css b/WebHostLib/static/styles/tooltip.css
similarity index 100%
rename from WebHostLib/static/tooltip.css
rename to WebHostLib/static/styles/tooltip.css
diff --git a/WebHostLib/static/tracker.css b/WebHostLib/static/styles/tracker.css
similarity index 100%
rename from WebHostLib/static/tracker.css
rename to WebHostLib/static/styles/tracker.css
diff --git a/WebHostLib/static/tutorial.css b/WebHostLib/static/styles/tutorial.css
similarity index 100%
rename from WebHostLib/static/tutorial.css
rename to WebHostLib/static/styles/tutorial.css
diff --git a/WebHostLib/static/tutorial.md b/WebHostLib/static/styles/tutorial.md
similarity index 100%
rename from WebHostLib/static/tutorial.md
rename to WebHostLib/static/styles/tutorial.md
diff --git a/WebHostLib/static/uploads.css b/WebHostLib/static/styles/uploads.css
similarity index 100%
rename from WebHostLib/static/uploads.css
rename to WebHostLib/static/styles/uploads.css
diff --git a/WebHostLib/static/view_seed.css b/WebHostLib/static/styles/view_seed.css
similarity index 100%
rename from WebHostLib/static/view_seed.css
rename to WebHostLib/static/styles/view_seed.css
diff --git a/WebHostLib/templates/check.html b/WebHostLib/templates/check.html
index 923db891..511bb13f 100644
--- a/WebHostLib/templates/check.html
+++ b/WebHostLib/templates/check.html
@@ -3,8 +3,8 @@
 {% block head %}
     {{ super() }}
     <title>Mystery Check Result</title>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("uploads.css") }}" />
-    <script type="application/ecmascript" src="{{ static_autoversion("uploads.js") }}"></script>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/uploads.css") }}" />
+    <script type="application/ecmascript" src="{{ static_autoversion("assets/uploads.js") }}"></script>
 {% endblock %}
 
 {% block body %}
diff --git a/WebHostLib/templates/generate.html b/WebHostLib/templates/generate.html
index a2532f5f..e7835482 100644
--- a/WebHostLib/templates/generate.html
+++ b/WebHostLib/templates/generate.html
@@ -3,8 +3,8 @@
 {% block head %}
     {{ super() }}
     <title>Generate Game</title>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("uploads.css") }}"/>
-    <script type="application/ecmascript" src="{{ static_autoversion("generate.js") }}"></script>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/uploads.css") }}"/>
+    <script type="application/ecmascript" src="{{ static_autoversion("assets/generate.js") }}"></script>
 {% endblock %}
 
 {% block body %}
diff --git a/WebHostLib/templates/host_room.html b/WebHostLib/templates/host_room.html
index ef80b455..a519fde1 100644
--- a/WebHostLib/templates/host_room.html
+++ b/WebHostLib/templates/host_room.html
@@ -2,7 +2,7 @@
 {% import "macros.html" as macros %}
 {% block head %}
     <title>Multiworld {{ room.id|suuid }}</title>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("host_room.css") }}"/>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/host_room.css") }}"/>
 {% endblock %}
 
 {% block body %}
diff --git a/WebHostLib/templates/landing.html b/WebHostLib/templates/landing.html
index fa714ad9..65a977e6 100644
--- a/WebHostLib/templates/landing.html
+++ b/WebHostLib/templates/landing.html
@@ -2,7 +2,7 @@
 
 {% block head %}
     <title>Berserker's Multiworld</title>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("landing.css") }}" />
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/landing.css") }}" />
 {% endblock %}
 
 {% block body %}
@@ -20,10 +20,10 @@
             </div>
             <div id="landing-buttons">
                 <a href="{{ url_for("generate") }}">
-                    <button>Start Playing</button>
+                    <button>Start a New Game</button>
                 </a>
                 <a href="{{ url_for("uploads") }}">
-                    <button>Upload Multiworld</button>
+                    <button>Host Existing Game</button>
                 </a>
                 <a href="{{ url_for("mysterycheck") }}">
                     <button>Test YAML Config</button>
diff --git a/WebHostLib/templates/layout.html b/WebHostLib/templates/layout.html
index b2630a11..4118ec9e 100644
--- a/WebHostLib/templates/layout.html
+++ b/WebHostLib/templates/layout.html
@@ -2,9 +2,9 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("layout.css") }}" />
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("tooltip.css") }}" />
-    <script type="application/ecmascript" src="{{ static_autoversion("layout.js") }}"></script>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/layout.css") }}" />
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/tooltip.css") }}" />
+    <script type="application/ecmascript" src="{{ static_autoversion("assets/layout.js") }}"></script>
     {% block head %}
         <title>Berserker's Multiworld</title>
     {% endblock %}
diff --git a/WebHostLib/templates/tablepage.html b/WebHostLib/templates/tablepage.html
index 12dd4ddf..0867b2f7 100644
--- a/WebHostLib/templates/tablepage.html
+++ b/WebHostLib/templates/tablepage.html
@@ -7,5 +7,5 @@
     <script type="text/javascript"
             src="https://cdn.datatables.net/v/dt/jq-3.3.1/dt-1.10.21/sc-2.0.2/sp-1.1.1/datatables.min.js"
     ></script>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("tablepage.css") }}" />
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/tablepage.css") }}" />
 {% endblock %}
diff --git a/WebHostLib/templates/tracker.html b/WebHostLib/templates/tracker.html
index 569ad7f5..1d92e512 100644
--- a/WebHostLib/templates/tracker.html
+++ b/WebHostLib/templates/tracker.html
@@ -2,18 +2,22 @@
 {% block head %}
     {{ super() }}
     <title>Multiworld Tracker for Room {{ room.id }}</title>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("tracker.css") }}"/>
-    <script type="application/ecmascript" src="{{ static_autoversion("jquery.scrollsync.js") }}"></script>
-    <script type="application/ecmascript" src="{{ static_autoversion("tracker.js") }}"></script>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/tracker.css") }}"/>
+    <script type="application/ecmascript" src="{{ static_autoversion("assets/jquery.scrollsync.js") }}"></script>
+    <script type="application/ecmascript" src="{{ static_autoversion("assets/tracker.js") }}"></script>
 {% endblock %}
 {% block body %}
     <div id="tracker-wrapper" data-tracker="{{ room.tracker|suuid }}">
         <div id="tracker-header-bar">
             <input placeholder="Search" id="search"/>
-            <span{% if not video %} hidden{% endif %} id="multi-stream-link"><a target="_blank" href="https://multistream.me/
-                {%- for platform, link in video.values()|unique(False, 1)-%}
-                    {%- if platform == "Twitch" -%}t{%- else -%}yt{%- endif -%}:{{- link -}}/
-                {%- endfor -%}">Multistream</a></span>
+            <span{% if not video %} hidden{% endif %} id="multi-stream-link">
+                <a target="_blank" href="https://multistream.me/
+                    {%- for platform, link in video.values()|unique(False, 1)-%}
+                        {%- if platform == "Twitch" -%}t{%- else -%}yt{%- endif -%}:{{- link -}}/
+                    {%- endfor -%}">
+                    Multistream
+                </a>
+            </span>
             <span>This tracker will automatically update itself periodically.</span>
         </div>
         <div id="tables-container">
diff --git a/WebHostLib/templates/tutorial.html b/WebHostLib/templates/tutorial.html
index 2bbd8307..4e80206d 100644
--- a/WebHostLib/templates/tutorial.html
+++ b/WebHostLib/templates/tutorial.html
@@ -2,9 +2,9 @@
 
 {% block head %}
     <title>Setup Tutorial</title>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("tutorial.css") }}" />
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/tutorial.css") }}" />
     <script type="application/ecmascript" src="https://unpkg.com/showdown/dist/showdown.min.js"></script>
-    <script type="application/ecmascript" src="{{ static_autoversion("tutorial.js") }}"></script>
+    <script type="application/ecmascript" src="{{ static_autoversion("assets/tutorial.js") }}"></script>
 {% endblock %}
 
 {% block body %}
diff --git a/WebHostLib/templates/uploads.html b/WebHostLib/templates/uploads.html
index 40f4362f..5e36507f 100644
--- a/WebHostLib/templates/uploads.html
+++ b/WebHostLib/templates/uploads.html
@@ -3,8 +3,8 @@
 {% block head %}
     {{ super() }}
     <title>Upload Multidata</title>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("uploads.css") }}" />
-    <script type="application/ecmascript" src="{{ static_autoversion("uploads.js") }}"></script>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/uploads.css") }}" />
+    <script type="application/ecmascript" src="{{ static_autoversion("assets/uploads.js") }}"></script>
 {% endblock %}
 
 {% block body %}
diff --git a/WebHostLib/templates/view_seed.html b/WebHostLib/templates/view_seed.html
index 5dd85018..0db581ee 100644
--- a/WebHostLib/templates/view_seed.html
+++ b/WebHostLib/templates/view_seed.html
@@ -3,8 +3,8 @@
 
 {% block head %}
     <title>Multiworld Seed {{ seed.id|suuid }}</title>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("view_seed.css") }}"/>
-    <script type="application/ecmascript" src="{{ static_autoversion("view_seed.js") }}"></script>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/view_seed.css") }}"/>
+    <script type="application/ecmascript" src="{{ static_autoversion("assets/view_seed.js") }}"></script>
 {% endblock %}
 
 {% block body %}