changed script to conform to new folder structure