Reorganised report processor files and fixed one failing test.