Fix layout of Windows yaml
Update ci yaml file names
Merge branch 'master' into buildable_branch