diff --git a/Pipfile b/Pipfile
index 101897d0a0b3b9de36ddcb9f0c7a84f4c9cfdcb2..a653d6ded7bde25d0724dbb15f92c8e456f91d32 100644
--- a/Pipfile
+++ b/Pipfile
@@ -33,4 +33,4 @@ pytest-mock = "*"
 mock = "*"
 
 [requires]
-python_version = "3.6"
+python_version = "3.7"
diff --git a/portal/__init__.py b/portal/__init__.py
index a17d3ce2f6877efbda807ad7b34ff3ca834f731c..1ee69fa88f23297d153950191406ca700b9bc44e 100644
--- a/portal/__init__.py
+++ b/portal/__init__.py
@@ -91,8 +91,8 @@ def configure_extensions(app: Flask):
 
 
 def configure_async(app: Flask):
-    from portal import async
-    async.init_app(app)
+    from portal import async_celery
+    async_celery.init_app(app)
 
 
 def create_app(environment: str = None):
@@ -113,5 +113,6 @@ def create_app(environment: str = None):
 def get_celery(app: Flask) -> Union[Celery, None]:
     if not app.config.get('BROKER_URL'):
         return None
-    from portal.async import celery_app
+    from portal.async_celery import celery_app
     return celery_app
+
diff --git a/portal/async/__init__.py b/portal/async_celery/__init__.py
similarity index 93%
rename from portal/async/__init__.py
rename to portal/async_celery/__init__.py
index 20caf4aa016fe716483f9167c801ed4045d8fbf7..51df5b0c783a0fb6967b8c579dbd8e968ef62fa8 100644
--- a/portal/async/__init__.py
+++ b/portal/async_celery/__init__.py
@@ -5,7 +5,7 @@ celery_app = Celery()
 
 
 def init_app(app: Flask) -> Flask:
-    """Initializes the async module
+    """Initializes the async_celery module
     Args:
         app(Flask): Flask application
 
diff --git a/portal/async/enqueue.py b/portal/async_celery/enqueue.py
similarity index 88%
rename from portal/async/enqueue.py
rename to portal/async_celery/enqueue.py
index 77ff1a492908a4da3bdc285d9992a44bf4726b05..b9c891e6e3aa987f8823b3d05d07a599ae6cd2f3 100644
--- a/portal/async/enqueue.py
+++ b/portal/async_celery/enqueue.py
@@ -1,7 +1,7 @@
 import logging
 
-from portal.async import celery_app
-from portal.async.helpers import reset_task_id
+from portal.async_celery import celery_app
+from portal.async_celery.helpers import reset_task_id
 from portal.database.models import Submission, SubmissionState
 
 log = logging.getLogger(__name__)
diff --git a/portal/async/helpers.py b/portal/async_celery/helpers.py
similarity index 100%
rename from portal/async/helpers.py
rename to portal/async_celery/helpers.py
diff --git a/portal/async/storage.py b/portal/async_celery/storage.py
similarity index 89%
rename from portal/async/storage.py
rename to portal/async_celery/storage.py
index d83fb6c8cdea91656dac8985f7392263ab3b0606..67914fc749f7fc022fa15eea2abed30d926504ea 100644
--- a/portal/async/storage.py
+++ b/portal/async_celery/storage.py
@@ -1,7 +1,7 @@
 import logging
 
-from portal.async import celery_app
-from portal.async.helpers import reset_task_id
+from portal.async_celery import celery_app
+from portal.async_celery.helpers import reset_task_id
 from portal.database.models import Submission, SubmissionState
 
 log = logging.getLogger(__name__)
diff --git a/portal/async/tasks.py b/portal/async_celery/tasks.py
similarity index 92%
rename from portal/async/tasks.py
rename to portal/async_celery/tasks.py
index 0843ea326662d5b55818c41d086e78ada1a36b32..ed4a7f38c1cee65c6cd6e02e670e38f3b5748f9e 100644
--- a/portal/async/tasks.py
+++ b/portal/async_celery/tasks.py
@@ -1,8 +1,8 @@
 from celery.utils.log import get_task_logger
 
 from portal import storage
-from portal.async import celery_app
-from portal.async.storage import submission_store_ended
+from portal.async_celery import celery_app
+from portal.async_celery.storage import submission_store_ended
 from portal.service.general import find_submission
 
 log = get_task_logger(__name__)
diff --git a/portal/logging.py b/portal/logging.py
index 76026b9af0aef58fe6923f96f4f6d36156cf5cf8..d5a7f67942d4538079a8ac0df637a5f57470184f 100644
--- a/portal/logging.py
+++ b/portal/logging.py
@@ -23,8 +23,6 @@ HANDLERS = {
 }
 
 LOGGERS = {
-    'flask': {'handlers': ['console'], 'level': 'INFO', 'propagate': True},
-    'flask_restplus': {'handlers': ['console'], 'level': 'INFO', 'propagate': True},
     'portal': {'handlers': ['console'], 'level': 'DEBUG', 'propagate': True},
     'tests': {'handlers': ['console'], 'level': 'DEBUG', 'propagate': True},
     'management': {'handlers': ['console'], 'level': 'INFO', 'propagate': True},
diff --git a/portal/service/submissions.py b/portal/service/submissions.py
index 1e2a81bba97b744da32774bf709695bfcddccd63..af62695446d6a36a19700b740fb5b8788a4b08e4 100644
--- a/portal/service/submissions.py
+++ b/portal/service/submissions.py
@@ -6,10 +6,10 @@ import logging
 from typing import Union
 from celery.result import AsyncResult
 
-from portal.async import tasks
-from portal.async.enqueue import revoke_enqueue_task
-from portal.async.storage import revoke_storage_task
-from portal.async.tasks import clone_submission_files, upload_submission_to_storage
+from portal.async_celery import tasks
+from portal.async_celery.enqueue import revoke_enqueue_task
+from portal.async_celery.storage import revoke_storage_task
+from portal.async_celery.tasks import clone_submission_files, upload_submission_to_storage
 from portal.database.models import Component, Project, Submission, SubmissionState, User
 from portal.service.errors import ForbiddenError
 from portal.service.general import delete_entity, write_entity