move some files and minor cleanup