Move packaging to package()