Moving installation up one directory?

I currently have WP installed in my root directory with a website built. I wanted to redo the site while leaving the current one in tact so I installed WP in a subfolder. Now I have the new site finished and I’d like to move it up to the root directory, essentially replacing the other one. Can anyone tell me how to do this painlessly?

Thanks!

Gary