msvc reorganized