Splitting up classes into separate files