Attempt to clean/order FileUtil.scala