Reorganize Windows build