Clean some class naming and add aggregator

Change almost all engine related class names for readability, @neozhangthe1 , please pay attention.  hopefully pagerank doesn't change much.