moved macros into their own file
Comments and macro moves.