Parser: refactored map initialisation
separate subdirs for lexer & parser
separate subdirs for lexer & parser
Parser changes
Parser changes