Some reorganization and such, preparing to make a new parser implementation