Lots of refactoring and finished implementing working HtmlReportAggregator