Tidy.
Tidy; change file locations.