Moved some Class stuff, fixed some things