Refactored into a skills package.