Merge "cdb: One class per file"