Rearrange AreaReference and BlockReference and update hashCode methods. Also delete zone.