MP2 package and one main class file updated