Reorganizing Windows support.