Updated scripts to reflect directory structure