updated scripts to reflect new structure