[Subhas/Faris] Moved Mapper into a separate class.