Big tidy up with packages.