Improved FileUtils class