diff --git a/classy_mail/generic.py b/classy_mail/generic.py
index a11b1af..6a8e0ca 100644
--- a/classy_mail/generic.py
+++ b/classy_mail/generic.py
@@ -1,9 +1,9 @@
 import logging
 logger = logging.getLogger("classy_mail")
 from mixins.filesystem import FileTemplateMixin
-from mixins.models import ModelTemplateMixin
+from mixins.model import ModelTemplateMixin
 from mixins.log import LogMessageMixin
-from mixins.markdown import MarkdownTemplateMixin
+from mixins.md_template import MarkdownTemplateMixin
 from .base import BaseEmail
 
 
diff --git a/classy_mail/mixins/base.py b/classy_mail/mixins/base.py
index b70a845..7372dcc 100644
--- a/classy_mail/mixins/base.py
+++ b/classy_mail/mixins/base.py
@@ -1,5 +1,6 @@
 from django.core.mail import EmailMultiAlternatives
-from django.template.base import Context, loader, TemplateDoesNotExist
+from django.template.base import Context, TemplateDoesNotExist
+from django.template import loader
 
 
 def resolve_template(template):
diff --git a/classy_mail/mixins/markdown.py b/classy_mail/mixins/md_template.py
similarity index 100%
rename from classy_mail/mixins/markdown.py
rename to classy_mail/mixins/md_template.py