split out primary classes to files