file path refactoring