diff --git a/HISTORY.rst b/HISTORY.rst
index f73aff3679..9fc127db29 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -76,6 +76,7 @@
   format.
 * Move Pillow initialization from the module to the backend
   class initialization.
+* Remove star import from the ACL and Common apps.
 
 3.1.11 (2019-04-XX)
 ===================
diff --git a/docs/releases/3.2.rst b/docs/releases/3.2.rst
index b4af1381ad..944b158123 100644
--- a/docs/releases/3.2.rst
+++ b/docs/releases/3.2.rst
@@ -108,6 +108,7 @@ Other changes
   format.
 * Move Pillow initialization from the module to the backend
   class initialization.
+* Remove star import from the ACL and Common apps.
 
 Removals
 --------
diff --git a/mayan/apps/acls/__init__.py b/mayan/apps/acls/__init__.py
index f338aec7f5..bf9a01369d 100644
--- a/mayan/apps/acls/__init__.py
+++ b/mayan/apps/acls/__init__.py
@@ -1,5 +1,3 @@
 from __future__ import unicode_literals
 
-from .classes import ModelPermission  # NOQA
-
 default_app_config = 'mayan.apps.acls.apps.ACLsApp'
diff --git a/mayan/apps/acls/apps.py b/mayan/apps/acls/apps.py
index 73ac37d443..99c013b24e 100644
--- a/mayan/apps/acls/apps.py
+++ b/mayan/apps/acls/apps.py
@@ -2,7 +2,8 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import MayanAppConfig, menu_object, menu_sidebar
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import menu_object, menu_sidebar
 from mayan.apps.navigation import SourceColumn
 
 from .links import link_acl_create, link_acl_delete, link_acl_permissions
diff --git a/mayan/apps/appearance/apps.py b/mayan/apps/appearance/apps.py
index f32a9a88b2..7a7d35bca3 100644
--- a/mayan/apps/appearance/apps.py
+++ b/mayan/apps/appearance/apps.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import MayanAppConfig
+from mayan.apps.common.apps import MayanAppConfig
 
 from .licenses import *  # NOQA
 
diff --git a/mayan/apps/authentication/apps.py b/mayan/apps/authentication/apps.py
index d5e570037e..a2125dea1d 100644
--- a/mayan/apps/authentication/apps.py
+++ b/mayan/apps/authentication/apps.py
@@ -4,7 +4,8 @@ import logging
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import MayanAppConfig, menu_user
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import menu_user
 from mayan.apps.navigation.classes import Separator
 
 from .links import link_logout, link_password_change
diff --git a/mayan/apps/autoadmin/apps.py b/mayan/apps/autoadmin/apps.py
index 496aa68ddd..306cfff264 100644
--- a/mayan/apps/autoadmin/apps.py
+++ b/mayan/apps/autoadmin/apps.py
@@ -4,7 +4,7 @@ from django.conf import settings
 from django.db.models.signals import post_save
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import MayanAppConfig
+from mayan.apps.common.apps import MayanAppConfig
 
 from .handlers import handler_auto_admin_account_password_change
 
diff --git a/mayan/apps/cabinets/apps.py b/mayan/apps/cabinets/apps.py
index 740c45e658..71e327c0bd 100644
--- a/mayan/apps/cabinets/apps.py
+++ b/mayan/apps/cabinets/apps.py
@@ -3,11 +3,11 @@ from __future__ import unicode_literals
 from django.apps import apps
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
-from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_main, menu_multi_item, menu_object,
-    menu_sidebar
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import (
+    menu_facet, menu_main, menu_multi_item, menu_object, menu_sidebar
 )
 from mayan.apps.documents.search import document_page_search, document_search
 from mayan.apps.navigation import SourceColumn
diff --git a/mayan/apps/checkouts/apps.py b/mayan/apps/checkouts/apps.py
index f961812b25..19d6e6b1ca 100644
--- a/mayan/apps/checkouts/apps.py
+++ b/mayan/apps/checkouts/apps.py
@@ -8,8 +8,9 @@ from django.apps import apps
 from django.db.models.signals import pre_save
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
-from mayan.apps.common import MayanAppConfig, menu_facet, menu_main, menu_sidebar
+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_sidebar
 from mayan.apps.dashboards.dashboards import dashboard_main
 from mayan.apps.events import ModelEventType
 from mayan.celery import app
