Split classes up into their own files