Plan keeps Waterville in 1st District, moves Augusta to 2nd