done what I can

This is what I can do cleanly, as far as I've been able to test. Anything that I can't do automatically, I've left for you guys. I've done about 90%, but the remaining 10% are likely to be harder to do. See the namespace_class_map for hints on what needs to be done for each of the remaining classes to namespace.