Refactor: One class/trait per file.