Move reporters into their own modules