pull extracted classes into their own files