Moved POJO mappers to the pojo package