do a little cleanup and move some files