Full set of eldis scripts
Updating additional scripts to work with new structure