Refactor parser package.