diff --git a/mayan/apps/common/__init__.py b/mayan/apps/common/__init__.py
index d97a8218a5..0f5cbe85f3 100644
--- a/mayan/apps/common/__init__.py
+++ b/mayan/apps/common/__init__.py
@@ -1,7 +1,3 @@
 from __future__ import unicode_literals
 
-from .apps import MayanAppConfig  # NOQA
-from .classes import MissingItem  # NOQA
-from .menus import *  # NOQA
-
 default_app_config = 'mayan.apps.common.apps.CommonApp'
diff --git a/mayan/apps/converter/apps.py b/mayan/apps/converter/apps.py
index 54d448c76c..cef38b17a0 100644
--- a/mayan/apps/converter/apps.py
+++ b/mayan/apps/converter/apps.py
@@ -3,7 +3,8 @@ from __future__ import unicode_literals
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import MayanAppConfig, menu_object, menu_sidebar
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import menu_object, menu_sidebar
 from mayan.apps.navigation import SourceColumn
 
 from .links import (
diff --git a/mayan/apps/dashboards/apps.py b/mayan/apps/dashboards/apps.py
index c84d414242..286c9d09de 100644
--- a/mayan/apps/dashboards/apps.py
+++ b/mayan/apps/dashboards/apps.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import MayanAppConfig
+from mayan.apps.common.apps import MayanAppConfig
 
 
 class DashboardsApp(MayanAppConfig):
diff --git a/mayan/apps/django_gpg/apps.py b/mayan/apps/django_gpg/apps.py
index 0362b64415..86799beec8 100644
--- a/mayan/apps/django_gpg/apps.py
+++ b/mayan/apps/django_gpg/apps.py
@@ -2,11 +2,12 @@ from __future__ import absolute_import, unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.acls.links import link_acl_list
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
-from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_object, menu_setup, menu_sidebar
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import (
+    menu_facet, menu_object, menu_setup, menu_sidebar
 )
 from mayan.apps.navigation import SourceColumn
 
diff --git a/mayan/apps/document_comments/apps.py b/mayan/apps/document_comments/apps.py
index 5689c1225d..c23f196e56 100644
--- a/mayan/apps/document_comments/apps.py
+++ b/mayan/apps/document_comments/apps.py
@@ -3,8 +3,9 @@ from __future__ import absolute_import, unicode_literals
 from django.apps import apps
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
-from mayan.apps.common import MayanAppConfig, menu_facet, menu_object, menu_sidebar
+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_sidebar
 from mayan.apps.documents.search import document_page_search, document_search
 from mayan.apps.events import ModelEventType
 from mayan.apps.navigation import SourceColumn
diff --git a/mayan/apps/document_indexing/apps.py b/mayan/apps/document_indexing/apps.py
index 709bd35a89..59bd712801 100644
--- a/mayan/apps/document_indexing/apps.py
+++ b/mayan/apps/document_indexing/apps.py
@@ -6,12 +6,12 @@ from django.apps import apps
 from django.db.models.signals import post_delete, post_save, pre_delete
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.acls.links import link_acl_list
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
-from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_main, menu_object, menu_secondary,
-    menu_setup, menu_tools
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import (
+    menu_facet, menu_main, menu_object, menu_secondary, menu_setup, menu_tools
 )
 from mayan.apps.common.widgets import TwoStateWidget
 from mayan.apps.documents.signals import post_document_created, post_initial_document_type
diff --git a/mayan/apps/document_parsing/apps.py b/mayan/apps/document_parsing/apps.py
index 2ab7cab1e3..3b3d68099e 100644
--- a/mayan/apps/document_parsing/apps.py
+++ b/mayan/apps/document_parsing/apps.py
@@ -8,12 +8,12 @@ from django.apps import apps
 from django.db.models.signals import post_save
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
-from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_multi_item, menu_object, menu_secondary,
-    menu_tools
-)
+from mayan.apps.acls.classes import ModelPermission
+from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.classes import ModelField
+from mayan.apps.common.menus import (
+    menu_facet, menu_multi_item, menu_object, menu_secondary, menu_tools
+)
 from mayan.apps.documents.search import document_search, document_page_search
 from mayan.apps.documents.signals import post_version_upload
 from mayan.apps.documents.widgets import document_link
diff --git a/mayan/apps/document_signatures/apps.py b/mayan/apps/document_signatures/apps.py
index 032573a747..df9b149e16 100644
--- a/mayan/apps/document_signatures/apps.py
+++ b/mayan/apps/document_signatures/apps.py
@@ -8,9 +8,10 @@ from django.apps import apps
 from django.db.models.signals import post_save, post_delete
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
-from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_object, menu_sidebar, menu_tools
+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_sidebar, menu_tools
 )
 from mayan.apps.navigation import SourceColumn
 from mayan.celery import app
