MSVS: project cleanup and reorder.