Scripts updated for new folder structure