diff --git a/attract/__init__.py b/attract/__init__.py
index 355718a..5121f60 100644
--- a/attract/__init__.py
+++ b/attract/__init__.py
@@ -4,7 +4,7 @@ import flask
 from werkzeug.local import LocalProxy
 from pillar.extension import PillarExtension
 
-import attract.task_manager
+import attract.tasks
 import attract.shot_manager
 
 EXTENSION_NAME = 'attract'
@@ -13,7 +13,7 @@ EXTENSION_NAME = 'attract'
 class AttractExtension(PillarExtension):
     def __init__(self):
         self._log = logging.getLogger('%s.AttractExtension' % __name__)
-        self.task_manager = attract.task_manager.TaskManager()
+        self.task_manager = attract.tasks.TaskManager()
         self.shot_manager = attract.shot_manager.ShotManager()
 
     @property
@@ -54,12 +54,13 @@ class AttractExtension(PillarExtension):
         :rtype: list of flask.Blueprint objects.
         """
 
-        from . import modules, tasks, shots
+        from . import modules, shots
+        import attract.tasks.routes
 
         return [
             modules.blueprint,
-            tasks.blueprint,
-            tasks.perproject_blueprint,
+            attract.tasks.routes.blueprint,
+            attract.tasks.routes.perproject_blueprint,
             shots.blueprint,
             shots.perproject_blueprint,
         ]
diff --git a/attract/task_manager.py b/attract/tasks/__init__.py
similarity index 96%
rename from attract/task_manager.py
rename to attract/tasks/__init__.py
index 16137df..0f4f9b2 100644
--- a/attract/task_manager.py
+++ b/attract/tasks/__init__.py
@@ -6,8 +6,8 @@ import flask_login
 import pillarsdk
 from pillar.web.system_util import pillar_api
 
-from . import attrs_extra
-from .node_types.task import node_type_task
+from attract import attrs_extra
+from attract.node_types.task import node_type_task
 
 
 @attr.s
diff --git a/attract/tasks.py b/attract/tasks/routes.py
similarity index 95%
rename from attract/tasks.py
rename to attract/tasks/routes.py
index 0c6e458..3e2b246 100644
--- a/attract/tasks.py
+++ b/attract/tasks/routes.py
@@ -7,9 +7,9 @@ import pillarsdk
 from pillar.web.system_util import pillar_api
 import pillar.api.utils
 
-from .modules import attract_project_view
-from .node_types.task import node_type_task
-from . import current_attract
+from attract.modules import attract_project_view
+from attract.node_types.task import node_type_task
+from attract import current_attract
 
 blueprint = Blueprint('attract.tasks', __name__, url_prefix='/tasks')
 perproject_blueprint = Blueprint('attract.tasks.perproject', __name__,