refactor broker model as base of consumer

renamed a lot of stuff
per consumer stats are now collected correctly