Scripts updated for current file tree.