Move some base packages into site.pp