Automapper

Added viewmodel and automapper back