Move macros to separate files

[k88hudson-cfa]

We'd like to move macros into a macros.rs file, or for modules, have a separate macros.rs within that module