diff --git a/mayan/apps/document_states/apps.py b/mayan/apps/document_states/apps.py
index 3ae894150a..eb4e730032 100644
--- a/mayan/apps/document_states/apps.py
+++ b/mayan/apps/document_states/apps.py
@@ -6,14 +6,15 @@ from django.utils.translation import ugettext_lazy as _
 
 from kombu import Exchange, Queue
 
-from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.acls.links import link_acl_list
-from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_main, menu_object, menu_secondary,
-    menu_setup, menu_sidebar, menu_tools
-)
+from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.classes import ModelAttribute
 from mayan.apps.common.links import link_object_error_list
+from mayan.apps.common.menus import (
+    menu_facet, menu_main, menu_object, menu_secondary, menu_setup,
+    menu_sidebar, menu_tools
+)
 from mayan.apps.common.permissions_runtime import permission_error_log_view
 from mayan.apps.common.widgets import TwoStateWidget
 from mayan.apps.navigation import SourceColumn
diff --git a/mayan/apps/documents/apps.py b/mayan/apps/documents/apps.py
index eee98adab9..37febe2933 100644
--- a/mayan/apps/documents/apps.py
+++ b/mayan/apps/documents/apps.py
@@ -7,14 +7,15 @@ from kombu import Exchange, Queue
 from django.db.models.signals import post_delete
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.acls.links import link_acl_list
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
-from mayan.apps.common import (
-    MayanAppConfig, MissingItem, menu_facet, menu_main, menu_object,
-    menu_secondary, menu_setup, menu_sidebar, menu_multi_item, menu_tools
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.classes import MissingItem, ModelField, Template
+from mayan.apps.common.menus import (
+    menu_facet, menu_main, menu_object, menu_secondary, menu_setup,
+    menu_sidebar, menu_multi_item, menu_tools
 )
-from mayan.apps.common.classes import ModelField, Template
 from mayan.apps.common.signals import post_initial_setup
 from mayan.apps.common.widgets import TwoStateWidget
 from mayan.apps.dashboards.dashboards import dashboard_main
diff --git a/mayan/apps/dynamic_search/apps.py b/mayan/apps/dynamic_search/apps.py
index fdd1008fc3..467ae05063 100644
--- a/mayan/apps/dynamic_search/apps.py
+++ b/mayan/apps/dynamic_search/apps.py
@@ -2,7 +2,8 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import MayanAppConfig, menu_facet, menu_sidebar
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import menu_facet, menu_sidebar
 
 from .links import link_search, link_search_advanced, link_search_again
 
diff --git a/mayan/apps/events/apps.py b/mayan/apps/events/apps.py
index b306f7eb2c..6365574763 100644
--- a/mayan/apps/events/apps.py
+++ b/mayan/apps/events/apps.py
@@ -4,9 +4,9 @@ from django.apps import apps
 from django.contrib.auth import get_user_model
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import (
-    MayanAppConfig, menu_main, menu_object, menu_secondary, menu_tools,
-    menu_user
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import (
+    menu_main, menu_object, menu_secondary, menu_tools, menu_user
 )
 from mayan.apps.common.widgets import TwoStateWidget
 from mayan.apps.navigation import SourceColumn
diff --git a/mayan/apps/linking/apps.py b/mayan/apps/linking/apps.py
index b0b8f0afe7..1cf95484fd 100644
--- a/mayan/apps/linking/apps.py
+++ b/mayan/apps/linking/apps.py
@@ -3,12 +3,12 @@ from __future__ import unicode_literals
 from django.apps import apps
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.acls.links import link_acl_list
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
-from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_object, menu_secondary, menu_setup,
-    menu_sidebar
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import (
+    menu_facet, menu_object, menu_secondary, menu_setup, menu_sidebar
 )
 from mayan.apps.common.widgets import TwoStateWidget
 from mayan.apps.navigation import SourceColumn
diff --git a/mayan/apps/mailer/apps.py b/mayan/apps/mailer/apps.py
index 3e0370e8e9..959041787d 100644
--- a/mayan/apps/mailer/apps.py
+++ b/mayan/apps/mailer/apps.py
@@ -5,12 +5,12 @@ from kombu import Exchange, Queue
 from django.apps import apps
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.acls.links import link_acl_list
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
-from mayan.apps.common import (
-    MayanAppConfig, menu_object, menu_multi_item, menu_secondary, menu_setup,
-    menu_tools
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import (
+    menu_object, menu_multi_item, menu_secondary, menu_setup, menu_tools
 )
 from mayan.apps.common.widgets import TwoStateWidget
 from mayan.apps.navigation import SourceColumn
diff --git a/mayan/apps/mayan_statistics/apps.py b/mayan/apps/mayan_statistics/apps.py
index 564bc1e593..d0e386ffaf 100644
--- a/mayan/apps/mayan_statistics/apps.py
+++ b/mayan/apps/mayan_statistics/apps.py
@@ -4,7 +4,8 @@ from kombu import Exchange, Queue
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import MayanAppConfig, menu_object, menu_secondary, menu_tools
+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.celery import app
 
diff --git a/mayan/apps/metadata/apps.py b/mayan/apps/metadata/apps.py
index efcc702d57..b373645441 100644
--- a/mayan/apps/metadata/apps.py
+++ b/mayan/apps/metadata/apps.py
@@ -8,14 +8,15 @@ from django.apps import apps
 from django.db.models.signals import post_delete, post_save
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.acls.links import link_acl_list
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
-from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_multi_item, menu_object, menu_secondary,
-    menu_setup, menu_sidebar
-)
+from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.classes import ModelAttribute, ModelField
+from mayan.apps.common.menus import (
+    menu_facet, menu_multi_item, menu_object, menu_secondary, menu_setup,
+    menu_sidebar
+)
 from mayan.apps.common.widgets import TwoStateWidget
 from mayan.apps.documents.search import document_page_search, document_search
 from mayan.apps.documents.signals import post_document_type_change
diff --git a/mayan/apps/mimetype/apps.py b/mayan/apps/mimetype/apps.py
index 2caee7ecb2..60b3343e0c 100644
--- a/mayan/apps/mimetype/apps.py
+++ b/mayan/apps/mimetype/apps.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import MayanAppConfig
+from mayan.apps.common.apps import MayanAppConfig
 
 from .licenses import *  # NOQA
 
diff --git a/mayan/apps/motd/apps.py b/mayan/apps/motd/apps.py
index 8d65758b96..6c18918551 100644
--- a/mayan/apps/motd/apps.py
+++ b/mayan/apps/motd/apps.py
@@ -4,10 +4,11 @@ import logging
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.acls.links import link_acl_list
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
-from mayan.apps.common import MayanAppConfig, menu_object, menu_secondary, menu_setup
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import menu_object, menu_secondary, menu_setup
 from mayan.apps.navigation import SourceColumn
 
 from .links import (
diff --git a/mayan/apps/ocr/apps.py b/mayan/apps/ocr/apps.py
index 5300501d1f..e03f4d24b4 100644
--- a/mayan/apps/ocr/apps.py
+++ b/mayan/apps/ocr/apps.py
@@ -8,12 +8,12 @@ from django.apps import apps
 from django.db.models.signals import post_save
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
-from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_multi_item, menu_object, menu_secondary,
-    menu_tools
-)
+from mayan.apps.acls.classes import ModelPermission
+from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.classes import ModelField
+from mayan.apps.common.menus import (
+    menu_facet, menu_multi_item, menu_object, menu_secondary, menu_tools
+)
 from mayan.apps.documents.search import document_search, document_page_search
 from mayan.apps.documents.signals import post_version_upload
 from mayan.apps.documents.widgets import document_link
diff --git a/mayan/apps/permissions/apps.py b/mayan/apps/permissions/apps.py
index aafa14b1c5..5d76e923d3 100644
--- a/mayan/apps/permissions/apps.py
+++ b/mayan/apps/permissions/apps.py
@@ -3,12 +3,13 @@ from __future__ import unicode_literals
 from django.apps import apps
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.acls.links import link_acl_list
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
 
-from mayan.apps.common import (
-    MayanAppConfig, menu_multi_item, menu_object, menu_secondary, menu_setup
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import (
+    menu_multi_item, menu_object, menu_secondary, menu_setup
 )
 from mayan.apps.common.signals import perform_upgrade
 
diff --git a/mayan/apps/rest_api/apps.py b/mayan/apps/rest_api/apps.py
index 88d0b2c61a..55a41a2ab5 100644
--- a/mayan/apps/rest_api/apps.py
+++ b/mayan/apps/rest_api/apps.py
@@ -5,7 +5,8 @@ from django.conf import settings
 from django.utils.module_loading import import_string
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import MayanAppConfig, menu_tools
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import menu_tools
 
 from .links import (
     link_api, link_api_documentation, link_api_documentation_redoc
diff --git a/mayan/apps/smart_settings/apps.py b/mayan/apps/smart_settings/apps.py
index 497557b987..e058b26980 100644
--- a/mayan/apps/smart_settings/apps.py
+++ b/mayan/apps/smart_settings/apps.py
@@ -2,9 +2,8 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import (
-    MayanAppConfig, menu_sidebar, menu_setup, menu_object
-)
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import menu_sidebar, menu_setup, menu_object
 from mayan.apps.navigation import SourceColumn
 
 from .classes import Namespace, Setting
diff --git a/mayan/apps/sources/apps.py b/mayan/apps/sources/apps.py
index 25c76c8d43..346ba9fd36 100644
--- a/mayan/apps/sources/apps.py
+++ b/mayan/apps/sources/apps.py
@@ -4,9 +4,10 @@ from django.utils.translation import ugettext_lazy as _
 
 from kombu import Exchange, Queue
 
-from mayan.apps.common import (
-    MayanAppConfig, MissingItem, menu_object, menu_secondary, menu_sidebar,
-    menu_setup
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.classes import MissingItem
+from mayan.apps.common.menus import (
+    menu_object, menu_secondary, menu_sidebar, menu_setup
 )
 from mayan.apps.common.signals import post_initial_setup, post_upgrade
 from mayan.apps.converter.links import link_transformation_list
diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py
index 3b9a3bb47a..f755866491 100644
--- a/mayan/apps/sources/views.py
+++ b/mayan/apps/sources/views.py
@@ -14,7 +14,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.acls.models import AccessControlList
 from mayan.apps.checkouts.models import NewVersionBlock
-from mayan.apps.common import menu_facet
+from mayan.apps.common.menus import menu_facet
 from mayan.apps.common.models import SharedUploadedFile
 from mayan.apps.common.utils import encapsulate
 from mayan.apps.common.views import (
diff --git a/mayan/apps/tags/apps.py b/mayan/apps/tags/apps.py
index d279a8007f..3d4c95259a 100644
--- a/mayan/apps/tags/apps.py
+++ b/mayan/apps/tags/apps.py
@@ -4,14 +4,14 @@ from django.apps import apps
 from django.db.models.signals import m2m_changed, pre_delete
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.acls.links import link_acl_list
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
-from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_object, menu_main, menu_multi_item,
-    menu_sidebar
-)
+from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.classes import ModelField
+from mayan.apps.common.menus import (
+    menu_facet, menu_object, menu_main, menu_multi_item, menu_sidebar
+)
 from mayan.apps.documents.search import document_page_search, document_search
 from mayan.apps.events import ModelEventType
 from mayan.apps.events.links import (
diff --git a/mayan/apps/task_manager/apps.py b/mayan/apps/task_manager/apps.py
index 8b92c1dc9b..bcafe7b68b 100644
--- a/mayan/apps/task_manager/apps.py
+++ b/mayan/apps/task_manager/apps.py
@@ -2,9 +2,8 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import (
-    MayanAppConfig, menu_object, menu_secondary, menu_tools
-)
+from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import menu_object, menu_secondary, menu_tools
 from mayan.apps.common.widgets import TwoStateWidget
 from mayan.apps.navigation import SourceColumn
 
diff --git a/mayan/apps/user_management/apps.py b/mayan/apps/user_management/apps.py
index a9d593a4a9..043309102a 100644
--- a/mayan/apps/user_management/apps.py
+++ b/mayan/apps/user_management/apps.py
@@ -5,11 +5,13 @@ from django.contrib.auth import get_user_model
 from django.db.models.signals import post_save
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.classes import ModelPermission
 from mayan.apps.acls.links import link_acl_list
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
-from mayan.apps.common import menu_multi_item, menu_object, menu_secondary, menu_setup
 from mayan.apps.common.apps import MayanAppConfig
+from mayan.apps.common.menus import (
+    menu_multi_item, menu_object, menu_secondary, menu_setup
+)
 from mayan.apps.common.widgets import TwoStateWidget
 from mayan.apps.metadata import MetadataLookup
 from mayan.apps.navigation import SourceColumn