update the folder structure for install function
Merge remote-tracking branch 'origin'