Updating: moving some packages to contrib