Updated locations of scripts and cleaned things up for turnin