First pass on replacing 'module' into 'service'. Also, better way to register a service.