Began extracting models into their own classes.