Reorganizing the windows auth section.