Move DataProviders and Aggregators into separate files