Decided original tree structure will work, reverted to original
structure with some tweaks. Started building symbol table from tree.