v2.0 of Lexer

Various fixes
Deleting unecessary files