Move UnMacroCommand class to separate files
Move macro commands to separate files