rename util/helper -> util/macros