Start to restructure into classes.