Restructured for Windows build.