Renamed 'Folder' to 'Directory'
misc
Renamed 'Tokenizer' to 'Lexer'
Renamed 'Tokenizer' to 'Lexer'
misc
Finished simplifying parsing mechanism
Merge branch 'feature/simplify-parsing' into develop
Refactoring