Restructure the ACL code some more, get the internal semantics