Workingon updating some of the scripts to make sense with the new structure