Refactor client zone management to prepare for zone changing on server