consolidate AggregateLoader files
Update some repository signatures and functional cleanup