Reorganise reporting using better class names etc