diff --git a/newsblur/__init__.py b/newsblur_web/__init__.py
similarity index 100%
rename from newsblur/__init__.py
rename to newsblur_web/__init__.py
diff --git a/newsblur/assets.yml b/newsblur_web/assets.yml
similarity index 100%
rename from newsblur/assets.yml
rename to newsblur_web/assets.yml
diff --git a/newsblur/celeryapp.py b/newsblur_web/celeryapp.py
similarity index 88%
rename from newsblur/celeryapp.py
rename to newsblur_web/celeryapp.py
index 39150859a..7483907b6 100644
--- a/newsblur/celeryapp.py
+++ b/newsblur_web/celeryapp.py
@@ -3,7 +3,7 @@ import os
 from celery import Celery
 
 # set the default Django settings module for the 'celery' program.
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'newsblur.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'newsblur_web.settings')
 
 app = Celery('newsblur')
 
diff --git a/newsblur/docker_local_settings.py b/newsblur_web/docker_local_settings.py
similarity index 100%
rename from newsblur/docker_local_settings.py
rename to newsblur_web/docker_local_settings.py
diff --git a/newsblur/local_settings.py.template b/newsblur_web/local_settings.py.template
similarity index 100%
rename from newsblur/local_settings.py.template
rename to newsblur_web/local_settings.py.template
diff --git a/newsblur/settings.py b/newsblur_web/settings.py
similarity index 99%
rename from newsblur/settings.py
rename to newsblur_web/settings.py
index 9db603b5c..04cb6bac2 100644
--- a/newsblur/settings.py
+++ b/newsblur_web/settings.py
@@ -264,7 +264,7 @@ DAYS_OF_STORY_HASHES    = 30
 
 SUBSCRIBER_EXPIRE       = 7
 
-ROOT_URLCONF            = 'newsblur.urls'
+ROOT_URLCONF            = 'newsblur_web.urls'
 INTERNAL_IPS            = ('127.0.0.1',)
 LOGGING_LOG_SQL         = True
 APPEND_SLASH            = False
@@ -288,8 +288,9 @@ else:
 # ==============
 
 SUBDOMAIN_URLCONFS = {
-    None: 'newsblur.urls',
-    'www': 'newsblur.urls',
+    None: 'newsblur_web.urls',
+    'www': 'newsblur_web.urls',
+    'nb': 'newsblur_web.urls',
 }
 REMOVE_WWW_FROM_DOMAIN = True
 
@@ -576,9 +577,9 @@ S3_AVATARS_BUCKET_NAME = 'avatars.newsblur.com'
 # = Configurations =
 # ==================
 if os.getenv("DOCKERBUILD"):
-    from newsblur.docker_local_settings import *
+    from newsblur_web.docker_local_settings import *
 else:
-    from newsblur.local_settings import *
+    from newsblur_web.local_settings import *
 
 if not DEBUG:
     INSTALLED_APPS += (
diff --git a/newsblur/settings.py.orig b/newsblur_web/settings.py.orig
similarity index 100%
rename from newsblur/settings.py.orig
rename to newsblur_web/settings.py.orig
diff --git a/newsblur/sitecustomize.py b/newsblur_web/sitecustomize.py
similarity index 100%
rename from newsblur/sitecustomize.py
rename to newsblur_web/sitecustomize.py
diff --git a/newsblur_web/test_settings.py b/newsblur_web/test_settings.py
new file mode 100644
index 000000000..9657d17e8
--- /dev/null
+++ b/newsblur_web/test_settings.py
@@ -0,0 +1,41 @@
+import sys
+from newsblur_web.settings import *
+import os
+# if 'test' in sys.argv:
+#     DATABASES['default']['ENGINE'] = 'django.db.backends.sqlite3'
+#     DATABASES['default']['OPTIONS'] = {}
+#     # DATABASES['default']['NAME'] = 'nb.db'
+#     # DATABASES['default']['TEST_NAME'] = 'nb2.db'
+    
+# DATABASES = {
+#     'default':{
+#         'ENGINE': 'django.db.backends.sqlite3',
+#         'NAME': ':memory:',
+#         'TEST_NAME': ':memory:',
+#     },
+# }
+
+if os.getenv("DOCKERBUILD"):
+    MONGO_DB = {
+        'name': 'newsblur_test',
+        'host': 'db_mongo:27017'
+    }
+else:
+    MONGO_DB = {
+        'name': 'newsblur_test',
+        'host': '127.0.0.1:27017',
+    }
+
+MONGO_DATABASE_NAME = 'test_newsblur'
+# TEST_DATABASE_NAME = ":memory:"
+SOUTH_TESTS_MIGRATE = False
+DAYS_OF_UNREAD = 9999
+DAYS_OF_UNREAD_FREE = 9999
+TEST_DEBUG = True
+DEBUG = True
+SITE_ID = 2
+RAVEN_CLIENT = None
+# from django.db import connection
+# cursor = connection.cursor()
+# cursor.execute('PRAGMA temp_store = MEMORY;')
+# cursor.execute('PRAGMA synchronous=OFF')
diff --git a/newsblur/urls.py b/newsblur_web/urls.py
similarity index 100%
rename from newsblur/urls.py
rename to newsblur_web/urls.py
diff --git a/newsblur/wsgi.py b/newsblur_web/wsgi.py
similarity index 81%
rename from newsblur/wsgi.py
rename to newsblur_web/wsgi.py
index 473df76b4..cfbfbc22f 100644
--- a/newsblur/wsgi.py
+++ b/newsblur_web/wsgi.py
@@ -6,7 +6,7 @@ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
 """
 
 import os
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "newsblur.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "newsblur_web.settings")
 
 from django.core.wsgi import get_wsgi_application
 application = get_wsgi_application()
\ No newline at end of file