Overhaul of function names. Move some functionality from dataRetrieval to EGRET.