merge folder
move some files