Moving more classes