Mapping refactor

Hmm. not sure what happened there, or why I seem to have merged that other PR. Anyway, the token providers XML file is in the file now and I have reverted your branch to its previous state.