Major refactor with Zone class and removal of environment.* files