Update packages to be a better subproject