updated plotting macros with the new subfolder names