Update contrib and packaging file