Move extra services to core

These were missed in the initial work.
Merge pull request #14 from fog/additional_services

Move extra services to core