diff --git a/.travis.yml b/.travis.yml
index ee5902549..2c9b98abd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ before_install:
     - sudo make install
     - cd ..
 install:
-    - pip install -r requirements.txt
+    - pip install -r requirements/local.txt
 script:
     - python cuckoo.py --debug --test
     - nosetests
diff --git a/requirements.txt b/requirements/base.txt
similarity index 92%
rename from requirements.txt
rename to requirements/base.txt
index aba386d41..1c67b3856 100644
--- a/requirements.txt
+++ b/requirements/base.txt
@@ -10,3 +10,4 @@ nose
 jsbeautifier
 pygal
 dnspython
+unipath
diff --git a/requirements/local.txt b/requirements/local.txt
new file mode 100644
index 000000000..2031a0db3
--- /dev/null
+++ b/requirements/local.txt
@@ -0,0 +1,4 @@
+-r base.txt
+Werkzeug
+django-extensions
+django-debug-toolbar
diff --git a/requirements/production.txt b/requirements/production.txt
new file mode 100644
index 000000000..996b2fa8f
--- /dev/null
+++ b/requirements/production.txt
@@ -0,0 +1,2 @@
+-r base.txt
+gunicorn
diff --git a/web/manage.py b/web/manage.py
index 81232ff99..f2c980540 100755
--- a/web/manage.py
+++ b/web/manage.py
@@ -7,7 +7,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "web.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "web.settings.production")
 
     from django.core.management import execute_from_command_line
 
diff --git a/web/templates/analysis/index.html b/web/templates/analysis/index.html
index 9e3316198..b95f0d5eb 100644
--- a/web/templates/analysis/index.html
+++ b/web/templates/analysis/index.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
-<p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+<p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 
 <ul class="nav nav-tabs">
     <li class="active"><a href="#files" data-toggle="tab">Files</a></li>
@@ -100,7 +101,7 @@ <h3 class="panel-title">Recent Files</h3>
                         {% endif %}
                         <td>
                             {% if analysis.malscore != None %}
-                                <span 
+                                <span
                                 {% if analysis.malscore <= 2.0 %}
                                 class="label label-success"
                                 {% elif analysis.malscore <= 6.0 %}
@@ -233,7 +234,7 @@ <h3 class="panel-title">Recent URLs</h3>
                         {% endif %}
                         <td>
                             {% if analysis.malscore != None %}
-                                <span 
+                                <span
                                 {% if analysis.malscore <= 2.0 %}
                                 class="label label-success"
                                 {% elif analysis.malscore <= 6.0 %}
diff --git a/web/templates/analysis/network/_tcp.html b/web/templates/analysis/network/_tcp.html
index dd86db34e..69565e6b2 100644
--- a/web/templates/analysis/network/_tcp.html
+++ b/web/templates/analysis/network/_tcp.html
@@ -1,4 +1,5 @@
-<script src="{{ STATIC_URL }}js/hexdump.js"></script>
+{% load staticfiles %}
+<script src="{% static 'js/hexdump.js' %}"></script>
 <section id="tcp" class="tcpudp">
     <h4>TCP</h4>
     {% if analysis.network.tcp %}
@@ -33,7 +34,7 @@ <h4>TCP</h4>
         var $section = $(this).closest("section");
 
         $section.find("table tr.connrow").removeClass("row-active");
-        $(this).addClass("row-active"); 
+        $(this).addClass("row-active");
 
         var choice = $(this).closest('tr').attr('data');
 
@@ -49,7 +50,7 @@ <h4>TCP</h4>
                     var tuple = p.src + ":" + p.sport + " &rarr; " + p.dst + ":" + p.dport;
 
                     if (first == undefined) first = tuple;
