Improved macros.

+ Turned macros into a distinct package.
+ made use of verbtim based commands optional.