Moved more scripts to better defined directories.