more moves from contrib to packaging