Finish moving classes