Reorganize mappings, plus allow for old leader-prefixed mappings