Move reporters to own folder, lots of formatting cleanup