updated scripts for new directory structure