This is a huge, complicated project. Therefore, this untangling is not as comprehensive as the others. It should compile faster and be a little bit neater, but that's it. Don't expect the headers to look much better!
