move some files and methods around