Merge "Split DairikiDiff to class per file"