Refactored older tree generation to a more AST-Type style with a traditional compiler lexer / parser couple