releasetools: Move packages into extras [2/2]