Upgrade of existing acl classes to 3.x

All test passing and shells working