Split up class files