diff --git a/source/java/org/alfresco/repo/admin/patch/impl/DmPermissionsPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/DmPermissionsPatch.java
index 9e134b1869..d58195d3db 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/DmPermissionsPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/DmPermissionsPatch.java
@@ -21,8 +21,8 @@ package org.alfresco.repo.admin.patch.impl;
 import java.util.Map;
 
 import org.alfresco.repo.admin.patch.AbstractPatch;
-import org.alfresco.repo.domain.AccessControlListDAO;
 import org.alfresco.repo.domain.patch.PatchDAO;
+import org.alfresco.repo.domain.permissions.AccessControlListDAO;
 import org.alfresco.repo.security.permissions.ACLType;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
diff --git a/source/java/org/alfresco/repo/avm/AVMServicePermissionsTest.java b/source/java/org/alfresco/repo/avm/AVMServicePermissionsTest.java
index fa84a7c618..c378d3288f 100644
--- a/source/java/org/alfresco/repo/avm/AVMServicePermissionsTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServicePermissionsTest.java
@@ -32,7 +32,7 @@ import junit.framework.TestCase;
 
 import org.alfresco.config.JNDIConstants;
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.domain.AccessControlListDAO;
+import org.alfresco.repo.domain.permissions.AccessControlListDAO;
 import org.alfresco.repo.domain.permissions.Acl;
 import org.alfresco.repo.domain.permissions.AclDAO;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
diff --git a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
index d39647df56..b38b3bafd6 100644
--- a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
@@ -49,10 +49,10 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.repo.cache.lookup.EntityLookupCache;
 import org.alfresco.repo.cache.lookup.EntityLookupCache.EntityLookupCallbackDAOAdaptor;
-import org.alfresco.repo.domain.AccessControlListDAO;
 import org.alfresco.repo.domain.contentdata.ContentDataDAO;
 import org.alfresco.repo.domain.control.ControlDAO;
 import org.alfresco.repo.domain.locale.LocaleDAO;
+import org.alfresco.repo.domain.permissions.AccessControlListDAO;
 import org.alfresco.repo.domain.permissions.AclDAO;
 import org.alfresco.repo.domain.qname.QNameDAO;
 import org.alfresco.repo.domain.usage.UsageDAO;
diff --git a/source/java/org/alfresco/repo/domain/permissions/ADMAccessControlListDAO.java b/source/java/org/alfresco/repo/domain/permissions/ADMAccessControlListDAO.java
index e75f6314da..335e46a8ac 100644
--- a/source/java/org/alfresco/repo/domain/permissions/ADMAccessControlListDAO.java
+++ b/source/java/org/alfresco/repo/domain/permissions/ADMAccessControlListDAO.java
@@ -29,7 +29,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.repo.domain.AccessControlListDAO;
 import org.alfresco.repo.domain.node.NodeDAO;
 import org.alfresco.repo.domain.node.NodeIdAndAclId;
 import org.alfresco.repo.domain.permissions.AVMAccessControlListDAO.CounterSet;
diff --git a/source/java/org/alfresco/repo/domain/permissions/AVMAccessControlListDAO.java b/source/java/org/alfresco/repo/domain/permissions/AVMAccessControlListDAO.java
index ce1a6fd5a7..ee2adeaee9 100644
--- a/source/java/org/alfresco/repo/domain/permissions/AVMAccessControlListDAO.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AVMAccessControlListDAO.java
@@ -36,7 +36,6 @@ import org.alfresco.config.JNDIConstants;
 import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.repo.avm.AVMRepository;
 import org.alfresco.repo.avm.util.AVMUtil;
-import org.alfresco.repo.domain.AccessControlListDAO;
 import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.repo.domain.avm.AVMNodeDAO;
 import org.alfresco.repo.domain.avm.AVMNodeEntity;
diff --git a/source/java/org/alfresco/repo/domain/permissions/AbstractPermissionsDaoComponentImpl.java b/source/java/org/alfresco/repo/domain/permissions/AbstractPermissionsDaoComponentImpl.java
index 5b45b33fb5..75a2111a8e 100644
--- a/source/java/org/alfresco/repo/domain/permissions/AbstractPermissionsDaoComponentImpl.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AbstractPermissionsDaoComponentImpl.java
@@ -30,7 +30,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.alfresco.repo.domain.AccessControlListDAO;
 import org.alfresco.repo.security.permissions.ACEType;
 import org.alfresco.repo.security.permissions.ACLType;
 import org.alfresco.repo.security.permissions.AccessControlEntry;
diff --git a/source/java/org/alfresco/repo/domain/AccessControlListDAO.java b/source/java/org/alfresco/repo/domain/permissions/AccessControlListDAO.java
similarity index 94%
rename from source/java/org/alfresco/repo/domain/AccessControlListDAO.java
rename to source/java/org/alfresco/repo/domain/permissions/AccessControlListDAO.java
index 64da3cb858..a78091951f 100644
--- a/source/java/org/alfresco/repo/domain/AccessControlListDAO.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AccessControlListDAO.java
@@ -16,12 +16,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>. */
 
-package org.alfresco.repo.domain;
+package org.alfresco.repo.domain.permissions;
 
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.repo.domain.permissions.Acl;
 import org.alfresco.repo.security.permissions.ACLType;
 import org.alfresco.repo.security.permissions.impl.AclChange;
 import org.alfresco.service.cmr.repository.InvalidNodeRefException;