New data, camera and mapper

The old data is still present and the unit tests assume the old mapper.