some classes moved