Move extra services to core

These were missed in the initial work.