Rename VampireMacros to Macros. Minor cleanups.