updated scripts for new dir structure