cleaned up file locations