Coding conventions: One class per file

No functional changes