Split into separate class files
Amend split into separate class files