Split lexed and tokenisation
Merge pull request #2 from javiersuweijie/javier

Split lexed and tokenisation