City to reroute Newlands Spring to larger site