moved macros, added macros to root directory