City adopts TVA package, opposes redistricting