Repackaging the lib following #19