another billing class and moved reports to billing (#2683)