adds FileUtils. refactors existing classes and specs