group the vs source files properly