Gamify refactored to add new Service Layer