Renamed calc-ev to calc_ev to better conform with python standards.
Complete reorganization of code.