Finished splitting up classes.