Rich: update macro/rich/run macros to be compilable and update batch scripts (remove hardcoded paths)