Replaced sherpa with sherpa2 and removed obsolete files