Windows build fix, set up Windows solution with new layout.