Improve mapping for more functions.

I moved the module definition to its own file because I think it's more convenient.
Why remove all of these different includes? Especially the non-sys ones, like cherrypick and revert?