#2277 moving classes