Misc tweaking, + renamed util.IO to util.IOUtil