Fixed MSVC files after recent folder reorganization