Tidied up file locations.