partly fixed grouping module files for MSVC. Test codes are not grouped yet