move more files to C.