Improve the packaging scripts