This builds on the work of #1931 by moving the legacy services into `services/`.
Merging this separately so the commit with the tooling change is readable. This is a follow-on to #1167 which turned prettier on.