Class updates

Moved a few races to separate classes. Will add more in a future commit.