chore(services): more clean up of service provider

Corrects ordering of events service, removes unneeded namespaces, and
rewrites some factories more consistently.
Merge pull request #7580 from mrclay/sp_cleanup2

chore(services): more clean up of service provider