Updated MP2_scanner and top level files