Refactor table package.