diff --git a/flask/__init__.py b/flask_monitor/__init__.py
similarity index 100%
rename from flask/__init__.py
rename to flask_monitor/__init__.py
diff --git a/flask/db_monitor.py b/flask_monitor/db_monitor.py
similarity index 84%
rename from flask/db_monitor.py
rename to flask_monitor/db_monitor.py
index 31ac14373..368ca78ca 100644
--- a/flask/db_monitor.py
+++ b/flask_monitor/db_monitor.py
@@ -1,10 +1,16 @@
 from flask import Flask, abort
-import flask_settings as settings
+import os
 import psycopg2
-import MySQLdb
+import pymysql
 import pymongo
 import redis
 import pyes
+
+if os.getenv("DOCKERBUILD") == "True":
+    import newsblur.docker_local_settings as settings
+else:
+    import flask_monitor.flask_settings as settings
+
 app = Flask(__name__)
 
 @app.route("/db_check/postgres")
@@ -19,14 +25,14 @@ def db_check_postgres():
     try:
         conn = psycopg2.connect(connect_params)
     except:
-        print " ---> Postgres can't connect to the database: %s" % connect_params
+        print(" ---> Postgres can't connect to the database: %s" % connect_params)
         abort(502)
 
     cur = conn.cursor()
     cur.execute("""SELECT id FROM feeds ORDER BY feeds.id DESC LIMIT 1""")
     rows = cur.fetchall()
     for row in rows:
-        return unicode(row[0])
+        return str(row[0])
     
     abort(404)
 
@@ -41,20 +47,20 @@ def db_check_mysql():
     )
     try:
 
-        conn = MySQLdb.connect(host=settings.DATABASES['default']['HOST'],
+        conn = pymysql.connect(host=settings.DATABASES['default']['HOST'],
                                port=settings.DATABASES['default']['PORT'],
                                user=settings.DATABASES['default']['USER'],
                                passwd=settings.DATABASES['default']['PASSWORD'],
                                db=settings.DATABASES['default']['NAME'])
     except:
-        print " ---> Mysql can't connect to the database: %s" % connect_params
+        print(" ---> Mysql can't connect to the database: %s" % connect_params)
         abort(502)
 
     cur = conn.cursor()
     cur.execute("""SELECT id FROM feeds ORDER BY feeds.id DESC LIMIT 1""")
     rows = cur.fetchall()
     for row in rows:
-        return unicode(row[0])
+        return str(row[0])
     
     abort(404)
 
@@ -66,7 +72,7 @@ def db_check_mongo():
     except:
         abort(502)
     
-    return unicode(db.stories.count())
+    return str(db.stories.count())
 
 @app.route("/db_check/redis")
 def db_check_redis():
@@ -78,7 +84,7 @@ def db_check_redis():
     
     randkey = r.randomkey()
     if randkey:
-        return unicode(randkey)
+        return str(randkey)
     else:
         abort(404)
 
@@ -92,7 +98,7 @@ def db_check_redis_story():
     
     randkey = r.randomkey()
     if randkey:
-        return unicode(randkey)
+        return str(randkey)
     else:
         abort(404)
 
@@ -106,7 +112,7 @@ def db_check_redis_sessions():
     
     randkey = r.randomkey()
     if randkey:
-        return unicode(randkey)
+        return str(randkey)
     else:
         abort(404)
 
@@ -119,7 +125,7 @@ def db_check_elasticsearch():
         abort(502)
     
     if conn.indices.exists_index('feeds-index'):
-        return unicode("Index exists, but didn't try search")
+        return str("Index exists, but didn't try search")
         # query = pyes.query.TermQuery("title", "daring fireball")
         # results = conn.search(query=query, size=1, doc_types=['feeds-type'], sort="num_subscribers:desc")
         # for result in results:
diff --git a/flask/flask_settings.py b/flask_monitor/flask_settings.py
similarity index 100%
rename from flask/flask_settings.py
rename to flask_monitor/flask_settings.py
diff --git a/flask/requirements.txt b/flask_monitor/requirements.txt
similarity index 100%
rename from flask/requirements.txt
rename to flask_monitor/requirements.txt
diff --git a/flask/supervisor_db_monitor.conf b/flask_monitor/supervisor_db_monitor.conf
similarity index 100%
rename from flask/supervisor_db_monitor.conf
rename to flask_monitor/supervisor_db_monitor.conf