Updated folder structure and major update of the script