updated scripts to new dir structure