changed structure of files, added lexer and parser structs, new methods