Refactor imports in Parser