Addressed issues raised by @DinisCruz
Renamed and reorganised reports
Merged Issue #340