Remove Aggregator.java clone added by accident
PrimitiveAggregator: change to abstract class

And move a lot of functionality down.
PrimitiveAggregator: move more functionality inside