Moved some components around, minor rewrite of FileUtil
Merge remote-tracking branch 'origin/master'