Fix debian tests, sort VS projects
Sort remaining targets into VS folders