refactored some app service projects
fixed merge issues