Split mapping in 3 files: add, change, delete

25 fields moved