Fix amount of \n in class header
Fix test
Rename classes, move view classes outside