Various changes to structure. Began ACL architecture.