diff --git a/greenmine/middleware.py b/greenmine/base/middleware.py
similarity index 100%
rename from greenmine/middleware.py
rename to greenmine/base/middleware.py
diff --git a/greenmine/scrum/sigdispatch.py b/greenmine/scrum/sigdispatch.py
index 3da6affc..efd20ef9 100644
--- a/greenmine/scrum/sigdispatch.py
+++ b/greenmine/scrum/sigdispatch.py
@@ -14,7 +14,7 @@ from greenmine.scrum.models import UserStory, Task, ProjectUserRole
 from greenmine.base import signals
 from greenmine.base.utils import normalize_tagname
 from greenmine.base.utils.auth import set_token
-from greenmine.base.mail.task import send_email, send_bulk_email
+from greenmine.base.mail.tasks import send_email, send_bulk_email
 
 
 @receiver(signals.mail_new_user)
diff --git a/greenmine/settings/common.py b/greenmine/settings/common.py
index 97c24fc5..77c707fd 100644
--- a/greenmine/settings/common.py
+++ b/greenmine/settings/common.py
@@ -161,7 +161,7 @@ TEMPLATE_LOADERS = [
 
 MIDDLEWARE_CLASSES = [
     'django.middleware.common.CommonMiddleware',
-    'greenmine.middleware.GreenmineSessionMiddleware',
+    'greenmine.base.middleware.GreenmineSessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -198,6 +198,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
 
     'greenmine.base',
+    'greenmine.base.mail',
     'greenmine.profile',
     'greenmine.scrum',
     'greenmine.wiki',