Refactor splitting classes.