shifted some stuff into macros2 folder to keep things neat
More stuff into macros2
Parser combinators work well
Merge remote-tracking branch 'origin/master'