Split up classes into different files