Move things into a package.