Make source groups for files
Fix some compiler warnings in Windows
Fix 2 compiler errors on Windows