Separated primary group of classes into their own files