Refactor FileUtils
Refactor FileUtils