Some cleaning and Closes #51
Reorganizing build scripts for France