diff --git a/apps/acls/__init__.py b/apps/acls/__init__.py
index fe2e4b2cf7..af8531ae90 100644
--- a/apps/acls/__init__.py
+++ b/apps/acls/__init__.py
@@ -1,29 +1,15 @@
 from __future__ import absolute_import
 
-from django.utils.translation import ugettext_lazy as _
-
-from navigation.api import bind_links, register_multi_item_links, Link
+from navigation.api import bind_links, register_multi_item_links
 from project_setup.api import register_setup
 
 from .classes import (AccessHolder, AccessObjectClass, ClassAccessHolder,
     AccessObject)
-from .permissions import (ACLS_EDIT_ACL, ACLS_VIEW_ACL,
-    ACLS_CLASS_EDIT_ACL, ACLS_CLASS_VIEW_ACL)
 
-
-acl_list = Link(text=_(u'ACLs'), view='acl_list', sprite='lock', permissions=[ACLS_VIEW_ACL])
-acl_detail = Link(text=_(u'details'), view='acl_detail', args=['access_object.gid', 'object.gid'], sprite='key_go', permissions=[ACLS_VIEW_ACL])
-acl_grant = Link(text=_(u'grant'), view='acl_multiple_grant', sprite='key_add', permissions=[ACLS_EDIT_ACL])
-acl_revoke = Link(text=_(u'revoke'), view='acl_multiple_revoke', sprite='key_delete', permissions=[ACLS_EDIT_ACL])
-acl_holder_new = Link(text=_(u'New holder'), view='acl_holder_new', args='access_object.gid', sprite='user', permissions=[ACLS_EDIT_ACL])
-
-acl_setup_valid_classes = Link(text=_(u'Default ACLs'), view='acl_setup_valid_classes', icon='lock.png', permissions=[ACLS_CLASS_VIEW_ACL])#, 'children_view_regex=[r'^acl_class', r'^acl_setup']}
-acl_class_list = Link(text=_(u'List of classes'), view='acl_setup_valid_classes', sprite='package', permissions=[ACLS_CLASS_VIEW_ACL])
-acl_class_acl_list = Link(text=_(u'ACLs for class'), view='acl_class_acl_list', args='object.gid', sprite='lock_go', permissions=[ACLS_CLASS_VIEW_ACL])
-acl_class_acl_detail = Link(text=_(u'details'), view='acl_class_acl_detail', args=['access_object_class.gid', 'object.gid'], sprite='key_go', permissions=[ACLS_CLASS_VIEW_ACL])
-acl_class_new_holder_for = Link(text=_(u'New holder'), view='acl_class_new_holder_for', args='object.gid', sprite='user', permissions=[ACLS_CLASS_EDIT_ACL])
-acl_class_grant = Link(text=_(u'grant'), view='acl_class_multiple_grant', sprite='key_add', permissions=[ACLS_CLASS_EDIT_ACL])
-acl_class_revoke = Link(text=_(u'revoke'), view='acl_class_multiple_revoke', sprite='key_delete', permissions=[ACLS_CLASS_EDIT_ACL])
+from .links import (acl_list, acl_detail, acl_grant, acl_revoke,
+    acl_holder_new, acl_setup_valid_classes, acl_class_list,
+    acl_class_acl_list, acl_class_acl_detail, acl_class_new_holder_for,
+    acl_class_grant, acl_class_revoke)
 
 bind_links([AccessHolder], [acl_detail])
 register_multi_item_links(['acl_detail'], [acl_grant, acl_revoke])
