Moved code to non-default package.