Merge "Move some more classes to comply with class per file"