Reorganize the mapping module.