FileUtils refactored