diff --git a/HISTORY.rst b/HISTORY.rst
index 6872f2ae4a..0d1a272f7f 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -173,6 +173,7 @@
 * Rename transformation manager method get_for_model to
   get_for_object.
 * Load the converter class on demand.
+* Remove app top level star imports.
 
 3.1.11 (2019-04-XX)
 ===================
diff --git a/docs/releases/3.2.rst b/docs/releases/3.2.rst
index 593f28dbf9..ebf1470883 100644
--- a/docs/releases/3.2.rst
+++ b/docs/releases/3.2.rst
@@ -205,6 +205,7 @@ Other changes
 * Rename transformation manager method get_for_model to
   get_for_object.
 * Load the converter class on demand.
+* Remove app top level star imports.
 
 Removals
 --------
diff --git a/mayan/apps/acls/apps.py b/mayan/apps/acls/apps.py
index e774138c14..cf7918407b 100644
--- a/mayan/apps/acls/apps.py
+++ b/mayan/apps/acls/apps.py
@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.menus import menu_object, menu_secondary
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 
 from .links import link_acl_create, link_acl_delete, link_acl_permissions
 
diff --git a/mayan/apps/acls/links.py b/mayan/apps/acls/links.py
index e005235646..24ef72a675 100644
--- a/mayan/apps/acls/links.py
+++ b/mayan/apps/acls/links.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.apps import apps
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import icon_acl_delete, icon_acl_list, icon_acl_new
 from .permissions import permission_acl_view, permission_acl_edit
diff --git a/mayan/apps/authentication/links.py b/mayan/apps/authentication/links.py
index 9753b6e240..7908cfe707 100644
--- a/mayan/apps/authentication/links.py
+++ b/mayan/apps/authentication/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import icon_logout, icon_password_change
 
