Refactor service sub-generator, use service over factory for default service