refactor new consumer class

moved commands
one benchmark fails!