Refactor to new package.