Reorganizing imports in the mapping module.