Clear more branc hfiles
Start class definitions