Updated windows project to work with latest version.
Rearranged VS project