Improve wording
Improve scripts packaging