Assorted cleanups to macro implementations and project structure

that's nice :)