Adjusted Lexer and started module parsing