revert to single ServiceContainer class
cleanup
code review tidyups
Merge pull request #108 from onefinestay/merge-service-containers

Merge service containers