rename Molecule2 -> Molecule, MPModel2 -> MPModel