added 7 and 8 TeV lumi targets
renamed
cleanup and update
renamed file