Split classes up into files

Temp rendering