re-organizing mappings