project structure reorganization
syntax highlight fix
highlighter refactoring