WIP MSVC filter folder fixup