Improve scripts packaging