Move all macros to top