Moving things to new packages, etc.