Move more classes