Refactor destination file gathering