Remove old classes.
Move content from old classes to these new classes.