Add Mobile Service, refactor common classes