diff --git a/mayan/apps/document_indexing/urls.py b/mayan/apps/document_indexing/urls.py
index d34650c1b5..6b363dbf5f 100644
--- a/mayan/apps/document_indexing/urls.py
+++ b/mayan/apps/document_indexing/urls.py
@@ -15,72 +15,82 @@ from .views import (
     TemplateNodeCreateView, TemplateNodeDeleteView, TemplateNodeEditView
 )
 
-urlpatterns = [
+
+urlpatterns_templates = [
     url(
-        regex=r'^setup/document_types/(?P<pk>\d+)/index_templates/$',
+        regex=r'^document_types/(?P<pk>\d+)/index_templates/$',
         view=DocumentTypeIndexesView.as_view(),
         name='document_type_index_templates'
     ),
     url(
-        regex=r'^setup/index/list/$', view=SetupIndexListView.as_view(),
+        regex=r'^templates/$', view=SetupIndexListView.as_view(),
         name='index_setup_list'
     ),
     url(
-        regex=r'^setup/index/create/$', view=SetupIndexCreateView.as_view(),
+        regex=r'^templates/create/$', view=SetupIndexCreateView.as_view(),
         name='index_setup_create'
     ),
     url(
-        regex=r'^setup/index/(?P<pk>\d+)/edit/$',
-        view=SetupIndexEditView.as_view(), name='index_setup_edit'
-    ),
-    url(
-        regex=r'^setup/index/(?P<pk>\d+)/delete/$',
+        regex=r'^templates/(?P<pk>\d+)/delete/$',
         view=SetupIndexDeleteView.as_view(), name='index_setup_delete'
     ),
     url(
-        regex=r'^setup/index/(?P<pk>\d+)/template/$',
-        view=SetupIndexTreeTemplateListView.as_view(), name='index_setup_view'
-    ),
-    url(
-        regex=r'^setup/index/(?P<pk>\d+)/document_types/$',
+        regex=r'^templates/(?P<pk>\d+)/document_types/$',
         view=SetupIndexDocumentTypesView.as_view(),
         name='index_setup_document_types'
     ),
     url(
-        regex=r'^setup/index/(?P<pk>\d+)/rebuild/$',
+        regex=r'^templates/(?P<pk>\d+)/edit/$',
+        view=SetupIndexEditView.as_view(), name='index_setup_edit'
+    ),
+    url(
+        regex=r'^templates/(?P<pk>\d+)/nodes/$',
+        view=SetupIndexTreeTemplateListView.as_view(), name='index_setup_view'
+    ),
+    url(
+        regex=r'^templates/(?P<pk>\d+)/rebuild/$',
         view=SetupIndexRebuildView.as_view(), name='index_setup_rebuild'
     ),
     url(
-        regex=r'^setup/template/node/(?P<pk>\d+)/create/child/$',
+        regex=r'^templates/nodes/(?P<pk>\d+)/children/create/$',
         view=TemplateNodeCreateView.as_view(), name='template_node_create'
     ),
     url(
-        regex=r'^setup/template/node/(?P<pk>\d+)/edit/$',
-        view=TemplateNodeEditView.as_view(), name='template_node_edit'
-    ),
-    url(
-        regex=r'^setup/template/node/(?P<pk>\d+)/delete/$',
+        regex=r'^templates/nodes/(?P<pk>\d+)/delete/$',
         view=TemplateNodeDeleteView.as_view(), name='template_node_delete'
     ),
-
     url(
-        regex=r'^index/list/$', view=IndexListView.as_view(), name='index_list'
+        regex=r'^templates/nodes/(?P<pk>\d+)/edit/$',
+        view=TemplateNodeEditView.as_view(), name='template_node_edit'
+    ),
+]
+
+urlpatterns_instances = [
+    url(
+        regex=r'^instances/$', view=IndexListView.as_view(), name='index_list'
     ),
     url(
-        regex=r'^instance/node/(?P<pk>\d+)/$',
+        regex=r'^instances/nodes/(?P<pk>\d+)/$',
         view=IndexInstanceNodeView.as_view(), name='index_instance_node_view'
     ),
-
     url(
-        regex=r'^indexes/rebuild/$', view=IndexesRebuildView.as_view(),
-        name='rebuild_index_instances'
-    ),
-    url(
-        regex=r'^list/for/document/(?P<pk>\d+)/$',
+        regex=r'^documents/(?P<pk>\d+)/instances/$',
         view=DocumentIndexNodeListView.as_view(), name='document_index_list'
     ),
 ]
 
+urlpatterns_tools = [
+    url(
+        regex=r'^instances/rebuild/$', view=IndexesRebuildView.as_view(),
+        name='rebuild_index_instances'
+    ),
+]
+
+urlpatterns = []
+urlpatterns.extend(urlpatterns_templates)
+urlpatterns.extend(urlpatterns_instances)
+urlpatterns.extend(urlpatterns_tools)
+
 api_urls = [
     url(
         regex=r'^indexes/node/(?P<pk>[0-9]+)/documents/$',