Move MacGitver Macros to umbrella