Refactor file locations