refactoring file locations