diff --git a/apps/acls/links.py b/apps/acls/links.py
new file mode 100644
index 0000000000..47964205b7
--- /dev/null
+++ b/apps/acls/links.py
@@ -0,0 +1,22 @@
+from __future__ import absolute_import
+
+from django.utils.translation import ugettext_lazy as _
+
+from navigation.api import Link
+
+from .permissions import (ACLS_EDIT_ACL, ACLS_VIEW_ACL,
+    ACLS_CLASS_EDIT_ACL, ACLS_CLASS_VIEW_ACL)
+
+acl_list = Link(text=_(u'ACLs'), view='acl_list', sprite='lock', permissions=[ACLS_VIEW_ACL])
+acl_detail = Link(text=_(u'details'), view='acl_detail', args=['access_object.gid', 'object.gid'], sprite='key_go', permissions=[ACLS_VIEW_ACL])
+acl_grant = Link(text=_(u'grant'), view='acl_multiple_grant', sprite='key_add', permissions=[ACLS_EDIT_ACL])
+acl_revoke = Link(text=_(u'revoke'), view='acl_multiple_revoke', sprite='key_delete', permissions=[ACLS_EDIT_ACL])
+acl_holder_new = Link(text=_(u'New holder'), view='acl_holder_new', args='access_object.gid', sprite='user', permissions=[ACLS_EDIT_ACL])
+
+acl_setup_valid_classes = Link(text=_(u'Default ACLs'), view='acl_setup_valid_classes', icon='lock.png', permissions=[ACLS_CLASS_VIEW_ACL])#, 'children_view_regex=[r'^acl_class', r'^acl_setup']}
+acl_class_list = Link(text=_(u'List of classes'), view='acl_setup_valid_classes', sprite='package', permissions=[ACLS_CLASS_VIEW_ACL])
+acl_class_acl_list = Link(text=_(u'ACLs for class'), view='acl_class_acl_list', args='object.gid', sprite='lock_go', permissions=[ACLS_CLASS_VIEW_ACL])
+acl_class_acl_detail = Link(text=_(u'details'), view='acl_class_acl_detail', args=['access_object_class.gid', 'object.gid'], sprite='key_go', permissions=[ACLS_CLASS_VIEW_ACL])
+acl_class_new_holder_for = Link(text=_(u'New holder'), view='acl_class_new_holder_for', args='object.gid', sprite='user', permissions=[ACLS_CLASS_EDIT_ACL])
+acl_class_grant = Link(text=_(u'grant'), view='acl_class_multiple_grant', sprite='key_add', permissions=[ACLS_CLASS_EDIT_ACL])
+acl_class_revoke = Link(text=_(u'revoke'), view='acl_class_multiple_revoke', sprite='key_delete', permissions=[ACLS_CLASS_EDIT_ACL])
diff --git a/apps/document_acls/__init__.py b/apps/document_acls/__init__.py
index e14d021e20..22296cc9ce 100644
--- a/apps/document_acls/__init__.py
+++ b/apps/document_acls/__init__.py
@@ -2,7 +2,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from documents.models import Document
 from navigation.api import bind_links, Link
-from acls import ACLS_VIEW_ACL, ACLS_EDIT_ACL
+from acls.permissions import ACLS_VIEW_ACL, ACLS_EDIT_ACL
 from acls.api import class_permissions
 
 acl_list = Link(text=_(u'ACLs'), view='document_acl_list', args='object.pk', sprite='lock', permissions=[ACLS_VIEW_ACL])
diff --git a/apps/folders/__init__.py b/apps/folders/__init__.py
index f72c92fd4f..208f21c7ec 100644
--- a/apps/folders/__init__.py
+++ b/apps/folders/__init__.py
@@ -7,7 +7,7 @@ from navigation.api import (bind_links, register_top_menu,
 from documents.models import Document
 from documents.permissions import PERMISSION_DOCUMENT_VIEW
 from acls.api import class_permissions
-from acls import ACLS_EDIT_ACL, ACLS_VIEW_ACL
+from acls.permissions import ACLS_EDIT_ACL, ACLS_VIEW_ACL
 
 from .models import Folder
 from .permissions import (PERMISSION_FOLDER_CREATE,
diff --git a/apps/linking/__init__.py b/apps/linking/__init__.py
index 14caa3309b..45bee5ddf9 100644
--- a/apps/linking/__init__.py
+++ b/apps/linking/__init__.py
@@ -7,7 +7,7 @@ from project_setup.api import register_setup
 from documents.permissions import PERMISSION_DOCUMENT_VIEW
 from documents.models import Document
 from acls.api import class_permissions
-from acls import ACLS_EDIT_ACL, ACLS_VIEW_ACL
+from acls.permissions import ACLS_EDIT_ACL, ACLS_VIEW_ACL
 
 from .models import SmartLink, SmartLinkCondition
 from .permissions import (PERMISSION_SMART_LINK_VIEW,