tidied up some file locations