app mapper implementation, and merged services into one