-                    if (first != tuple) { 
+                    if (first != tuple) {
                         tcpclass = "tcp-in";
                         icon = "<i class=\"glyphicon glyphicon-chevron-down\" title=\"Inbound\"></i>";
                     } else {
diff --git a/web/templates/analysis/network/_udp.html b/web/templates/analysis/network/_udp.html
index 77f802e29..fef39c02e 100644
--- a/web/templates/analysis/network/_udp.html
+++ b/web/templates/analysis/network/_udp.html
@@ -1,4 +1,5 @@
-<script src="{{ STATIC_URL }}js/hexdump.js"></script>
+{% load staticfiles %}
+<script src="{% static 'js/hexdump.js' %}"></script>
 <section id="udp" class="tcpudp">
     <h4>UDP</h4>
     {% if analysis.network.udp %}
diff --git a/web/templates/analysis/pending.html b/web/templates/analysis/pending.html
index ce5949499..cb1b64220 100644
--- a/web/templates/analysis/pending.html
+++ b/web/templates/analysis/pending.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
-<p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+<p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 
 <div class="panel panel-primary">
     <div class="panel-heading">
diff --git a/web/templates/analysis/report.html b/web/templates/analysis/report.html
index 489baa3f9..3b4c5f496 100644
--- a/web/templates/analysis/report.html
+++ b/web/templates/analysis/report.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
 <script>
 $(function() {
@@ -18,7 +19,7 @@
 });
 </script>
 <div class="row">
-    <div class="col-md-6"><p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p></div>
+    <div class="col-md-6"><p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p></div>
     {% if analysis.info.category == "file" and analysis.target %}
     <div class="col-md-6" style="text-align: right;"><a class="btn btn-primary" href="{% url "compare.views.left" analysis.info.id %}">Compare this analysis to...</a></div>
     {% endif %}
diff --git a/web/templates/analysis/search.html b/web/templates/analysis/search.html
index bf54e6f13..b4c7cc257 100644
--- a/web/templates/analysis/search.html
+++ b/web/templates/analysis/search.html
@@ -1,8 +1,9 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
 <div class="row">
     <div class="col-md-6 col-md-offset-3 center">
-        <p><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+        <p><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 
         <form class="form-inline" role="form" action="{% url "analysis.views.search" %}" enctype="multipart/form-data" method="post">{% csrf_token %}
             <p class="text-muted" style="margin-top: 5px;">For details on how to perform searches, get some <a href="#help" data-toggle="collapse">help</a>.</p>
@@ -227,7 +228,7 @@ <h3 class="panel-title">Search Results</h3>
                         {% endif %}
                         <td>
                             {% if analysis.malscore != None %}
-                                <span 
+                                <span
                                 {% if analysis.malscore <= 2.0 %}
                                 class="label label-success"
                                 {% elif analysis.malscore <= 6.0 %}
diff --git a/web/templates/api/index.html b/web/templates/api/index.html
index 4fecf8645..6591a183e 100644
--- a/web/templates/api/index.html
+++ b/web/templates/api/index.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
-<p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+<p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 
 <div class="panel panel-primary">
     <div class="panel-heading">
diff --git a/web/templates/compare/both.html b/web/templates/compare/both.html
index 274c5b069..79c00fe72 100644
--- a/web/templates/compare/both.html
+++ b/web/templates/compare/both.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
-<p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+<p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 
 <script type='text/javascript'>
 $(function () {
@@ -25,7 +26,7 @@ <h4>Execution Graph</h4>
                 <span class="badge registry" style="color:black;">registry</span>
                 <span class="badge filesystem" style="color:black;">filesystem</span>
                 <span class="badge system" style="color:black;">system</span>
-                <span class="badge network" style="color:black;">network</span>                
+                <span class="badge network" style="color:black;">network</span>
                 <span class="badge process" style="color:black;">process</span>
                 <span class="badge services" style="color:black;">services</span>
                 <span class="badge synchronization" style="color:black;">synchronization</span>
diff --git a/web/templates/compare/hash.html b/web/templates/compare/hash.html
index a20a9e02f..c9e55673b 100644
--- a/web/templates/compare/hash.html
+++ b/web/templates/compare/hash.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
-<p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+<p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 
 <div class="row">
     <div class="col-md-6" style="border-right: 1px dashed #ddd;">
diff --git a/web/templates/compare/left.html b/web/templates/compare/left.html
index d12588195..224e35ba4 100644
--- a/web/templates/compare/left.html
+++ b/web/templates/compare/left.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
-<p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+<p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 
 <script type='text/javascript'>
 $(function () {
diff --git a/web/templates/dashboard/index.html b/web/templates/dashboard/index.html
index 3ff12f728..131b37833 100644
--- a/web/templates/dashboard/index.html
+++ b/web/templates/dashboard/index.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
-<p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+<p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 
 <div class="alert alert-info" style="text-align: center;font-size: 22px;">
     Estimating ~<b>{{report.estimate_hour}}</b> analysis per hour, <b>{{report.estimate_day}}</b> per day.
diff --git a/web/templates/error.html b/web/templates/error.html
index da266c555..d4f4c5163 100644
--- a/web/templates/error.html
+++ b/web/templates/error.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
-<p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+<p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 <div class="alert alert-danger"><b>ERROR :-(</b><br />{{error}}</div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/footer.html b/web/templates/footer.html
index 7ed39df44..8e31dde49 100644
--- a/web/templates/footer.html
+++ b/web/templates/footer.html
@@ -1,3 +1,4 @@
+{% load staticfiles %}
     <!-- Footer
     ================================================== -->
     <footer>
@@ -10,12 +11,12 @@
             <div>&copy;2010-2015 <a href="http://www.cuckoosandbox.org" target="_blank">Cuckoo Sandbox</a></div>
         </div>
     </div>
-    <script src="{{ STATIC_URL }}js/bootstrap.min.js"></script>
-    <script src="{{ STATIC_URL }}js/bootstrap-fileupload.js"></script>
-    <script src="{{ STATIC_URL }}js/lightbox.js"></script>
-    <script src="{{ STATIC_URL }}js/bootstrap-transition.js"></script>
-    <script src="{{ STATIC_URL }}js/bootstrap-collapse.js"></script>
-    <script src="{{ STATIC_URL }}js/moment.min.js"></script>
-    <script src="{{ STATIC_URL }}js/bootstrap-datetimepicker.min.js"></script>
+    <script src="{% static 'js/bootstrap.min.js' %}"></script>
+    <script src="{% static 'js/bootstrap-fileupload.js' %}"></script>
+    <script src="{% static 'js/lightbox.js' %}"></script>
+    <script src="{% static 'js/bootstrap-transition.js' %}"></script>
+    <script src="{% static 'js/bootstrap-collapse.js' %}"></script>
+    <script src="{% static 'js/moment.min.js' %}"></script>
+    <script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
 </body>
 </html>
diff --git a/web/templates/header.html b/web/templates/header.html
index 97a940ef4..28fed95ad 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -1,3 +1,4 @@
+{% load staticfiles %}
 <!DOCTYPE html>
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -8,11 +9,11 @@
 <meta name="author" content="Cuckoo Sandbox">
 
 <!-- Le styles -->
-<link href="{{ STATIC_URL }}css/bootstrap.min.css" rel="stylesheet">
-<link href="{{ STATIC_URL }}css/style.css" rel="stylesheet">
-<link href="{{ STATIC_URL }}css/lightbox.css" rel="stylesheet">
-<link href="{{ STATIC_URL }}css/bootstrap-datetimepicker.min.css" rel="stylesheet">
-<script src="{{ STATIC_URL }}js/jquery.js"></script>
+<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
+<link href="{% static 'css/style.css' %}" rel="stylesheet">
+<link href="{% static 'css/lightbox.css' %}" rel="stylesheet">
+<link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" rel="stylesheet">
+<script src="{% static 'js/jquery.js' %}"></script>
 </head>
 <body>
 <header>
diff --git a/web/templates/statistics/index.html b/web/templates/statistics/index.html
index 7cddfd456..60af8c0ff 100644
--- a/web/templates/statistics/index.html
+++ b/web/templates/statistics/index.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
 <style>
 .btn-file {
@@ -35,29 +36,29 @@
 
 $(document).ready( function() {
     $('.btn-file :file').on('fileselect', function(event, numFiles, label) {
-        
+
         var input = $(this).parents('.input-group').find(':text'),
             log = numFiles > 1 ? numFiles + ' files selected' : label;
-        
+
         if( input.length ) {
             input.val(log);
         } else {
             if( log ) alert(log);
         }
-        
+
     });
-});     
+});
 </script>
 <div class="row">
     <div class="col-md-6 col-md-offset-3 center">
-        <p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+        <p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 
         <div class="row-fluid">
             <div class="span8">
                 <h3>Statistics</h3>
                 {% for he, desc, im in stat_items %}
                     <h2>{{he}}</h2>
-                    <img src="{{ STATIC_URL }}{{im}}"/>
+                    <img src="{% static im %}"/>
                     {{desc}}
                 {% endfor %}
             </div>
@@ -66,4 +67,4 @@ <h2>{{he}}</h2>
 
     </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/submission/complete.html b/web/templates/submission/complete.html
index 940fa9989..e83aae2d3 100644
--- a/web/templates/submission/complete.html
+++ b/web/templates/submission/complete.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
-<p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+<p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 <div class="alert alert-success"><h4>Submission complete!</h4>
 The following tasks were added successfully:
 {% for task in tasks %}
diff --git a/web/templates/submission/index.html b/web/templates/submission/index.html
index d7f889247..5563f6ccc 100644
--- a/web/templates/submission/index.html
+++ b/web/templates/submission/index.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
 <style>
 .btn-file {
@@ -50,7 +51,7 @@
 </script>
 <div class="row">
     <div class="col-md-6 col-md-offset-3 center">
-        <p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+        <p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 
         <form role="form" action="" method="post" enctype="multipart/form-data">{% csrf_token %}
             <div class="tabbable">
diff --git a/web/templates/submission/status.html b/web/templates/submission/status.html
index 924af9393..91c33fe34 100644
--- a/web/templates/submission/status.html
+++ b/web/templates/submission/status.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
-<p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+<p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 {% if completed %}
     <div class="alert alert-success"><h4>Good news! :-)</h4>The analysis is completed, you can view it <a href="{% url "analysis.views.report" task_id %}">here</a>.</div>
 {% else %}
diff --git a/web/templates/success.html b/web/templates/success.html
index 940fa9989..e83aae2d3 100644
--- a/web/templates/success.html
+++ b/web/templates/success.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
-<p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+<p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 <div class="alert alert-success"><h4>Submission complete!</h4>
 The following tasks were added successfully:
 {% for task in tasks %}
diff --git a/web/templates/success_simple.html b/web/templates/success_simple.html
index 8602327f1..8b70a04c2 100644
--- a/web/templates/success_simple.html
+++ b/web/templates/success_simple.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% block content %}
-<p style="margin-bottom: 10px;"><img src="{{ STATIC_URL }}graphic/cuckoo.png" /></p>
+<p style="margin-bottom: 10px;"><img src="{% static 'graphic/cuckoo.png' %}" /></p>
 <div class="alert alert-success">{{message}}</div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/web/local_settings.py b/web/web/local_settings.py
deleted file mode 100644
index 69073a500..000000000
--- a/web/web/local_settings.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (C) 2010-2015 Cuckoo Foundation.
-# This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org
-# See the file 'docs/LICENSE' for copying permission.
-
-LOCAL_SETTINGS = True
-from settings import *
-
-# If you want to customize your cuckoo path set it here.
-# CUCKOO_PATH = "/where/cuckoo/is/placed/"
-
-# Maximum upload size.
-MAX_UPLOAD_SIZE = 26214400
-
-# Override default secret key stored in secret_key.py
-# Make this unique, and don't share it with anybody.
-# SECRET_KEY = "YOUR_RANDOM_KEY"
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = "en-us"
-
-ADMINS = (
-    # ("Your Name", "your_email@example.com"),
-)
-
-MANAGERS = ADMINS
-
-# Allow verbose debug error message in case of application fault.
-# It's strongly suggested to set it to False if you are serving the
-# web application from a web server front-end (i.e. Apache).
-DEBUG = True
-
-# A list of strings representing the host/domain names that this Django site
-# can serve.
-# Values in this list can be fully qualified names (e.g. 'www.example.com').
-# When DEBUG is True or when running tests, host validation is disabled; any
-# host will be accepted. Thus it's usually only necessary to set it in production.
-ALLOWED_HOSTS = ["*"]
\ No newline at end of file
diff --git a/web/web/settings/__init__.py b/web/web/settings/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/web/settings.py b/web/web/settings/base.py
old mode 100755
new mode 100644
similarity index 86%
rename from web/web/settings.py
rename to web/web/settings/base.py
index ca38bbc3c..1c171c714
--- a/web/web/settings.py
+++ b/web/web/settings/base.py
@@ -3,10 +3,12 @@
 # See the file 'docs/LICENSE' for copying permission.
 
 import sys
-import os
+from unipath import Path
 
 # Cuckoo path.
-CUCKOO_PATH = os.path.join(os.getcwd(), "..")
+BASE_DIR = Path(__file__).ancestor(3)
+SETTINGS_DIR = Path(__file__).ancestor(1)
+CUCKOO_PATH = Path(__file__).ancestor(4)
 sys.path.append(CUCKOO_PATH)
 
 from lib.cuckoo.common.config import Config
@@ -49,14 +51,17 @@
 # To disable comment support, change the below to False
 COMMENTS = True
 
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
+DEBUG = False
 
 # Database settings. We don't need it.
 DATABASES = {}
 
 SITE_ID = 1
 
+LANGUAGE_CODE = "en-us"
+
+MAX_UPLOAD_SIZE = 26214400
+
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
@@ -75,13 +80,11 @@
 try:
     from secret_key import *
 except ImportError:
-    SETTINGS_DIR=os.path.abspath(os.path.dirname(__file__))
-    # Using the same generation schema of Django startproject.
     from django.utils.crypto import get_random_string
     key = get_random_string(50, "abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)")
 
     # Write secret_key.py
-    with open(os.path.join(SETTINGS_DIR, "secret_key.py"), "w") as key_file:
+    with open(SETTINGS_DIR.child("secret_key.py"), "w") as key_file:
         key_file.write("SECRET_KEY = \"{0}\"".format(key))
 
     # Reload key.
@@ -106,10 +109,11 @@
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = '/static/'
 
-# Additional locations of static files
-STATICFILES_DIRS = (
-    os.path.join(os.getcwd(), 'static'),
-)
+STATICFILES_DIRS = [
+    BASE_DIR.child('static'),
+]
+
+STATIC_ROOT = BASE_DIR.child('collected_statics')
 
 # List of finder classes that know how to find static files in
 # various locations.
@@ -119,13 +123,6 @@
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -142,9 +139,24 @@
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'web.wsgi.application'
 
-TEMPLATE_DIRS = (
-    "templates",
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            BASE_DIR.child('templates'),
+        ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
 
 RATELIMIT_VIEW = 'api.views.limit_exceeded'
 
@@ -199,12 +211,3 @@
         },
     }
 }
-
-# Hack to import local settings.
-try:
-    LOCAL_SETTINGS
-except NameError:
-    try:
-        from local_settings import *
-    except ImportError:
-        pass
diff --git a/web/web/settings/local.py b/web/web/settings/local.py
new file mode 100644
index 000000000..dc697ac66
--- /dev/null
+++ b/web/web/settings/local.py
@@ -0,0 +1,20 @@
+from __future__ import absolute_import
+
+from .base import *
+
+DEBUG = True
+
+ADMINS = (
+    # ("Your Name", "your_email@example.com"),
+)
+
+MANAGERS = ADMINS
+
+INSTALLED_APPS = INSTALLED_APPS + (
+    'django_extensions',
+    'debug_toolbar',
+)
+
+ALLOWED_HOSTS = [
+    '*'
+]
diff --git a/web/web/settings/production.py b/web/web/settings/production.py
new file mode 100644
index 000000000..5b8be9a80
--- /dev/null
+++ b/web/web/settings/production.py
@@ -0,0 +1,14 @@
+from __future__ import absolute_import
+
+from .base import *
+
+ADMINS = (
+    # ("Your Name", "your_email@example.com"),
+)
+
+MANAGERS = ADMINS
+
+ALLOWED_HOSTS = [
+    'localhost',
+    '127.0.0.1',
+]