renamed files, updated masterScript