City commits to accounting firm switch