move more things from EgammaAnalysis/ElectronTools