Separate Ways

- StreamSource and AggregateSource get their own solution