Tidied up file locations