Move macros to mod