updating peg parser
refactoring Token, Source (in progress)