Move macros in dedicated file