Split into one file per class
Split into one file per class
Test