moved a few more classes around from parser