Fixed where some of the file directories

Tried to keep it all consistent with the file directories.
mergetool