Redesign process

I’m about to embark in a WordPress redesign but am wondering the best way to do this while testing and keeping the current site intact. If I create a subfolder for the redesign while I’m working on it, how do I eventually move the site to the root and cleanly change all my links that will have the subfolder path?

Maybe there’s a better way to do this. Suggestions?