Reorder in project
Reorder for lexer file
Added support for import commands in BNF