Reorg the msvc stuff out of the eye