updated macro location
Merge pull request #1 from clarkeash/move-macros

updated macro location