Refactored the macros directory