Move classes in their own files