move some files to c;lasses