Revised 2021 city budget calls for fire, police reorganization, halt to pay raises