Refactoring AppService and ServiceFactory
Clean up
Merge branch 'GetOutFactoryImplFromAppService'