Merge "Revert "ART: Split Checker into smaller files""