SC-40 Create object mapper module, remove silly annotations