Refactoring file locations