Naming correction and new lexer
Separated tokens from the lexer
Updated to work with new lexer