diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py
index 0b7f4c7983..69e1133ed0 100644
--- a/mayan/apps/acls/views.py
+++ b/mayan/apps/acls/views.py
@@ -11,7 +11,7 @@ from django.urls import reverse
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     AssignRemoveView, SingleObjectCreateView, SingleObjectDeleteView,
     SingleObjectListView
 )
diff --git a/mayan/apps/cabinets/views.py b/mayan/apps/cabinets/views.py
index 393366957a..135c8c8ebb 100644
--- a/mayan/apps/cabinets/views.py
+++ b/mayan/apps/cabinets/views.py
@@ -9,7 +9,7 @@ from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _, ungettext
 
 from mayan.apps.acls.models import AccessControlList
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     MultipleObjectFormActionView, SingleObjectCreateView,
     SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView
 )
diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py
index 8d54108218..e0aec0267b 100644
--- a/mayan/apps/common/views.py
+++ b/mayan/apps/common/views.py
@@ -21,13 +21,8 @@ from .forms import (
     LicenseForm, LocaleProfileForm, LocaleProfileForm_view,
     PackagesLicensesForm
 )
-from .generics import (  # NOQA
-    AssignRemoveView, ConfirmView, FormView, MultiFormView,
-    MultipleObjectConfirmActionView, MultipleObjectFormActionView,
-    SingleObjectCreateView, SingleObjectDeleteView,
-    SingleObjectDetailView, SingleObjectDynamicFormCreateView,
-    SingleObjectDynamicFormEditView, SingleObjectDownloadView,
-    SingleObjectEditView, SingleObjectListView, SimpleView
+from .generics import (
+    ConfirmView, SingleObjectEditView, SingleObjectListView, SimpleView
 )
 from .icons import icon_setup
 from .menus import menu_tools, menu_setup
diff --git a/mayan/apps/converter/views.py b/mayan/apps/converter/views.py
index 75d097f38b..60c85be028 100644
--- a/mayan/apps/converter/views.py
+++ b/mayan/apps/converter/views.py
@@ -10,7 +10,7 @@ from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.acls.models import AccessControlList
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView,
     SingleObjectListView
 )
diff --git a/mayan/apps/document_indexing/views.py b/mayan/apps/document_indexing/views.py
index 64889e9560..0e7c07487e 100644
--- a/mayan/apps/document_indexing/views.py
+++ b/mayan/apps/document_indexing/views.py
@@ -8,7 +8,7 @@ from django.utils.html import mark_safe
 from django.utils.translation import ugettext_lazy as _, ungettext
 
 from mayan.apps.acls.models import AccessControlList
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     AssignRemoveView, FormView, SingleObjectCreateView,
     SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView
 )
diff --git a/mayan/apps/document_states/views/workflow_instance_views.py b/mayan/apps/document_states/views/workflow_instance_views.py
index 034e8786ab..9f346147c3 100644
--- a/mayan/apps/document_states/views/workflow_instance_views.py
+++ b/mayan/apps/document_states/views/workflow_instance_views.py
@@ -6,7 +6,7 @@ from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.acls.models import AccessControlList
-from mayan.apps.common.views import FormView, SingleObjectListView
+from mayan.apps.common.generics import FormView, SingleObjectListView
 from mayan.apps.documents.models import Document
 
 from ..forms import WorkflowInstanceTransitionForm
diff --git a/mayan/apps/document_states/views/workflow_proxy_views.py b/mayan/apps/document_states/views/workflow_proxy_views.py
index 85e45f0ec0..b4b6685098 100644
--- a/mayan/apps/document_states/views/workflow_proxy_views.py
+++ b/mayan/apps/document_states/views/workflow_proxy_views.py
@@ -5,7 +5,7 @@ from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.acls.models import AccessControlList
-from mayan.apps.common.views import SingleObjectListView
+from mayan.apps.common.generics import SingleObjectListView
 from mayan.apps.documents.models import Document
 from mayan.apps.documents.views import DocumentListView
 
diff --git a/mayan/apps/document_states/views/workflow_views.py b/mayan/apps/document_states/views/workflow_views.py
index 3582532bcc..b845d7840d 100644
--- a/mayan/apps/document_states/views/workflow_views.py
+++ b/mayan/apps/document_states/views/workflow_views.py
@@ -11,7 +11,7 @@ from django.urls import reverse, reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.acls.models import AccessControlList
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     AssignRemoveView, ConfirmView, FormView, SingleObjectCreateView,
     SingleObjectDeleteView, SingleObjectDetailView,
     SingleObjectDynamicFormCreateView, SingleObjectDynamicFormEditView,
