moved orphan classes