moved some reporting code around
Flattened some hierarchy in the reporting module layout
tidying up