changed services to be contained without one class to provide better clarity :)