Reorganize/refactor SyntaxAnalyzer