diff --git a/game/gamesrc/web/static/README.md b/game/gamesrc/web/static/README.md
index 7b76fffe1f..10e1c27214 100644
--- a/game/gamesrc/web/static/README.md
+++ b/game/gamesrc/web/static/README.md
@@ -1,7 +1,3 @@
-If you want to override one of the static files (such as a CSS or JS file) used by Evennia or a Django app installed in your Evennia project, copy it into this folder, and it will be placed in the static folder when you run:
+DO NOT EDIT FILES IN THIS DIRECTORY! THEY WILL BE OVERWRITTEN.
 
-    python manage.py collectstatic
-
-or reload the server via the command line.
-
-Do note you may have to reproduce any preceeding directory structures for the file to end up in the right place.
+If you need to edit static files, see the static_overrides directory.
diff --git a/game/gamesrc/web/static_overrides/README.md b/game/gamesrc/web/static_overrides/README.md
index 8640413887..0bc428b141 100644
--- a/game/gamesrc/web/static_overrides/README.md
+++ b/game/gamesrc/web/static_overrides/README.md
@@ -2,4 +2,6 @@ If you want to override one of the static files (such as a CSS or JS file) used
 
     python manage.py collectstatic
 
+...or when you reload the server via the command line.
+
 Do note you may have to reproduce any preceeding directory structures for the file to end up in the right place.
diff --git a/src/settings_default.py b/src/settings_default.py
index d819a3b8cd..e64eaab545 100644
--- a/src/settings_default.py
+++ b/src/settings_default.py
@@ -113,7 +113,8 @@ CYCLE_LOGFILES = True
 # http://www.postgresql.org/docs/8.0/interactive/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
 TIME_ZONE = 'UTC'
 # Authentication backends. This is the code used to authenticate a user.
-AUTHENTICATION_BACKENDS = ('src.web.backends.CaseInsensitiveModelBackend',)
+AUTHENTICATION_BACKENDS = (
+    'src.web.utils.backends.CaseInsensitiveModelBackend',)
 # Language code for this installation. All choices can be found here:
 # http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
 LANGUAGE_CODE = 'en-us'
diff --git a/src/web/backends.py b/src/web/utils/backends.py
similarity index 100%
rename from src/web/backends.py
rename to src/web/utils/backends.py
diff --git a/src/web/media/javascript/evennia_websocket_webclient.js b/src/web/webclient/static/webclient/js/evennia_websocket_webclient.js
similarity index 100%
rename from src/web/media/javascript/evennia_websocket_webclient.js
rename to src/web/webclient/static/webclient/js/evennia_websocket_webclient.js
diff --git a/src/web/webclient/templates/webclient.html b/src/web/webclient/templates/webclient.html
index efc1c90dfc..b28aa204cd 100644
--- a/src/web/webclient/templates/webclient.html
+++ b/src/web/webclient/templates/webclient.html
@@ -21,14 +21,14 @@
             if ("WebSocket" in window) {
                 <!-- Importing the Evennia websocket webclient component (requires jQuery)  -->
                 var wsurl = "{{websocket_url}}";
-                document.write("\<script src=\"/media/javascript/evennia_websocket_webclient.js\" type=\"text/javascript\" charset=\"utf-8\"\>\</script\>")}
+                document.write("\<script src=\"{% static "webclient/js/evennia_websocket_webclient.js" %}\" type=\"text/javascript\" charset=\"utf-8\"\>\</script\>")}
             else {
                 <!-- No websocket support in browser. Importing the Evennia ajax webclient component (requires jQuery)  -->
                 document.write("\<script src=\"{% static "webclient/js/evennia_ajax_webclient.js" %}\" type=\"text/javascript\" charset=\"utf-8\"\>\</script\>")}
         </script>
     {% else %}
             <!-- websocket not enabled; use ajax -->
-            <script src="/media/javascript/evennia_ajax_webclient.js" type="text/javascript" charset="utf-8"></script>
+            <script src="{% static "webclient/js/evennia_ajax_webclient.js" %}" type="text/javascript" charset="utf-8"></script>
     {% endif %}
 
   </head>