diff --git a/mayan/apps/documents/urls.py b/mayan/apps/documents/urls.py
index 3ae6b9ce09..e19d8d2daf 100644
--- a/mayan/apps/documents/urls.py
+++ b/mayan/apps/documents/urls.py
@@ -32,11 +32,37 @@ from .views import (
     DocumentVersionDownloadFormView, DocumentVersionDownloadView,
     DocumentVersionListView, DocumentVersionRevertView, DocumentVersionView,
     DocumentView, DuplicatedDocumentListView, EmptyTrashCanView,
-    FavoriteAddView, FavoriteDocumentListView, FavoriteRemoveView,
     RecentAccessDocumentListView, RecentAddedDocumentListView,
     ScanDuplicatedDocuments
 )
+from .views.favorite_document_views import (
+    FavoriteAddView, FavoriteDocumentListView, FavoriteRemoveView
+)
 
+urlpatterns_favorite_documents = [
+    url(
+        regex=r'^list/favorites/$', view=FavoriteDocumentListView.as_view(),
+        name='document_list_favorites'
+    ),
+    url(
+        regex=r'^(?P<pk>\d+)/add_to_favorites/$',
+        view=FavoriteAddView.as_view(), name='document_add_to_favorites'
+    ),
+    url(
+        regex=r'^multiple/add_to_favorites/$', view=FavoriteAddView.as_view(),
+        name='document_multiple_add_to_favorites'
+    ),
+    url(
+        regex=r'^(?P<pk>\d+)/remove_from_favorites/$',
+        view=FavoriteRemoveView.as_view(),
+        name='document_remove_from_favorites'
+    ),
+    url(
+        regex=r'^multiple/remove_from_favorites/$',
+        view=FavoriteRemoveView.as_view(),
+        name='document_multiple_remove_from_favorites'
+    ),
+]
 
 urlpatterns = [
     url(
@@ -61,10 +87,6 @@ urlpatterns = [
         view=DuplicatedDocumentListView.as_view(),
         name='duplicated_document_list'
     ),
-    url(
-        regex=r'^list/favorites/$', view=FavoriteDocumentListView.as_view(),
-        name='document_list_favorites'
-    ),
     url(
         regex=r'^(?P<pk>\d+)/preview/$', view=DocumentPreviewView.as_view(),
         name='document_preview'
@@ -78,24 +100,6 @@ urlpatterns = [
         view=DocumentDuplicatesListView.as_view(),
         name='document_duplicates_list'
     ),
-    url(
-        regex=r'^(?P<pk>\d+)/add_to_favorites/$',
-        view=FavoriteAddView.as_view(), name='document_add_to_favorites'
-    ),
-    url(
-        regex=r'^multiple/add_to_favorites/$', view=FavoriteAddView.as_view(),
-        name='document_multiple_add_to_favorites'
-    ),
-    url(
-        regex=r'^(?P<pk>\d+)/remove_from_favorites/$',
-        view=FavoriteRemoveView.as_view(),
-        name='document_remove_from_favorites'
-    ),
-    url(
-        regex=r'^multiple/remove_from_favorites/$',
-        view=FavoriteRemoveView.as_view(),
-        name='document_multiple_remove_from_favorites'
-    ),
     url(
         regex=r'^(?P<pk>\d+)/restore/$', view=DocumentRestoreView.as_view(),
         name='document_restore'
@@ -318,6 +322,8 @@ urlpatterns = [
         name='duplicated_document_scan'
     ),
 ]
+urlpatterns.extend(urlpatterns_favorite_documents)
+
 
 api_urls = [
     url(