Pull the package and key code into their own packages.