Fixed scripts to match new file structure