Refactored default package.