diff --git a/mayan/apps/cabinets/apps.py b/mayan/apps/cabinets/apps.py
index bb28d4a238..de8b90af51 100644
--- a/mayan/apps/cabinets/apps.py
+++ b/mayan/apps/cabinets/apps.py
@@ -11,7 +11,7 @@ from mayan.apps.common.menus import (
     menu_secondary
 )
 from mayan.apps.documents.search import document_page_search, document_search
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 
 from .links import (
     link_cabinet_list, link_document_cabinet_list,
diff --git a/mayan/apps/cabinets/events.py b/mayan/apps/cabinets/events.py
index 998ceddabd..82f7e2115c 100644
--- a/mayan/apps/cabinets/events.py
+++ b/mayan/apps/cabinets/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.events import EventTypeNamespace
+from mayan.apps.events.classes import EventTypeNamespace
 
 namespace = EventTypeNamespace(label=_('Cabinets'), name='cabinets')
 
diff --git a/mayan/apps/cabinets/links.py b/mayan/apps/cabinets/links.py
index 34b5e46ff4..7c11baf47a 100644
--- a/mayan/apps/cabinets/links.py
+++ b/mayan/apps/cabinets/links.py
@@ -6,7 +6,8 @@ from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.acls.links import link_acl_list
 from mayan.apps.documents.permissions import permission_document_view
-from mayan.apps.navigation import Link, get_cascade_condition
+from mayan.apps.navigation.classes import Link
+from mayan.apps.navigation.utils import get_cascade_condition
 
 from .permissions import (
     permission_cabinet_add_document, permission_cabinet_create,
diff --git a/mayan/apps/cabinets/menus.py b/mayan/apps/cabinets/menus.py
index e4e82d36c3..c12bee317e 100644
--- a/mayan/apps/cabinets/menus.py
+++ b/mayan/apps/cabinets/menus.py
@@ -2,7 +2,8 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Menu, get_cascade_condition
+from mayan.apps.navigation.classes import Menu
+from mayan.apps.navigation.utils import get_cascade_condition
 
 from .icons import icon_cabinet_list
 from .permissions import permission_cabinet_create, permission_cabinet_view
diff --git a/mayan/apps/checkouts/apps.py b/mayan/apps/checkouts/apps.py
index 4966803dfc..8713f8101b 100644
--- a/mayan/apps/checkouts/apps.py
+++ b/mayan/apps/checkouts/apps.py
@@ -12,7 +12,7 @@ from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.menus import menu_facet, menu_main, menu_secondary
 from mayan.apps.dashboards.dashboards import dashboard_main
-from mayan.apps.events import ModelEventType
+from mayan.apps.events.classes import ModelEventType
 from mayan.celery import app
 
 from .dashboard_widgets import DashboardWidgetTotalCheckouts
diff --git a/mayan/apps/checkouts/events.py b/mayan/apps/checkouts/events.py
index aad73d1fbb..e096161dd0 100644
--- a/mayan/apps/checkouts/events.py
+++ b/mayan/apps/checkouts/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.events import EventTypeNamespace
+from mayan.apps.events.classes import EventTypeNamespace
 
 namespace = EventTypeNamespace(label=_('Checkouts'), name='checkouts')
 
diff --git a/mayan/apps/checkouts/links.py b/mayan/apps/checkouts/links.py
index 8d2ba53f0b..d03d54c23d 100644
--- a/mayan/apps/checkouts/links.py
+++ b/mayan/apps/checkouts/links.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import (
     icon_check_in_document, icon_check_out_document, icon_check_out_info
diff --git a/mayan/apps/checkouts/tasks.py b/mayan/apps/checkouts/tasks.py
index ea7a844d75..3638f6a57b 100644
--- a/mayan/apps/checkouts/tasks.py
+++ b/mayan/apps/checkouts/tasks.py
@@ -4,7 +4,7 @@ import logging
 
 from django.apps import apps
 
-from mayan.apps.lock_manager import LockError
+from mayan.apps.lock_manager.exceptions import LockError
 from mayan.apps.lock_manager.runtime import locking_backend
 from mayan.celery import app
 
diff --git a/mayan/apps/common/links.py b/mayan/apps/common/links.py
index 7499d44771..3d456f0442 100644
--- a/mayan/apps/common/links.py
+++ b/mayan/apps/common/links.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.apps import apps
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import (
     icon_about, icon_check_version, icon_current_user_locale_profile_details,
diff --git a/mayan/apps/common/menus.py b/mayan/apps/common/menus.py
index d990fc9490..c25064cb40 100644
--- a/mayan/apps/common/menus.py
+++ b/mayan/apps/common/menus.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Menu
+from mayan.apps.navigation.classes import Menu
 
 from .icons import icon_menu_about, icon_menu_user
 
diff --git a/mayan/apps/converter/__init__.py b/mayan/apps/converter/__init__.py
index d5750d6e40..214ccca2a0 100644
--- a/mayan/apps/converter/__init__.py
+++ b/mayan/apps/converter/__init__.py
@@ -1,8 +1,3 @@
 from __future__ import unicode_literals
 
-from .transformations import (  # NOQA
-    BaseTransformation, TransformationResize, TransformationRotate,
-    TransformationZoom
-)
-
 default_app_config = 'mayan.apps.converter.apps.ConverterApp'
diff --git a/mayan/apps/converter/apps.py b/mayan/apps/converter/apps.py
index 1ab7e4108b..3254f55d55 100644
--- a/mayan/apps/converter/apps.py
+++ b/mayan/apps/converter/apps.py
@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.menus import menu_object, menu_secondary
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 
 from .links import (
     link_transformation_create, link_transformation_delete,
diff --git a/mayan/apps/converter/links.py b/mayan/apps/converter/links.py
index aece7fd6f2..b69074fd9f 100644
--- a/mayan/apps/converter/links.py
+++ b/mayan/apps/converter/links.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.apps import apps
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .permissions import (
     permission_transformation_create, permission_transformation_delete,
diff --git a/mayan/apps/django_gpg/apps.py b/mayan/apps/django_gpg/apps.py
index ae3c97de9b..bd4fc48482 100644
--- a/mayan/apps/django_gpg/apps.py
+++ b/mayan/apps/django_gpg/apps.py
@@ -9,7 +9,7 @@ from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.menus import (
     menu_facet, menu_object, menu_secondary, menu_setup
 )
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 
 from .classes import KeyStub
 from .links import (
diff --git a/mayan/apps/django_gpg/links.py b/mayan/apps/django_gpg/links.py
index 32eb85ff78..1c842bf720 100644
--- a/mayan/apps/django_gpg/links.py
+++ b/mayan/apps/django_gpg/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import icon_key_setup, icon_key_upload, icon_keyserver_search
 from .permissions import (
diff --git a/mayan/apps/document_comments/apps.py b/mayan/apps/document_comments/apps.py
index cdad80c8a6..d01a8ebbd3 100644
--- a/mayan/apps/document_comments/apps.py
+++ b/mayan/apps/document_comments/apps.py
@@ -7,8 +7,8 @@ from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.menus import menu_facet, menu_object, menu_secondary
 from mayan.apps.documents.search import document_page_search, document_search
-from mayan.apps.events import ModelEventType
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.events.classes import ModelEventType
+from mayan.apps.navigation.classes import SourceColumn
 
 from .events import (
     event_document_comment_create, event_document_comment_delete
diff --git a/mayan/apps/document_comments/events.py b/mayan/apps/document_comments/events.py
index 66cd211e5b..b5647fa14e 100644
--- a/mayan/apps/document_comments/events.py
+++ b/mayan/apps/document_comments/events.py
@@ -2,15 +2,15 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.events import EventTypeNamespace
+from mayan.apps.events.classes import EventTypeNamespace
 
 namespace = EventTypeNamespace(
-    name='document_comments', label=_('Document comments')
+    label=_('Document comments'), name='document_comments'
 )
 
 event_document_comment_create = namespace.add_event_type(
-    name='create', label=_('Document comment created')
+    label=_('Document comment created'), name='create'
 )
 event_document_comment_delete = namespace.add_event_type(
-    name='delete', label=_('Document comment deleted')
+    label=_('Document comment deleted'), name='delete'
 )
diff --git a/mayan/apps/document_comments/links.py b/mayan/apps/document_comments/links.py
index 9f15bfb34b..a113be3415 100644
--- a/mayan/apps/document_comments/links.py
+++ b/mayan/apps/document_comments/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals, absolute_import
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import icon_comment_add, icon_comment_delete, icon_comments_for_document
 from .permissions import (
diff --git a/mayan/apps/document_indexing/apps.py b/mayan/apps/document_indexing/apps.py
index 671abe4bd4..f7f61f7326 100644
--- a/mayan/apps/document_indexing/apps.py
+++ b/mayan/apps/document_indexing/apps.py
@@ -16,7 +16,7 @@ from mayan.apps.common.menus import (
     menu_setup, menu_tools
 )
 from mayan.apps.documents.signals import post_document_created, post_initial_document_type
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 from mayan.celery import app
 
 from .handlers import (
diff --git a/mayan/apps/document_indexing/links.py b/mayan/apps/document_indexing/links.py
index 4d6277d3f2..8427e2c29c 100644
--- a/mayan/apps/document_indexing/links.py
+++ b/mayan/apps/document_indexing/links.py
@@ -2,7 +2,8 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link, get_cascade_condition
+from mayan.apps.navigation.classes import Link
+from mayan.apps.navigation.utils import get_cascade_condition
 
 from .permissions import (
     permission_document_indexing_create, permission_document_indexing_edit,
diff --git a/mayan/apps/document_indexing/models.py b/mayan/apps/document_indexing/models.py
index 5a9e923ffc..81d5bbc97a 100644
--- a/mayan/apps/document_indexing/models.py
+++ b/mayan/apps/document_indexing/models.py
@@ -14,7 +14,7 @@ from mptt.models import MPTTModel
 from mayan.apps.acls.models import AccessControlList
 from mayan.apps.documents.models import Document, DocumentType
 from mayan.apps.documents.permissions import permission_document_view
-from mayan.apps.lock_manager import LockError
+from mayan.apps.lock_manager.exceptions import LockError
 from mayan.apps.lock_manager.runtime import locking_backend
 
 from .managers import (
diff --git a/mayan/apps/document_indexing/tasks.py b/mayan/apps/document_indexing/tasks.py
index 506c6e243b..614e0bfbe4 100644
--- a/mayan/apps/document_indexing/tasks.py
+++ b/mayan/apps/document_indexing/tasks.py
@@ -5,7 +5,7 @@ import logging
 from django.apps import apps
 from django.db import OperationalError
 
-from mayan.apps.lock_manager import LockError
+from mayan.apps.lock_manager.exceptions import LockError
 from mayan.celery import app
 
 from .literals import RETRY_DELAY
diff --git a/mayan/apps/document_parsing/apps.py b/mayan/apps/document_parsing/apps.py
index 4ef5e4467d..dbc302e3c0 100644
--- a/mayan/apps/document_parsing/apps.py
+++ b/mayan/apps/document_parsing/apps.py
@@ -16,7 +16,7 @@ from mayan.apps.common.menus import (
 )
 from mayan.apps.documents.search import document_search, document_page_search
 from mayan.apps.documents.signals import post_version_upload
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 from mayan.celery import app
 
 from .handlers import (
diff --git a/mayan/apps/document_parsing/events.py b/mayan/apps/document_parsing/events.py
index 84a9c86d6d..07f4a82b2a 100644
--- a/mayan/apps/document_parsing/events.py
+++ b/mayan/apps/document_parsing/events.py
@@ -2,10 +2,10 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.events import EventTypeNamespace
+from mayan.apps.events.classes import EventTypeNamespace
 
 namespace = EventTypeNamespace(
-    name='document_parsing', label=_('Document parsing')
+    label=_('Document parsing'), name='document_parsing'
 )
 
 event_parsing_document_version_submit = namespace.add_event_type(
diff --git a/mayan/apps/document_parsing/links.py b/mayan/apps/document_parsing/links.py
index 30fd5016f6..b98237ca52 100644
--- a/mayan/apps/document_parsing/links.py
+++ b/mayan/apps/document_parsing/links.py
@@ -2,7 +2,8 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link, get_cascade_condition
+from mayan.apps.navigation.classes import Link
+from mayan.apps.navigation.utils import get_cascade_condition
 
 from .permissions import (
     permission_content_view, permission_document_type_parsing_setup,
diff --git a/mayan/apps/document_signatures/apps.py b/mayan/apps/document_signatures/apps.py
index aecd132358..ac4f24efb2 100644
--- a/mayan/apps/document_signatures/apps.py
+++ b/mayan/apps/document_signatures/apps.py
@@ -13,7 +13,7 @@ from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.menus import (
     menu_facet, menu_object, menu_secondary, menu_tools
 )
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 from mayan.celery import app
 
 from .handlers import (
diff --git a/mayan/apps/document_signatures/links.py b/mayan/apps/document_signatures/links.py
index 1d0cadb26a..12780d58da 100644
--- a/mayan/apps/document_signatures/links.py
+++ b/mayan/apps/document_signatures/links.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.apps import apps
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .permissions import (
     permission_document_version_sign_detached,
diff --git a/mayan/apps/document_states/apps.py b/mayan/apps/document_states/apps.py
index 86cdfe3faf..7b9f853e62 100644
--- a/mayan/apps/document_states/apps.py
+++ b/mayan/apps/document_states/apps.py
@@ -17,7 +17,7 @@ from mayan.apps.common.menus import (
     menu_setup, menu_tools
 )
 from mayan.apps.common.permissions_runtime import permission_error_log_view
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 from mayan.celery import app
 
 from .classes import DocumentStateHelper, WorkflowAction
diff --git a/mayan/apps/document_states/links.py b/mayan/apps/document_states/links.py
index 986d640b0e..f6ce50c791 100644
--- a/mayan/apps/document_states/links.py
+++ b/mayan/apps/document_states/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .permissions import (
     permission_workflow_create, permission_workflow_delete,
diff --git a/mayan/apps/documents/apps.py b/mayan/apps/documents/apps.py
index 81f4d365e1..dad610800e 100644
--- a/mayan/apps/documents/apps.py
+++ b/mayan/apps/documents/apps.py
@@ -25,12 +25,12 @@ from mayan.apps.converter.permissions import (
     permission_transformation_delete, permission_transformation_edit,
     permission_transformation_view,
 )
-from mayan.apps.events import ModelEventType
+from mayan.apps.events.classes import ModelEventType
 from mayan.apps.events.links import (
     link_events_for_object, link_object_event_types_user_subcriptions_list,
 )
 from mayan.apps.events.permissions import permission_events_view
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 from mayan.apps.rest_api.fields import DynamicSerializerField
 from mayan.celery import app
 
diff --git a/mayan/apps/documents/events.py b/mayan/apps/documents/events.py
index b841730d62..77a7b8136e 100644
--- a/mayan/apps/documents/events.py
+++ b/mayan/apps/documents/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.events import EventTypeNamespace
+from mayan.apps.events.classes import EventTypeNamespace
 
 namespace = EventTypeNamespace(label=_('Documents'), name='documents')
 
diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py
index 37b2512845..59bc340029 100644
--- a/mayan/apps/documents/links.py
+++ b/mayan/apps/documents/links.py
@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 from mayan.apps.converter.permissions import (
     permission_transformation_delete, permission_transformation_edit
 )
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import (
     icon_clear_image_cache,
diff --git a/mayan/apps/documents/menus.py b/mayan/apps/documents/menus.py
index 6e8e457a17..f65c3e873c 100644
--- a/mayan/apps/documents/menus.py
+++ b/mayan/apps/documents/menus.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Menu
+from mayan.apps.navigation.classes import Menu
 
 from .icons import icon_menu_documents
 
diff --git a/mayan/apps/documents/models/document_page_models.py b/mayan/apps/documents/models/document_page_models.py
index 558f18fba3..cd87a19ee0 100644
--- a/mayan/apps/documents/models/document_page_models.py
+++ b/mayan/apps/documents/models/document_page_models.py
@@ -10,12 +10,12 @@ from django.urls import reverse
 from django.utils.encoding import force_text, python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.converter import (
+from mayan.apps.converter.literals import DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION
+from mayan.apps.converter.models import Transformation
+from mayan.apps.converter.transformations import (
     BaseTransformation, TransformationResize, TransformationRotate,
     TransformationZoom
 )
-from mayan.apps.converter.literals import DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION
-from mayan.apps.converter.models import Transformation
 from mayan.apps.converter.utils import get_converter_class
 
 from ..managers import DocumentPageCachedImage, DocumentPageManager
diff --git a/mayan/apps/documents/models/document_version_models.py b/mayan/apps/documents/models/document_version_models.py
index 9d4ee3d25d..aea9fcd1cb 100644
--- a/mayan/apps/documents/models/document_version_models.py
+++ b/mayan/apps/documents/models/document_version_models.py
@@ -12,9 +12,9 @@ from django.urls import reverse
 from django.utils.encoding import force_text, python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.converter import TransformationRotate
 from mayan.apps.converter.exceptions import InvalidOfficeFormat, PageCountError
 from mayan.apps.converter.models import Transformation
+from mayan.apps.converter.transformations import TransformationRotate
 from mayan.apps.converter.utils import get_converter_class
 from mayan.apps.mimetype.api import get_mimetype
 
diff --git a/mayan/apps/documents/statistics.py b/mayan/apps/documents/statistics.py
index d45a89b5a7..7ae0b6c9e0 100644
--- a/mayan/apps/documents/statistics.py
+++ b/mayan/apps/documents/statistics.py
@@ -8,7 +8,9 @@ from django.utils.translation import ugettext_lazy as _
 
 import qsstats
 
-from mayan.apps.mayan_statistics import StatisticLineChart, StatisticNamespace
+from mayan.apps.mayan_statistics.classes import (
+    StatisticLineChart, StatisticNamespace
+)
 
 from .permissions import permission_document_view
 
diff --git a/mayan/apps/documents/tests/test_document_views.py b/mayan/apps/documents/tests/test_document_views.py
index b100f1a688..871b12822a 100644
--- a/mayan/apps/documents/tests/test_document_views.py
+++ b/mayan/apps/documents/tests/test_document_views.py
@@ -447,7 +447,7 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
         )
 
         self.assertQuerysetEqual(
-            Transformation.objects.get_for_object(obj==document_page),
+            Transformation.objects.get_for_object(obj=document_page),
             (repr(transformation),)
         )
 
diff --git a/mayan/apps/dynamic_search/links.py b/mayan/apps/dynamic_search/links.py
index 4ef031a533..b904f48356 100644
--- a/mayan/apps/dynamic_search/links.py
+++ b/mayan/apps/dynamic_search/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 link_search = Link(
     text=_('Search'), view='search:search', args='search_model.get_full_name'
diff --git a/mayan/apps/events/__init__.py b/mayan/apps/events/__init__.py
index afccd949a6..1fa4b8d55c 100644
--- a/mayan/apps/events/__init__.py
+++ b/mayan/apps/events/__init__.py
@@ -1,5 +1,3 @@
 from __future__ import unicode_literals
 
-from .classes import EventTypeNamespace, ModelEventType  # NOQA
-
 default_app_config = 'mayan.apps.events.apps.EventsApp'
diff --git a/mayan/apps/events/apps.py b/mayan/apps/events/apps.py
index 986d83c65d..95a8d0c642 100644
--- a/mayan/apps/events/apps.py
+++ b/mayan/apps/events/apps.py
@@ -8,7 +8,7 @@ from mayan.apps.common.html_widgets import TwoStateWidget
 from mayan.apps.common.menus import (
     menu_main, menu_object, menu_secondary, menu_tools, menu_user
 )
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 
 from .html_widgets import (
     ObjectLinkWidget, widget_event_actor_link, widget_event_type_link
diff --git a/mayan/apps/events/links.py b/mayan/apps/events/links.py
index 85c20d66a3..8ba0b163b4 100644
--- a/mayan/apps/events/links.py
+++ b/mayan/apps/events/links.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.apps import apps
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import (
     icon_events_list, icon_events_for_object,
diff --git a/mayan/apps/file_metadata/apps.py b/mayan/apps/file_metadata/apps.py
index 3bcaa07aa0..cc6d87ba32 100644
--- a/mayan/apps/file_metadata/apps.py
+++ b/mayan/apps/file_metadata/apps.py
@@ -15,8 +15,8 @@ from mayan.apps.common.menus import (
 from mayan.apps.document_indexing.handlers import handler_index_document
 from mayan.apps.documents.search import document_page_search, document_search
 from mayan.apps.documents.signals import post_version_upload
-from mayan.apps.events import ModelEventType
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.events.classes import ModelEventType
+from mayan.apps.navigation.classes import SourceColumn
 from mayan.celery import app
 
 from .drivers import *  # NOQA
diff --git a/mayan/apps/file_metadata/events.py b/mayan/apps/file_metadata/events.py
index 57daccffe2..bfca4dd6a4 100644
--- a/mayan/apps/file_metadata/events.py
+++ b/mayan/apps/file_metadata/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.events import EventTypeNamespace
+from mayan.apps.events.classes import EventTypeNamespace
 
 namespace = EventTypeNamespace(
     label=_('File metadata'), name='file_metadata'
diff --git a/mayan/apps/file_metadata/links.py b/mayan/apps/file_metadata/links.py
index f02e6e2eff..2bbc19de83 100644
--- a/mayan/apps/file_metadata/links.py
+++ b/mayan/apps/file_metadata/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import (
     icon_document_submit, icon_document_multiple_submit, icon_file_metadata
diff --git a/mayan/apps/linking/apps.py b/mayan/apps/linking/apps.py
index 59ff8f0020..d161be39ae 100644
--- a/mayan/apps/linking/apps.py
+++ b/mayan/apps/linking/apps.py
@@ -11,7 +11,7 @@ from mayan.apps.common.html_widgets import TwoStateWidget
 from mayan.apps.common.menus import (
     menu_facet, menu_list_facet, menu_object, menu_secondary, menu_setup
 )
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 
 from .links import (
     link_smart_link_create, link_smart_link_condition_create,
diff --git a/mayan/apps/linking/links.py b/mayan/apps/linking/links.py
index 68f5ae521c..78d69a5fb8 100644
--- a/mayan/apps/linking/links.py
+++ b/mayan/apps/linking/links.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.documents.permissions import permission_document_view
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import (
     icon_smart_link_condition_create, icon_smart_link_create,
diff --git a/mayan/apps/lock_manager/__init__.py b/mayan/apps/lock_manager/__init__.py
index 436610b26c..6471fdd309 100644
--- a/mayan/apps/lock_manager/__init__.py
+++ b/mayan/apps/lock_manager/__init__.py
@@ -1,5 +1,3 @@
 from __future__ import unicode_literals
 
-from .exceptions import LockError  # NOQA
-
 default_app_config = 'mayan.apps.lock_manager.apps.LockManagerApp'
diff --git a/mayan/apps/mailer/apps.py b/mayan/apps/mailer/apps.py
index 6a2323157a..e193363acd 100644
--- a/mayan/apps/mailer/apps.py
+++ b/mayan/apps/mailer/apps.py
@@ -14,11 +14,11 @@ from mayan.apps.common.menus import (
     menu_list_facet, menu_multi_item, menu_object, menu_secondary, menu_setup,
     menu_tools
 )
-from mayan.apps.events import ModelEventType
+from mayan.apps.events.classes import ModelEventType
 from mayan.apps.events.links import (
     link_events_for_object, link_object_event_types_user_subcriptions_list
 )
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 from mayan.celery import app
 
 from .classes import MailerBackend
diff --git a/mayan/apps/mailer/events.py b/mayan/apps/mailer/events.py
index a55b158960..279ba14995 100644
--- a/mayan/apps/mailer/events.py
+++ b/mayan/apps/mailer/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.events import EventTypeNamespace
+from mayan.apps.events.classes import EventTypeNamespace
 
 namespace = EventTypeNamespace(label=_('Mailing'), name='mailing')
 
diff --git a/mayan/apps/mailer/links.py b/mayan/apps/mailer/links.py
index 7f75fa2ee0..2860a36e8c 100644
--- a/mayan/apps/mailer/links.py
+++ b/mayan/apps/mailer/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .permissions import (
     permission_mailing_link, permission_mailing_send_document,
diff --git a/mayan/apps/mayan_statistics/__init__.py b/mayan/apps/mayan_statistics/__init__.py
index a12a494596..ac36c8981e 100644
--- a/mayan/apps/mayan_statistics/__init__.py
+++ b/mayan/apps/mayan_statistics/__init__.py
@@ -1,5 +1,3 @@
 from __future__ import unicode_literals
 
-from .classes import StatisticLineChart, StatisticNamespace  # NOQA
-
 default_app_config = 'mayan.apps.mayan_statistics.apps.StatisticsApp'
diff --git a/mayan/apps/mayan_statistics/apps.py b/mayan/apps/mayan_statistics/apps.py
index d0e386ffaf..1affde4f31 100644
--- a/mayan/apps/mayan_statistics/apps.py
+++ b/mayan/apps/mayan_statistics/apps.py
@@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.menus import menu_object, menu_secondary, menu_tools
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 from mayan.celery import app
 
 from .classes import StatisticLineChart, StatisticNamespace
diff --git a/mayan/apps/mayan_statistics/links.py b/mayan/apps/mayan_statistics/links.py
index 76a7e70e56..7626e0962d 100644
--- a/mayan/apps/mayan_statistics/links.py
+++ b/mayan/apps/mayan_statistics/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import icon_statistics
 from .permissions import permission_statistics_view
diff --git a/mayan/apps/metadata/__init__.py b/mayan/apps/metadata/__init__.py
index 1c5fa25f71..110b6582f1 100644
--- a/mayan/apps/metadata/__init__.py
+++ b/mayan/apps/metadata/__init__.py
@@ -1,5 +1,3 @@
 from __future__ import unicode_literals
 
-from .classes import MetadataLookup  # NOQA
-
 default_app_config = 'mayan.apps.metadata.apps.MetadataApp'
diff --git a/mayan/apps/metadata/apps.py b/mayan/apps/metadata/apps.py
index 26c8f673f9..b6cdfb9c82 100644
--- a/mayan/apps/metadata/apps.py
+++ b/mayan/apps/metadata/apps.py
@@ -20,13 +20,13 @@ from mayan.apps.common.menus import (
 )
 from mayan.apps.documents.search import document_page_search, document_search
 from mayan.apps.documents.signals import post_document_type_change
-from mayan.apps.events import ModelEventType
+from mayan.apps.events.classes import ModelEventType
 from mayan.apps.events.links import (
     link_events_for_object, link_object_event_types_user_subcriptions_list,
 )
 from mayan.apps.events.permissions import permission_events_view
 from mayan.celery import app
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 
 from .classes import DocumentMetadataHelper
 from .events import (
diff --git a/mayan/apps/metadata/events.py b/mayan/apps/metadata/events.py
index 73c650ee74..491f280d8e 100644
--- a/mayan/apps/metadata/events.py
+++ b/mayan/apps/metadata/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.events import EventTypeNamespace
+from mayan.apps.events.classes import EventTypeNamespace
 
 namespace = EventTypeNamespace(label=_('Metadata'), name='metadata')
 
diff --git a/mayan/apps/metadata/links.py b/mayan/apps/metadata/links.py
index e23e98b264..947bf08022 100644
--- a/mayan/apps/metadata/links.py
+++ b/mayan/apps/metadata/links.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.documents.permissions import permission_document_type_edit
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .permissions import (
     permission_metadata_document_add, permission_metadata_document_edit,
diff --git a/mayan/apps/motd/apps.py b/mayan/apps/motd/apps.py
index 090309d041..ff9ecee9b0 100644
--- a/mayan/apps/motd/apps.py
+++ b/mayan/apps/motd/apps.py
@@ -12,7 +12,7 @@ from mayan.apps.common.html_widgets import TwoStateWidget
 from mayan.apps.common.menus import (
     menu_list_facet, menu_object, menu_secondary, menu_setup
 )
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 
 from .links import (
     link_message_create, link_message_delete, link_message_edit,
diff --git a/mayan/apps/motd/links.py b/mayan/apps/motd/links.py
index 665a696a1a..734766c2be 100644
--- a/mayan/apps/motd/links.py
+++ b/mayan/apps/motd/links.py
@@ -2,7 +2,8 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link, get_cascade_condition
+from mayan.apps.navigation.classes import Link
+from mayan.apps.navigation.utils import get_cascade_condition
 
 from .permissions import (
     permission_message_create, permission_message_delete,
diff --git a/mayan/apps/navigation/__init__.py b/mayan/apps/navigation/__init__.py
index 33181082de..27bf6a2cd3 100644
--- a/mayan/apps/navigation/__init__.py
+++ b/mayan/apps/navigation/__init__.py
@@ -1,6 +1,3 @@
 from __future__ import unicode_literals
 
-from .classes import Link, Menu, SourceColumn  # NOQA
-from .utils import get_cascade_condition  # NOQA
-
 default_app_config = 'mayan.apps.navigation.apps.NavigationApp'
diff --git a/mayan/apps/ocr/apps.py b/mayan/apps/ocr/apps.py
index 0cfd5ba9ff..8ce2892de1 100644
--- a/mayan/apps/ocr/apps.py
+++ b/mayan/apps/ocr/apps.py
@@ -16,7 +16,7 @@ from mayan.apps.common.menus import (
 )
 from mayan.apps.documents.search import document_search, document_page_search
 from mayan.apps.documents.signals import post_version_upload
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 from mayan.celery import app
 
 from .handlers import (
diff --git a/mayan/apps/ocr/events.py b/mayan/apps/ocr/events.py
index c793b6edee..512c96763d 100644
--- a/mayan/apps/ocr/events.py
+++ b/mayan/apps/ocr/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.events import EventTypeNamespace
+from mayan.apps.events.classes import EventTypeNamespace
 
 namespace = EventTypeNamespace(label=_('OCR'), name='ocr')
 
diff --git a/mayan/apps/ocr/links.py b/mayan/apps/ocr/links.py
index 1cc369939a..6186f82bc7 100644
--- a/mayan/apps/ocr/links.py
+++ b/mayan/apps/ocr/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .permissions import (
     permission_ocr_content_view, permission_ocr_document,
diff --git a/mayan/apps/ocr/tasks.py b/mayan/apps/ocr/tasks.py
index 77b340e3f5..1ef2ffedf1 100644
--- a/mayan/apps/ocr/tasks.py
+++ b/mayan/apps/ocr/tasks.py
@@ -5,7 +5,7 @@ import logging
 from django.apps import apps
 from django.db import OperationalError
 
-from mayan.apps.lock_manager import LockError
+from mayan.apps.lock_manager.exceptions import LockError
 from mayan.apps.lock_manager.runtime import locking_backend
 from mayan.celery import app
 
diff --git a/mayan/apps/permissions/apps.py b/mayan/apps/permissions/apps.py
index 5407e12467..4d0f289a15 100644
--- a/mayan/apps/permissions/apps.py
+++ b/mayan/apps/permissions/apps.py
@@ -12,7 +12,7 @@ from mayan.apps.common.menus import (
     menu_list_facet, menu_object, menu_secondary, menu_setup
 )
 from mayan.apps.common.signals import perform_upgrade
-from mayan.apps.events import ModelEventType
+from mayan.apps.events.classes import ModelEventType
 from mayan.apps.events.links import (
     link_events_for_object, link_object_event_types_user_subcriptions_list
 )
diff --git a/mayan/apps/permissions/events.py b/mayan/apps/permissions/events.py
index 9b6d20ba96..4ce0cf1e9e 100644
--- a/mayan/apps/permissions/events.py
+++ b/mayan/apps/permissions/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.events import EventTypeNamespace
+from mayan.apps.events.classes import EventTypeNamespace
 
 namespace = EventTypeNamespace(
     label=_('Permissions'), name='permissions'
diff --git a/mayan/apps/permissions/links.py b/mayan/apps/permissions/links.py
index 613493a047..b67c5e83fb 100644
--- a/mayan/apps/permissions/links.py
+++ b/mayan/apps/permissions/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 from mayan.apps.user_management.permissions import permission_group_edit
 
 from .permissions import (
diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py
index 4c5886f97e..6b1ab2b33b 100644
--- a/mayan/apps/permissions/views.py
+++ b/mayan/apps/permissions/views.py
@@ -1,22 +1,17 @@
 from __future__ import unicode_literals
 
-import itertools
-
 from django.contrib.auth.models import Group
-from django.shortcuts import get_object_or_404
 from django.template import RequestContext
 from django.urls import reverse_lazy
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls.models import AccessControlList
 from mayan.apps.common.generics import (
-    AddRemoveView, AssignRemoveView, SingleObjectCreateView,
-    SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView
+    AddRemoveView, SingleObjectCreateView, SingleObjectDeleteView,
+    SingleObjectEditView, SingleObjectListView
 )
 from mayan.apps.user_management.permissions import permission_group_edit
 
-from .classes import Permission, PermissionNamespace
 from .icons import icon_role_list
 from .links import link_role_create
 from .models import Role, StoredPermission
@@ -146,7 +141,6 @@ class SetupRolePermissionsView(AddRemoveView):
         }
 
 
-
 class RoleListView(SingleObjectListView):
     model = Role
     object_permission = permission_role_view
diff --git a/mayan/apps/rest_api/links.py b/mayan/apps/rest_api/links.py
index dc728a5241..9531f4b74b 100644
--- a/mayan/apps/rest_api/links.py
+++ b/mayan/apps/rest_api/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import (
     icon_api, icon_api_documentation, icon_api_documentation_redoc
diff --git a/mayan/apps/smart_settings/apps.py b/mayan/apps/smart_settings/apps.py
index 26b059ed5d..32d2a69950 100644
--- a/mayan/apps/smart_settings/apps.py
+++ b/mayan/apps/smart_settings/apps.py
@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.menus import menu_secondary, menu_setup, menu_object
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 
 from .classes import Namespace, Setting
 from .links import (
diff --git a/mayan/apps/smart_settings/links.py b/mayan/apps/smart_settings/links.py
index b166801492..bf6cf35dfb 100644
--- a/mayan/apps/smart_settings/links.py
+++ b/mayan/apps/smart_settings/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import icon_namespace_list
 from .permissions import permission_settings_edit, permission_settings_view
diff --git a/mayan/apps/sources/apps.py b/mayan/apps/sources/apps.py
index 78a7241dd6..11eb19a50f 100644
--- a/mayan/apps/sources/apps.py
+++ b/mayan/apps/sources/apps.py
@@ -14,7 +14,7 @@ from mayan.apps.common.signals import post_initial_setup, post_upgrade
 from mayan.apps.converter.links import link_transformation_list
 from mayan.apps.documents.menus import menu_documents
 from mayan.apps.documents.signals import post_version_upload
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 from mayan.celery import app
 
 from .classes import StagingFile
diff --git a/mayan/apps/sources/classes.py b/mayan/apps/sources/classes.py
index a89458a7dc..bdd6bd8969 100644
--- a/mayan/apps/sources/classes.py
+++ b/mayan/apps/sources/classes.py
@@ -13,7 +13,7 @@ from django.urls import reverse
 from django.utils.encoding import force_text, python_2_unicode_compatible
 from django.utils.six.moves.urllib.parse import quote_plus, unquote_plus
 
-from mayan.apps.converter import TransformationResize
+from mayan.apps.converter.transformations import TransformationResize
 from mayan.apps.converter.utils import get_converter_class
 
 from .storages import storage_staging_file_image_cache
diff --git a/mayan/apps/sources/links.py b/mayan/apps/sources/links.py
index 54005bc39b..016e595d97 100644
--- a/mayan/apps/sources/links.py
+++ b/mayan/apps/sources/links.py
@@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _
 from mayan.apps.documents.permissions import (
     permission_document_create, permission_document_new_version
 )
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .literals import (
     SOURCE_CHOICE_WEB_FORM, SOURCE_CHOICE_EMAIL_IMAP, SOURCE_CHOICE_EMAIL_POP3,
diff --git a/mayan/apps/sources/tasks.py b/mayan/apps/sources/tasks.py
index 7d407d01ae..060fe61ee7 100644
--- a/mayan/apps/sources/tasks.py
+++ b/mayan/apps/sources/tasks.py
@@ -11,7 +11,7 @@ from mayan.celery import app
 
 from mayan.apps.common.compressed_files import Archive
 from mayan.apps.common.exceptions import NoMIMETypeMatch
-from mayan.apps.lock_manager import LockError
+from mayan.apps.lock_manager.exceptions import LockError
 from mayan.apps.lock_manager.runtime import locking_backend
 
 from .literals import (
diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py
index 66b71811da..7660b0baaa 100644
--- a/mayan/apps/sources/views.py
+++ b/mayan/apps/sources/views.py
@@ -25,7 +25,7 @@ from mayan.apps.documents.permissions import (
     permission_document_create, permission_document_new_version
 )
 from mayan.apps.documents.tasks import task_upload_new_version
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .exceptions import SourceException
 from .forms import (
diff --git a/mayan/apps/tags/apps.py b/mayan/apps/tags/apps.py
index 49fa63b9c0..76dba58a88 100644
--- a/mayan/apps/tags/apps.py
+++ b/mayan/apps/tags/apps.py
@@ -14,12 +14,12 @@ from mayan.apps.common.menus import (
     menu_secondary
 )
 from mayan.apps.documents.search import document_page_search, document_search
-from mayan.apps.events import ModelEventType
+from mayan.apps.events.classes import ModelEventType
 from mayan.apps.events.links import (
     link_events_for_object, link_object_event_types_user_subcriptions_list,
 )
 from mayan.apps.events.permissions import permission_events_view
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 
 from .events import (
     event_tag_attach, event_tag_created, event_tag_edited, event_tag_remove
diff --git a/mayan/apps/tags/events.py b/mayan/apps/tags/events.py
index 8f753bbbe9..1f16941df9 100644
--- a/mayan/apps/tags/events.py
+++ b/mayan/apps/tags/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.events import EventTypeNamespace
+from mayan.apps.events.classes import EventTypeNamespace
 
 namespace = EventTypeNamespace(label=_('Tags'), name='tags')
 
diff --git a/mayan/apps/tags/links.py b/mayan/apps/tags/links.py
index d09af4d293..5507b1445c 100644
--- a/mayan/apps/tags/links.py
+++ b/mayan/apps/tags/links.py
@@ -2,7 +2,8 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link, get_cascade_condition
+from mayan.apps.navigation.classes import Link
+from mayan.apps.navigation.utils import get_cascade_condition
 
 from .permissions import (
     permission_tag_attach, permission_tag_create, permission_tag_delete,
diff --git a/mayan/apps/tags/menus.py b/mayan/apps/tags/menus.py
index c8e3e8c842..7eb0b8410a 100644
--- a/mayan/apps/tags/menus.py
+++ b/mayan/apps/tags/menus.py
@@ -2,7 +2,8 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Menu, get_cascade_condition
+from mayan.apps.navigation.classes import Menu
+from mayan.apps.navigation.utils import get_cascade_condition
 
 from .icons import icon_menu_tags
 from .permissions import permission_tag_create, permission_tag_view
diff --git a/mayan/apps/task_manager/apps.py b/mayan/apps/task_manager/apps.py
index 551af25a5c..b6c4fbb2d5 100644
--- a/mayan/apps/task_manager/apps.py
+++ b/mayan/apps/task_manager/apps.py
@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.html_widgets import TwoStateWidget
 from mayan.apps.common.menus import menu_object, menu_secondary, menu_tools
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.navigation.classes import SourceColumn
 
 from .classes import CeleryQueue, Task
 from .links import (
diff --git a/mayan/apps/task_manager/links.py b/mayan/apps/task_manager/links.py
index 1e88569078..767008ab59 100644
--- a/mayan/apps/task_manager/links.py
+++ b/mayan/apps/task_manager/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Link
 
 from .icons import icon_task_manager, icon_queue_list
 from .permissions import permission_task_view
diff --git a/mayan/apps/user_management/apps.py b/mayan/apps/user_management/apps.py
index b57792c5b0..4ded7395a1 100644
--- a/mayan/apps/user_management/apps.py
+++ b/mayan/apps/user_management/apps.py
@@ -19,8 +19,8 @@ from mayan.apps.events.links import (
     link_events_for_object, link_object_event_types_user_subcriptions_list
 )
 from mayan.apps.events.permissions import permission_events_view
-from mayan.apps.metadata import MetadataLookup
-from mayan.apps.navigation import SourceColumn
+from mayan.apps.metadata.classes import MetadataLookup
+from mayan.apps.navigation.classes import SourceColumn
 from mayan.apps.rest_api.fields import DynamicSerializerField
 
 from .events import (
diff --git a/mayan/apps/user_management/events.py b/mayan/apps/user_management/events.py
index 2d18763e36..b4c0f49941 100644
--- a/mayan/apps/user_management/events.py
+++ b/mayan/apps/user_management/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.events import EventTypeNamespace
+from mayan.apps.events.classes import EventTypeNamespace
 
 namespace = EventTypeNamespace(
     label=_('User management'), name='user_management'