move a few files around and make parser static