Refractor the tool package.