move to contrib and update metapackages