Move subclasses into subfolder