refactoring filepaths