Yes, we should elevate them to top level classes.