Move away from HaloACL-like directory layout