Move some classes