move some files to common