Remove the modman file and move some files