cdb: One class per file

Change-Id: I18c6f58d8b3747c4da9d74884a3c9a3571f403f3
Merge "cdb: One class per file"