Rename macros to better reflect what they do.
Split macros from Python scripts.

Mainly to simplify packaging.