Many changes under build script to make code more readable.
Avoid duplicity and prepare the second version