move some utility files to utils folder