Moving all service factories to own classes