Council OKs new water and sewer fee structure