Refactoring Scope/Symbol, did away with Symbol type and put all symbol logic in Scope