Update MR project and class creation script to more comprehensive version.