diff --git a/mayan/apps/events/views.py b/mayan/apps/events/views.py
index 2af4834ede..4c3680fc04 100644
--- a/mayan/apps/events/views.py
+++ b/mayan/apps/events/views.py
@@ -11,8 +11,9 @@ from django.utils.translation import ugettext_lazy as _
 from actstream.models import Action, any_stream
 
 from mayan.apps.acls.models import AccessControlList
-from mayan.apps.common.generics import FormView, SimpleView
-from mayan.apps.common.views import SingleObjectListView
+from mayan.apps.common.generics import (
+    FormView, SimpleView, SingleObjectListView
+)
 
 from .classes import EventType, ModelEventType
 from .forms import (
diff --git a/mayan/apps/motd/views.py b/mayan/apps/motd/views.py
index 9ca6582486..6b2bd17a93 100644
--- a/mayan/apps/motd/views.py
+++ b/mayan/apps/motd/views.py
@@ -6,7 +6,7 @@ from django.template import RequestContext
 from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView,
     SingleObjectListView
 )
diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py
index 9d9448c28f..51c21d98fe 100644
--- a/mayan/apps/permissions/views.py
+++ b/mayan/apps/permissions/views.py
@@ -10,10 +10,9 @@ 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
-from mayan.apps.common.views import (
-    AssignRemoveView, SingleObjectCreateView, SingleObjectDeleteView,
-    SingleObjectEditView, SingleObjectListView
+from mayan.apps.common.generics import (
+    AddRemoveView, AssignRemoveView, SingleObjectCreateView,
+    SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView
 )
 from mayan.apps.user_management.permissions import permission_group_edit
 
diff --git a/mayan/apps/smart_settings/views.py b/mayan/apps/smart_settings/views.py
index 242ebf351a..44d768f4c6 100644
--- a/mayan/apps/smart_settings/views.py
+++ b/mayan/apps/smart_settings/views.py
@@ -5,7 +5,7 @@ from django.http import Http404
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common.views import FormView, SingleObjectListView
+from mayan.apps.common.generics import FormView, SingleObjectListView
 
 from .classes import Namespace, Setting
 from .forms import SettingForm
diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py
index 321ae09e85..c27a8fb02b 100644
--- a/mayan/apps/sources/views.py
+++ b/mayan/apps/sources/views.py
@@ -16,7 +16,7 @@ from mayan.apps.acls.models import AccessControlList
 from mayan.apps.checkouts.models import NewVersionBlock
 from mayan.apps.common.menus import menu_facet
 from mayan.apps.common.models import SharedUploadedFile
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     ConfirmView, MultiFormView, SingleObjectCreateView,
     SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView
 )
diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py
index 45b8c4110f..b1d80f05c0 100644
--- a/mayan/apps/tags/views.py
+++ b/mayan/apps/tags/views.py
@@ -9,7 +9,7 @@ from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _, ungettext
 
 from mayan.apps.acls.models import AccessControlList
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     MultipleObjectFormActionView, MultipleObjectConfirmActionView,
     SingleObjectCreateView, SingleObjectEditView, SingleObjectListView
 )
diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py
index 1e950fc3ff..843205d5e9 100644
--- a/mayan/apps/user_management/views.py
+++ b/mayan/apps/user_management/views.py
@@ -11,11 +11,11 @@ from django.template import RequestContext
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import ungettext, ugettext_lazy as _
 
-from mayan.apps.common.generics import AddRemoveView
-from mayan.apps.common.views import (
-    MultipleObjectConfirmActionView, MultipleObjectFormActionView,
-    SingleObjectCreateView, SingleObjectDeleteView, SingleObjectDetailView,
-    SingleObjectEditView, SingleObjectListView
+from mayan.apps.common.generics import (
+    AddRemoveView, MultipleObjectConfirmActionView,
+    MultipleObjectFormActionView, SingleObjectCreateView,
+    SingleObjectDeleteView, SingleObjectDetailView, SingleObjectEditView,
+    SingleObjectListView
 )
 
 from .forms import UserForm