Ok, so that is all done. My 2 hour estimate was off by.... about 3 hours. HUGE thanks to Jason and MikeyK for sticking around to help Kim and I out! By the time everything was said and done it was somewhere in the neighborhood of 1,750 threads that had to be moved.
If you find anything that got put in the wrong place, let us know and we'll be happy to move it.
aislin