diff --git a/pydash/settings.py b/pydash/settings.py
index 263e55c..497387c 100644
--- a/pydash/settings.py
+++ b/pydash/settings.py
@@ -90,13 +90,12 @@ TEMPLATE_LOADERS = (
     # 'django.template.loaders.eggs.Loader',
     )
 
-TEMPLATE_DIRS = (os.path.join(os.path.dirname(__file__), '..', 'templates'),)
+TEMPLATE_DIRS = os.path.join(BASE_DIR, 'templates')
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.6/howto/static-files/
 
-STATIC_ROOT = os.path.join(os.path.dirname(__file__), '..', 'static')
-#STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
 STATIC_URL = '/static/'