deleted org.matsim.core.scoring.CharyparNagelScoringFunctionFactory, replaced all usages of it with org.matsim.core.scoring.charyparNagel.CharyparNagelScoringFunctionFactory with identical functionality (as a fact, the first one just delegated to the latter one).