moved a few more classes