Move to new quorums structure