Moved scripts to separate folder. Updates to report