Moved cmp and compare_stream to FileUtils