changed service generators to use a single service module