20170720 : upload
figure folder name change
retain only the necessary