Fixing windows build and adding submodules