Moved a few classes