moved consolidators to parser

fixes #142