Move things around for Packaging.