Use Lexer skeleton by @YorickPeterse
Some basic lexing structures in place
Some refactoring of lexing rules
Some renaming and commenting in lexing rules