Organize source files into more logical structure (zero sum)
Add factory method to DynamicAggregator
Add support for arrays on stub aggregators