Move subclasses into their own files.