Review: Update comments in main.cpp
Review: Cleanup CMakeLists, improve source_group grouping for XCode and VisualStudio.